merged changes from trunk

11 files changed, 30 insertions, 64 deletions

diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh
index c5494b0..a1b93cc 100644
--- a/src/FbTk/FbWindow.hh
+++ b/src/FbTk/FbWindow.hh
@@ -26,7 +26,6 @@
 
 #include "FbDrawable.hh"
 
-#include <X11/Xlib.h>
 #include <memory>
 #include <string>
 #include <set>
diff --git a/src/FbTk/I18n.hh b/src/FbTk/I18n.hh
index 9a936d8..298c64c 100644
--- a/src/FbTk/I18n.hh
+++ b/src/FbTk/I18n.hh
@@ -60,8 +60,6 @@ void catclose(nl_catd cat);
 
 #endif // HAVE_NL_TYPES_H
 
-#include <string>
-
 // Some defines to help out
 #ifdef NLS
 #define _FB_USES_NLS \
diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc
index c1fa7a5..5f9f644 100644
--- a/src/FbTk/ImageControl.cc
+++ b/src/FbTk/ImageControl.cc
@@ -61,10 +61,6 @@
   #include <stdio.h>
 #endif
 
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif // HAVE_CTYPE_H
-
 #include <iostream>
 
 using std::cerr;
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh
index adc6b79..7fac8c7 100644
--- a/src/FbTk/MenuItem.hh
+++ b/src/FbTk/MenuItem.hh
@@ -30,7 +30,6 @@
 #include "ITypeAheadable.hh"
 #include "FbString.hh"
 
-#include <string>
 #include <memory>
 
 namespace FbTk {
diff --git a/src/FbTk/Timer.hh b/src/FbTk/Timer.hh
index 189c2af..bd55435 100644
--- a/src/FbTk/Timer.hh
+++ b/src/FbTk/Timer.hh
@@ -76,9 +76,9 @@ public:
 
     int isTiming() const { return m_timing; }
     int getInterval() const { return m_interval; }
-    
+
     int doOnce() const { return m_once; }
-    
+
     const timeval &getTimeout() const { return m_timeout; }
     const timeval &getStartTime() const { return m_start; }
     void makeEndTime(timeval &tm) const;
@@ -92,12 +92,12 @@ private:
     static void addTimer(Timer *timer);
     /// remove a timer from the static list
     static void removeTimer(Timer *timer);
-        
+
     typedef std::list<Timer *> TimerList;
     static TimerList m_timerlist; ///< list of all timers, sorted by next trigger time (start + timeout)
-        
+
     RefCount<Command> m_handler; ///< what to do on a timeout
-        
+
     bool m_timing; ///< clock running?
     bool m_once;  ///< do timeout only once?
     int m_interval; ///< Is an interval-only timer (e.g. clock)
@@ -105,7 +105,6 @@ private:
 
     timeval m_start;    ///< start time
     timeval m_timeout; ///< time length
-
 };
 
 } // end namespace FbTk
diff --git a/src/FbTk/XLayer.hh b/src/FbTk/XLayer.hh
index 660886e..238f698 100644
--- a/src/FbTk/XLayer.hh
+++ b/src/FbTk/XLayer.hh
@@ -42,7 +42,7 @@ public:
 
     typedef std::list<XLayerItem *> ItemList;
     typedef std::list<XLayerItem *>::iterator iterator;
-    
+
     //typedef std::list<XLayerItem *>::reverse_iterator reverse_iterator;
 
     void setLayerNum(int layernum) { m_layernum = layernum; };
diff --git a/src/FbTk/XLayerItem.hh b/src/FbTk/XLayerItem.hh
index 90d2167..e17d162 100644
--- a/src/FbTk/XLayerItem.hh
+++ b/src/FbTk/XLayerItem.hh
@@ -30,9 +30,6 @@
 #include "NotCopyable.hh"
 #include "FbWindow.hh"
 
-#include <X11/Xlib.h>
-
-
 namespace FbTk {
 
 class XLayerItem : public LayerItem, private NotCopyable {
diff --git a/src/Keys.cc b/src/Keys.cc
index aca7428..86cb4d5 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -39,9 +39,11 @@
 #endif // HAVE_CONFIG_H
 
 
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif  // HAVE_CTYPE_H
+#ifdef HAVE_CCTYPE
+  #include <cctype>
+#else
+  #include <ctype.h>
+#endif  // HAVE_CCTYPE
 
 #ifdef HAVE_CSTDIO
   #include <cstdio>
diff --git a/src/Screen.cc b/src/Screen.cc
index 65ac45a..8676dd7 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -101,10 +101,6 @@ class Slit {};
 #include <sys/types.h>
 #endif // STDC_HEADERS
 
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif // HAVE_CTYPE_H
-
 #ifdef HAVE_UNISTD_H
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 3f7d9f7..f3a47a3 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -134,21 +134,9 @@ class Toolbar { };
 #include <sys/stat.h>
 #endif // HAVE_SYS_STAT_H
 
-#ifdef  TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else // !TIME_WITH_SYS_TIME
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else // !HAVE_SYS_TIME_H
-#include <time.h>
-#endif // HAVE_SYS_TIME_H
-#endif // TIME_WITH_SYS_TIME
-
 #include <sys/wait.h>
 
 #include <iostream>
-#include <string>
 #include <memory>
 #include <algorithm>
 #include <typeinfo>
diff --git a/src/main.cc b/src/main.cc
index 1c62744..7b98597 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -39,21 +39,12 @@
 #define  _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-#ifdef HAVE_CSTDIO
-  #include <cstdio>
-#else
-  #include <stdio.h>
-#endif
 #ifdef HAVE_CSTDLIB
   #include <cstdlib>
 #else
   #include <stdlib.h>
 #endif
-#ifdef HAVE_CSTRING
-  #include <cstring>
-#else
-  #include <string.h>
-#endif
+
 #include <iostream>
 #include <fstream>
 #include <stdexcept>
@@ -199,17 +190,18 @@ int main(int argc, char **argv) {
 
     int i;
     for (i = 1; i < argc; ++i) {
-        if (! strcmp(argv[i], "-rc")) {
+        string arg(argv[i]);
+        if (arg == "-rc") {
             // look for alternative rc file to use
 
             if ((++i) >= argc) {
                 cerr<<_FB_CONSOLETEXT(main, RCRequiresArg,
                               "error: '-rc' requires an argument", "the -rc option requires a file argument")<<endl;
-                exit(1);
+                exit(EXIT_FAILURE);
             }
 
-            rc_file = argv[i];
-        } else if (! strcmp(argv[i], "-display")) {
+            rc_file = arg;
+        } else if (arg == "-display") {
             // check for -display option... to run on a display other than the one
             // set by the environment variable DISPLAY
 
@@ -217,10 +209,10 @@ int main(int argc, char **argv) {
                 cerr<<_FB_CONSOLETEXT(main, DISPLAYRequiresArg,
                               "error: '-display' requires an argument",
                               "")<<endl;
-                exit(1);
+                exit(EXIT_FAILURE);
             }
 
-            session_display = argv[i];
+            session_display = arg;
             string display_env = "DISPLAY=" + session_display;
             if (putenv(const_cast<char *>(display_env.c_str()))) {
                 cerr<<_FB_CONSOLETEXT(main, WarnDisplayEnv,
@@ -228,17 +220,17 @@ int main(int argc, char **argv) {
                               "")<<endl;
                 perror("putenv()");
             }
-        } else if (strcmp(argv[i], "-version") == 0 || strcmp(argv[i], "-v") == 0) {
+        } else if (arg == "-version" || arg == "-v") {
             // print current version string
-            cout << "Fluxbox " << __fluxbox_version << " : (c) 2001-2006 Henrik Kinnunen " << endl << endl;
-            exit(0);
-        } else if (strcmp(argv[i], "-log") == 0 ) {
+            cout << "Fluxbox " << __fluxbox_version << " : (c) 2001-2007 Henrik Kinnunen " << endl << endl;
+            exit(EXIT_SUCCESS);
+        } else if (arg == "-log") {
             if (i + 1 >= argc) {
                 cerr<<_FB_CONSOLETEXT(main, LOGRequiresArg, "error: '-log' needs an argument", "")<<endl;
-                exit(1);
+                exit(EXIT_FAILURE);
             }
             log_filename = argv[++i];
-        } else if (strcmp(argv[i], "-help") == 0 || strcmp(argv[i], "-h") == 0) {
+        } else if (arg == "-help" || arg == "-h") {
             // print program usage and command line options
             printf(_FB_CONSOLETEXT(main, Usage,
                            "Fluxbox %s : (c) %s Henrik Kinnunen\n"
@@ -252,12 +244,12 @@ int main(int argc, char **argv) {
                            "-help\t\t\t\tdisplay this help text and exit.\n\n",
 
                            "Main usage string. Please lay it out nicely. There is one %s that is given the version").c_str(),
-                   __fluxbox_version, "2001-2006");
-            exit(0);
-        } else if (strcmp(argv[i], "-info") == 0 || strcmp(argv[i], "-i") == 0) {
+                   __fluxbox_version, "2001-2007");
+            exit(EXIT_SUCCESS);
+        } else if (arg == "-info" || arg == "-i") {
             showInfo(cout);
-            exit(0);
-        } else if (strcmp(argv[i], "-verbose") == 0) {
+            exit(EXIT_SUCCESS);
+        } else if (arg == "-verbose") {
             FbTk::ThemeManager::instance().setVerbose(true);
         }
     }