From 3efe68ffe30a24169492a97a9a0a883990e68b6a Mon Sep 17 00:00:00 2001
From: fluxgen <fluxgen>
Date: Sun, 12 Nov 2006 17:16:56 +0000
Subject: removed duplicate headers, patch from Slava Semushin aka php-coder

---
 src/FbTk/Font.cc   |  6 ------
 src/FbTk/Theme.hh  |  1 -
 src/MenuCreator.cc |  1 -
 src/Slit.cc        |  3 ---
 src/Slit.hh        |  1 -
 src/fluxbox.cc     | 13 +++++++++----
 6 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index a6bf32d..47883e1 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -72,12 +72,6 @@
 
 #include <errno.h>
 
-#ifdef HAVE_CSTDLIB
-  #include <cstdlib>
-#else
-  #include <stdlib.h>
-#endif
-
 using std::string;
 using std::map;
 using std::list;
diff --git a/src/FbTk/Theme.hh b/src/FbTk/Theme.hh
index e3fc5b4..70b782a 100644
--- a/src/FbTk/Theme.hh
+++ b/src/FbTk/Theme.hh
@@ -31,7 +31,6 @@
 #include <string>
 #include <list>
 #include <vector>
-#include <string>
 
 #include "XrmDatabaseHelper.hh"
 #include "Subject.hh"
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc
index 030991c..31ef06d 100644
--- a/src/MenuCreator.cc
+++ b/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"
 
diff --git a/src/Slit.cc b/src/Slit.cc
index 5fc2fc1..8542dca 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -65,9 +65,6 @@
 #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>
diff --git a/src/Slit.hh b/src/Slit.hh
index 35919c6..cb5b11c 100644
--- a/src/Slit.hh
+++ b/src/Slit.hh
@@ -36,7 +36,6 @@
 #include "FbTk/Timer.hh"
 #include "FbTk/Resource.hh"
 #include "FbTk/XLayerItem.hh"
-#include "Layer.hh"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index b23ab70..6827ca3 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -50,7 +50,6 @@
 #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 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
     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 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
     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);
             }
 
-- 
cgit v0.11.2