applied patch from php-coder to fix some warnings, mostly signed vs unsigned issues
mathias mathias
5 files changed,
12 insertions(+),
9 deletions(-)
M
src/FbTk/MenuTheme.hh
→
src/FbTk/MenuTheme.hh
@@ -150,8 +150,8 @@ unsigned char m_alpha;
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
M
src/MenuCreator.cc
→
src/MenuCreator.cc
@@ -472,7 +472,7 @@ "separator",
"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
M
src/Screen.cc
→
src/Screen.cc
@@ -714,7 +714,7 @@ renderGeomWindow();
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 @@
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;
M
src/Window.cc
→
src/Window.cc
@@ -2496,10 +2496,10 @@ case XA_WM_NORMAL_HINTS: {
#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();