aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/FbTk/Font.cc6
-rw-r--r--src/FbTk/Theme.hh1
-rw-r--r--src/MenuCreator.cc1
-rw-r--r--src/Slit.cc3
-rw-r--r--src/Slit.hh1
-rw-r--r--src/fluxbox.cc13
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 @@
72 72
73#include <errno.h> 73#include <errno.h>
74 74
75#ifdef HAVE_CSTDLIB
76 #include <cstdlib>
77#else
78 #include <stdlib.h>
79#endif
80
81using std::string; 75using std::string;
82using std::map; 76using std::map;
83using std::list; 77using 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 @@
31#include <string> 31#include <string>
32#include <list> 32#include <list>
33#include <vector> 33#include <vector>
34#include <string>
35 34
36#include "XrmDatabaseHelper.hh" 35#include "XrmDatabaseHelper.hh"
37#include "Subject.hh" 36#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 @@
27#include "Screen.hh" 27#include "Screen.hh"
28#include "CommandParser.hh" 28#include "CommandParser.hh"
29#include "fluxbox.hh" 29#include "fluxbox.hh"
30#include "CommandParser.hh"
31#include "Window.hh" 30#include "Window.hh"
32#include "WindowCmd.hh" 31#include "WindowCmd.hh"
33 32
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 @@
65#include "FbTk/StringUtil.hh" 65#include "FbTk/StringUtil.hh"
66#include "FbTk/I18n.hh" 66#include "FbTk/I18n.hh"
67 67
68#include <algorithm>
69#include <iostream>
70
71#ifdef HAVE_SYS_STAT_H 68#ifdef HAVE_SYS_STAT_H
72#include <sys/types.h> 69#include <sys/types.h>
73#include <sys/stat.h> 70#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 @@
36#include "FbTk/Timer.hh" 36#include "FbTk/Timer.hh"
37#include "FbTk/Resource.hh" 37#include "FbTk/Resource.hh"
38#include "FbTk/XLayerItem.hh" 38#include "FbTk/XLayerItem.hh"
39#include "Layer.hh"
40 39
41#include <X11/Xlib.h> 40#include <X11/Xlib.h>
42#include <X11/Xutil.h> 41#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 @@
50#include "FbTk/XrmDatabaseHelper.hh" 50#include "FbTk/XrmDatabaseHelper.hh"
51#include "FbTk/Command.hh" 51#include "FbTk/Command.hh"
52#include "FbTk/RefCount.hh" 52#include "FbTk/RefCount.hh"
53#include "FbTk/SimpleCommand.hh"
54#include "FbTk/CompareEqual.hh" 53#include "FbTk/CompareEqual.hh"
55#include "FbTk/Transparent.hh" 54#include "FbTk/Transparent.hh"
56#include "FbTk/Select2nd.hh" 55#include "FbTk/Select2nd.hh"
@@ -330,10 +329,14 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
330 setupConfigFiles(); 329 setupConfigFiles();
331 330
332 if (! XSupportsLocale()) 331 if (! XSupportsLocale())
333 cerr<<_FB_CONSOLETEXT(Fluxbox, WarningLocale, "Warning: X server does not support locale", "XSupportsLocale returned false")<<endl; 332 cerr<<_FB_CONSOLETEXT(Fluxbox, WarningLocale,
333 "Warning: X server does not support locale",
334 "XSupportsLocale returned false")<<endl;
334 335
335 if (XSetLocaleModifiers("") == 0) 336 if (XSetLocaleModifiers("") == 0)
336 cerr<<_FB_CONSOLETEXT(Fluxbox, WarningLocaleModifiers, "Warning: cannot set locale modifiers", "XSetLocaleModifiers returned false")<<endl; 337 cerr<<_FB_CONSOLETEXT(Fluxbox, WarningLocaleModifiers,
338 "Warning: cannot set locale modifiers",
339 "XSetLocaleModifiers returned false")<<endl;
337 340
338 341
339#ifdef HAVE_GETPID 342#ifdef HAVE_GETPID
@@ -353,7 +356,9 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
353 for (i = 1; i < m_argc; i++) { 356 for (i = 1; i < m_argc; i++) {
354 if (! strcmp(m_argv[i], "-screen")) { 357 if (! strcmp(m_argv[i], "-screen")) {
355 if ((++i) >= m_argc) { 358 if ((++i) >= m_argc) {
356 cerr << _FB_CONSOLETEXT(main, ScreenRequiresArg, "error, -screen requires argument", "the -screen option requires a file argument") << endl; 359 cerr << _FB_CONSOLETEXT(main, ScreenRequiresArg,
360 "error, -screen requires argument",
361 "the -screen option requires a file argument") << endl;
357 exit(1); 362 exit(1);
358 } 363 }
359 364