From f803d8f2502796993a838783eeaf81b17f2faca0 Mon Sep 17 00:00:00 2001 From: mathias <mathias> Date: Mon, 16 Jan 2006 18:46:39 +0000 Subject: applied patch from php-coder to fix some warnings, mostly signed vs unsigned issues --- ChangeLog | 3 +++ src/FbTk/MenuTheme.hh | 4 ++-- src/MenuCreator.cc | 2 +- src/Screen.cc | 4 ++-- src/Window.cc | 8 ++++---- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3db3769..ada6fc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ (Format: Year/Month/Day) Changes for 0.9.15: +*06/01/16: + * minor changes to fix some warnings (Thanks php-coder) + Screen.cc Window.cc MenuCreator.cc MenuTheme.hh *06/01/07: * minor addons to fbgm, close Gentoo #74523 and #110677 (Mathias) *06/01/03: diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh index 8fc4d1c..67e1ae1 100644 --- a/src/FbTk/MenuTheme.hh +++ b/src/FbTk/MenuTheme.hh @@ -150,8 +150,8 @@ private: MenuMode m_menumode; unsigned int m_delayopen; ///< in msec unsigned int m_delayclose; ///< in msec - int m_real_title_height; ///< the calculated item height (from font and menu.titleHeight) - int m_real_item_height; ///< the calculated item height (from font and menu.itemHeight) + unsigned int m_real_title_height; ///< the calculated item height (from font and menu.titleHeight) + unsigned int m_real_item_height; ///< the calculated item height (from font and menu.itemHeight) }; } // end namespace FbTk diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc index fc427aa..4ea83a8 100644 --- a/src/MenuCreator.cc +++ b/src/MenuCreator.cc @@ -472,7 +472,7 @@ FbTk::Menu *MenuCreator::createMenuType(const std::string &type, int screen_num) "close", 0 }; - for (int i=0; i < sizeof(default_menu); ++i) + for (unsigned int i=0; i < sizeof(default_menu); ++i) createWindowMenuItem(default_menu[i], "", *menu); } menu->reconfigure(); // update graphics diff --git a/src/Screen.cc b/src/Screen.cc index b18dcb8..17e087b 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -714,7 +714,7 @@ void BScreen::reconfigure() { renderPosWindow(); // realize the number of workspaces from the init-file - const int nr_ws = *resource.workspaces; + const unsigned int nr_ws = *resource.workspaces; if (nr_ws > m_workspaces_list.size()) { while(nr_ws != m_workspaces_list.size()) { addWorkspace(); @@ -760,7 +760,7 @@ void BScreen::reconfigure() { if (restore_menus) { // restore submenus, no timestamp changed FbTk::Menu *menu = m_rootmenu.get(); - for (int i = 0; i < (int)remember_sub.size(); i++ ) { + for (unsigned int i = 0; i < remember_sub.size(); i++ ) { int sub = remember_sub[i]; if (!menu || sub < 0) break; diff --git a/src/Window.cc b/src/Window.cc index 2eecc1e..fe97517 100644 --- a/src/Window.cc +++ b/src/Window.cc @@ -2496,10 +2496,10 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) { #ifdef DEBUG cerr<<"XA_WM_NORMAL_HINTS("<<title()<<")"<<endl; #endif // DEBUG - int old_max_width = client.max_width; - int old_min_width = client.min_width; - int old_min_height = client.min_height; - int old_max_height = client.max_height; + unsigned int old_max_width = client.max_width; + unsigned int old_min_width = client.min_width; + unsigned int old_min_height = client.min_height; + unsigned int old_max_height = client.max_height; bool changed = false; client.updateWMNormalHints(); -- cgit v0.11.2