all repos — fluxbox @ 3efe68ffe30a24169492a97a9a0a883990e68b6a

custom fork of the fluxbox windowmanager 

removed duplicate headers, patch from Slava Semushin aka php-coder
fluxgen fluxgen
commit

3efe68ffe30a24169492a97a9a0a883990e68b6a

parent

a3c5fd60001fc498a8b9904e63358751a17553da

6 files changed, 9 insertions(+), 16 deletions(-)

jump to
M src/FbTk/Font.cc → src/FbTk/Font.cc 
@@ -72,12 +72,6 @@ #include <langinfo.h>
 
 #include <errno.h>
 
-#ifdef HAVE_CSTDLIB
-  #include <cstdlib>
-#else
-  #include <stdlib.h>
-#endif
-
 using std::string;
 using std::map;
 using std::list;
M src/FbTk/Theme.hh → src/FbTk/Theme.hh 
@@ -31,7 +31,6 @@ 
 #include <string>
 #include <list>
 #include <vector>
-#include <string>
 
 #include "XrmDatabaseHelper.hh"
 #include "Subject.hh"
M src/MenuCreator.cc → src/MenuCreator.cc 
@@ -27,7 +27,6 @@ 
 #include "Screen.hh"
 #include "CommandParser.hh"
 #include "fluxbox.hh"
-#include "CommandParser.hh"
 #include "Window.hh"
 #include "WindowCmd.hh"
M src/Slit.cc → src/Slit.cc 
@@ -65,9 +65,6 @@ #include "FbTk/MenuSeparator.hh"
 #include "FbTk/StringUtil.hh"
 #include "FbTk/I18n.hh"
 
-#include <algorithm>
-#include <iostream>
-
 #ifdef HAVE_SYS_STAT_H
 #include <sys/types.h>
 #include <sys/stat.h>
M src/Slit.hh → src/Slit.hh 
@@ -36,7 +36,6 @@ #include "FbTk/FbWindow.hh"
 #include "FbTk/Timer.hh"
 #include "FbTk/Resource.hh"
 #include "FbTk/XLayerItem.hh"
-#include "Layer.hh"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
M src/fluxbox.cc → src/fluxbox.cc 
@@ -50,7 +50,6 @@ #include "FbTk/SimpleCommand.hh"
 #include "FbTk/XrmDatabaseHelper.hh"
 #include "FbTk/Command.hh"
 #include "FbTk/RefCount.hh"
-#include "FbTk/SimpleCommand.hh"
 #include "FbTk/CompareEqual.hh"
 #include "FbTk/Transparent.hh"
 #include "FbTk/Select2nd.hh"

@@ -330,10 +329,14 @@ 
     setupConfigFiles();
 
     if (! XSupportsLocale())
-        cerr<<_FB_CONSOLETEXT(Fluxbox, WarningLocale, "Warning: X server does not support locale", "XSupportsLocale returned false")<<endl;
+        cerr<<_FB_CONSOLETEXT(Fluxbox, WarningLocale, 
+                              "Warning: X server does not support locale", 
+                              "XSupportsLocale returned false")<<endl;
 
     if (XSetLocaleModifiers("") == 0)
-        cerr<<_FB_CONSOLETEXT(Fluxbox, WarningLocaleModifiers, "Warning: cannot set locale modifiers", "XSetLocaleModifiers returned false")<<endl;
+        cerr<<_FB_CONSOLETEXT(Fluxbox, WarningLocaleModifiers, 
+                              "Warning: cannot set locale modifiers", 
+                              "XSetLocaleModifiers returned false")<<endl;
 
 
 #ifdef HAVE_GETPID

@@ -353,7 +356,9 @@ // FIXME(php-coder): maybe it worths moving this code to main.cc, where command line is parsed?
     for (i = 1; i < m_argc; i++) {
         if (! strcmp(m_argv[i], "-screen")) {
             if ((++i) >= m_argc) {
-                cerr << _FB_CONSOLETEXT(main, ScreenRequiresArg, "error, -screen requires argument", "the -screen option requires a file argument") << endl;
+                cerr << _FB_CONSOLETEXT(main, ScreenRequiresArg, 
+                                        "error, -screen requires argument", 
+                                        "the -screen option requires a file argument") << endl;
                 exit(1);
             }