fix all compiler warnings with -Wall

6 files changed, 35 insertions, 33 deletions

diff --git a/src/FbTk/FbPixmap.cc b/src/FbTk/FbPixmap.cc
index 0df087d..675e838 100644
--- a/src/FbTk/FbPixmap.cc
+++ b/src/FbTk/FbPixmap.cc
@@ -73,7 +73,7 @@ FbPixmap::FbPixmap(Pixmap pm):m_pm(0),
 
 FbPixmap::FbPixmap(const FbDrawable &src,
                    unsigned int width, unsigned int height,
-                   int depth):m_pm(0),
+                   unsigned int depth):m_pm(0),
                               m_width(0), m_height(0),
                               m_depth(0) {
 
@@ -82,7 +82,7 @@ FbPixmap::FbPixmap(const FbDrawable &src,
 
 FbPixmap::FbPixmap(Drawable src,
                    unsigned int width, unsigned int height,
-                   int depth):m_pm(0),
+                   unsigned int depth):m_pm(0),
                               m_width(0), m_height(0),
                               m_depth(0) {
 
@@ -157,7 +157,7 @@ void FbPixmap::copy(const FbPixmap &the_copy) {
 }
 
 // screen doesn't count if depth is "zero"...
-void FbPixmap::copy(Pixmap pm, int depth, int screen_num) {
+void FbPixmap::copy(Pixmap pm, unsigned int depth, int screen_num) {
     free();
     if (pm == 0)
         return;
@@ -248,6 +248,8 @@ void FbPixmap::rotate(FbTk::Orientation orient) {
             dirx = 1;
             diry = -1;
             break;
+        default: // kill warning
+            break;
         }
         
 
@@ -365,7 +367,6 @@ void FbPixmap::rootwinPropertyNotify(int screen_num, Atom atom) {
             unsigned long items_read, items_left;
             unsigned long *data;
 
-            unsigned int prop = 0;
             if (XGetWindowProperty(display(),
                                    RootWindow(display(), i),
                                    root_prop_atoms[i],
@@ -474,7 +475,7 @@ void FbPixmap::free() {
 
 void FbPixmap::create(Drawable src,
                       unsigned int width, unsigned int height,
-                      int depth) {
+                      unsigned int depth) {
     if (src == 0)
         return;
 
diff --git a/src/FbTk/FbPixmap.hh b/src/FbTk/FbPixmap.hh
index 33a64d2..2935978 100644
--- a/src/FbTk/FbPixmap.hh
+++ b/src/FbTk/FbPixmap.hh
@@ -41,15 +41,15 @@ public:
     explicit FbPixmap(Pixmap pm);
     FbPixmap(const FbDrawable &src, 
              unsigned int width, unsigned int height,
-             int depth);
+             unsigned int depth);
     FbPixmap(Drawable src, 
              unsigned int width, unsigned int height,
-             int depth);
+             unsigned int depth);
 
     virtual ~FbPixmap();
 
     void copy(const FbPixmap &the_copy);
-    void copy(Pixmap pixmap, int depth_convert, int screen_num);
+    void copy(Pixmap pixmap, unsigned int depth_convert, int screen_num);
     /// rotates the pixmap to specified orientation (assumes ROT0 now)
     void rotate(FbTk::Orientation orient);
     /// scales the pixmap to specified size
@@ -67,7 +67,7 @@ public:
     inline Drawable drawable() const { return m_pm; }
     inline unsigned int width() const { return m_width; }
     inline unsigned int height() const { return m_height; }
-    inline int depth() const { return m_depth; }
+    inline unsigned int depth() const { return m_depth; }
 
     static Pixmap getRootPixmap(int screen_num, bool force_update=false);
     static void setRootPixmap(int screen_num, Pixmap pm);
@@ -75,13 +75,13 @@ public:
 
     void create(Drawable src,
                 unsigned int width, unsigned int height,
-                int depth);
+                unsigned int depth);
 
 private:
     void free();
     Pixmap m_pm;
     unsigned int m_width, m_height;
-    int m_depth;
+    unsigned int m_depth;
 
     /// Functions relating to the maintenance of root window pixmap caching
     static void checkAtoms();
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index fceec67..2f098d7 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -207,7 +207,7 @@ private:
     Menuitems menuitems;
 
     int m_screen_x, m_screen_y;
-    int m_screen_width, m_screen_height;
+    unsigned int m_screen_width, m_screen_height;
     bool m_moving; ///< if we're moving/draging or not
     bool m_visible; ///< menu visibility
     bool m_torn; ///< torn from parent
diff --git a/src/FbTk/Text.hh b/src/FbTk/Text.hh
index 01ee26e..745102f 100644
--- a/src/FbTk/Text.hh
+++ b/src/FbTk/Text.hh
@@ -106,9 +106,6 @@ inline void untranslateCoords(Orientation orient, int &orig_x, int &orig_y, unsi
 // relocate the x,y coordinates
 inline void translatePosition(Orientation orient, int &x, int &y, unsigned int w, unsigned int h, unsigned int bw) {
 
-    int orig_x = x;
-    int orig_y = y;
-
     switch(orient) {
     case ROT0:
         break;
diff --git a/src/FbTk/TextBox.cc b/src/FbTk/TextBox.cc
index a912775..7c91621 100644
--- a/src/FbTk/TextBox.cc
+++ b/src/FbTk/TextBox.cc
@@ -247,21 +247,25 @@ void TextBox::keyPressEvent(XKeyEvent &event) {
                 m_end_pos = 0;
                 break;
             case XK_Left: {
-                    int pos = findEmptySpaceLeft();
-                    if (pos < m_start_pos){
-                        m_start_pos  = pos;
-                        m_cursor_pos = 0;
-                    } else if (m_start_pos > 0) {
-                        m_cursor_pos = pos - m_start_pos;
-                    } else {
-                        m_cursor_pos = pos;
-                    }
-                    adjustPos();
+                unsigned int pos = findEmptySpaceLeft();
+                if (pos < m_start_pos){
+                    m_start_pos  = pos;
+                    m_cursor_pos = 0;
+                } else if (m_start_pos > 0) {
+                    m_cursor_pos = pos - m_start_pos;
+                } else {
+                    m_cursor_pos = pos;
                 }
+                adjustPos();
+            }
                 break;
             case XK_Right:
                 if (m_text.size() && m_cursor_pos < m_text.size()){
-                    int pos = findEmptySpaceRight() - m_start_pos;
+                    unsigned int pos = findEmptySpaceRight();
+                    if (pos > m_start_pos)
+                        pos -= m_start_pos;
+                    else 
+                        pos = 0;
                     if (m_start_pos + pos <= m_end_pos)
                         m_cursor_pos = pos;
                     else if (m_end_pos < text().size()) {
@@ -275,7 +279,7 @@ void TextBox::keyPressEvent(XKeyEvent &event) {
                 break;
 
             case XK_BackSpace: {
-                    int pos = findEmptySpaceLeft();
+                    unsigned int pos = findEmptySpaceLeft();
                     m_text.erase(pos, m_cursor_pos - pos + m_start_pos);
 
                     if (pos < m_start_pos){
@@ -292,7 +296,7 @@ void TextBox::keyPressEvent(XKeyEvent &event) {
             case XK_Delete: {
                     if (!m_text.size() || m_cursor_pos >= m_text.size())
                         break;
-                    int pos = findEmptySpaceRight();
+                    unsigned int pos = findEmptySpaceRight();
                     m_text.erase(m_cursor_pos + m_start_pos, pos - (m_cursor_pos + m_start_pos));
                     adjustPos();
                 }
@@ -406,7 +410,7 @@ void TextBox::adjustStartPos() {
     m_start_pos = start_pos;
 }
 
-int TextBox::findEmptySpaceLeft(){
+unsigned int TextBox::findEmptySpaceLeft(){
 
     // found the first left space symbol
     int pos = m_text.rfind(' ', (m_start_pos + m_cursor_pos) > 0 ? 
@@ -425,14 +429,14 @@ int TextBox::findEmptySpaceLeft(){
     return pos;
 
 }
-int TextBox::findEmptySpaceRight(){
+unsigned int TextBox::findEmptySpaceRight(){
 
     // found the first right space symbol
     int pos = m_text.find(' ', m_start_pos + m_cursor_pos);
 
     // do we have one more space symbol near?
     int next_pos = -1;
-    while (pos > -1 && pos < m_text.size() && (next_pos = m_text.find(' ', pos + 1)) > -1 ){
+    while (pos > -1 && pos < static_cast<signed>(m_text.size()) && (next_pos = m_text.find(' ', pos + 1)) > -1 ){
 
         if (next_pos - 1 > pos)
             break;
diff --git a/src/FbTk/TextBox.hh b/src/FbTk/TextBox.hh
index d5f2b61..660ac80 100644
--- a/src/FbTk/TextBox.hh
+++ b/src/FbTk/TextBox.hh
@@ -70,8 +70,8 @@ public:
     int cursorPosition() const { return m_cursor_pos; }
     inline int textStartPos(){ return m_start_pos; }
 
-    int findEmptySpaceLeft();
-    int findEmptySpaceRight();
+    unsigned int findEmptySpaceLeft();
+    unsigned int findEmptySpaceRight();
 
 private:
     void adjustEndPos();