nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
fluxgen 2006-11-12 17:16:56 +00:00
parent a3c5fd6000
commit 3efe68ffe3
6 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/FbTk/Font.cc
View file

@ -72,12 +72,6 @@
#include <errno.h> #include <errno.h>
#ifdef HAVE_CSTDLIB
#include <cstdlib>
#else
#include <stdlib.h>
#endif
using std::string; using std::string;
using std::map; using std::map;
using std::list; using std::list;

1
src/FbTk/Theme.hh
View file

@ -31,7 +31,6 @@
#include <string> #include <string>
#include <list> #include <list>
#include <vector> #include <vector>
#include <string>
#include "XrmDatabaseHelper.hh" #include "XrmDatabaseHelper.hh"
#include "Subject.hh" #include "Subject.hh"

1
src/MenuCreator.cc
View file

@ -27,7 +27,6 @@
#include "Screen.hh" #include "Screen.hh"
#include "CommandParser.hh" #include "CommandParser.hh"
#include "fluxbox.hh" #include "fluxbox.hh"
#include "CommandParser.hh"
#include "Window.hh" #include "Window.hh"
#include "WindowCmd.hh" #include "WindowCmd.hh"

3
src/Slit.cc
View file

@ -65,9 +65,6 @@
#include "FbTk/StringUtil.hh" #include "FbTk/StringUtil.hh"
#include "FbTk/I18n.hh" #include "FbTk/I18n.hh"
#include <algorithm>
#include <iostream>
#ifdef HAVE_SYS_STAT_H #ifdef HAVE_SYS_STAT_H
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

1
src/Slit.hh
View file

@ -36,7 +36,6 @@
#include "FbTk/Timer.hh" #include "FbTk/Timer.hh"
#include "FbTk/Resource.hh" #include "FbTk/Resource.hh"
#include "FbTk/XLayerItem.hh" #include "FbTk/XLayerItem.hh"
#include "Layer.hh"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>

13
src/fluxbox.cc
View file

@ -50,7 +50,6 @@
#include "FbTk/XrmDatabaseHelper.hh" #include "FbTk/XrmDatabaseHelper.hh"
#include "FbTk/Command.hh" #include "FbTk/Command.hh"
#include "FbTk/RefCount.hh" #include "FbTk/RefCount.hh"
#include "FbTk/SimpleCommand.hh"
#include "FbTk/CompareEqual.hh" #include "FbTk/CompareEqual.hh"
#include "FbTk/Transparent.hh" #include "FbTk/Transparent.hh"
#include "FbTk/Select2nd.hh" #include "FbTk/Select2nd.hh"
@ -330,10 +329,14 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
setupConfigFiles(); setupConfigFiles();
if (! XSupportsLocale()) 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) 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 #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++) { for (i = 1; i < m_argc; i++) {
if (! strcmp(m_argv[i], "-screen")) { if (! strcmp(m_argv[i], "-screen")) {
if ((++i) >= m_argc) { 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); exit(1);
} }