use the c++ std cheaders
jump to
@@ -39,8 +39,8 @@ ALL_LINGUAS=""
AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT([external]) -AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdint.h stdio.h stdlib.h string.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h) -AC_HEADER_TIME +AC_CHECK_HEADERS(fcntl.h signal.h stdarg.h stdint.h unistd.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h) +# AC_HEADER_TIME # AC_TYPE_SIGNAL # Check for Xft2
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "application.hh" #include "eventhandler.hh"
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "appwidget.hh" #include "application.hh"
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "display.hh" #include "screeninfo.hh"@@ -24,10 +22,6 @@ #ifdef XINERAMA
#include <X11/extensions/Xinerama.h> #endif // XINERAMA -#ifdef HAVE_STDIO_H -# include <stdio.h> -#endif // HAVE_STDIO_H - #ifdef HAVE_SIGNAL_H # include <signal.h> #endif // HAVE_SIGNAL_H@@ -44,6 +38,8 @@
#include "../src/gettext.h" #define _(str) gettext(str) } + +#include <cstdio> namespace otk {
@@ -1,18 +1,11 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "eventdispatcher.hh" #include "display.hh" -extern "C" { -#ifdef HAVE_STDIO_H -# include <stdio.h> -#endif -} - +#include <cstdio> #include <iostream> namespace otk {
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "display.hh" #include "eventhandler.hh"
@@ -1,15 +1,8 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif // HAVE_CONFIG_H +#include "config.h" -extern "C" { -#ifdef HAVE_STDLIB_H -# include <stdlib.h> -#endif // HAVE_STDLIB_H -} - +#include <cstdlib> #include <iostream> #include <algorithm>
@@ -11,7 +11,7 @@ #define _XFT_NO_COMPAT_ // no Xft 1 API
#include <X11/Xft/Xft.h> } -#include <assert.h> +#include <cassert> namespace otk {
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "label.hh" #include "display.hh"
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "application.hh" #include "appwidget.hh"
@@ -1,19 +1,16 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif // HAVE_CONFIG_H +#include "config.h" #include "property.hh" #include "display.hh" extern "C" { #include <X11/Xatom.h> - -#include <assert.h> } #include <algorithm> +#include <cassert> namespace otk {
@@ -11,11 +11,10 @@ #include "screeninfo.hh"
extern "C" { #include <X11/Xlib.h> - -#include <assert.h> } #include <vector> +#include <cassert> namespace otk {
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif // HAVE_CONFIG_H +#include "config.h" #include "pseudorendercontrol.hh" #include "display.hh"
@@ -1,18 +1,12 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif // HAVE_CONFIG_H +#include "config.h" #include "rendercolor.hh" #include "display.hh" #include "screeninfo.hh" -extern "C" { -#ifdef HAVE_STDIO_H -# include <stdio.h> -#endif -} +#include <cstdio> namespace otk {
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif // HAVE_CONFIG_H +#include "config.h" #include "rendercontrol.hh" #include "truerendercontrol.hh"
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif // HAVE_CONFIG_H +#include "config.h" #include "renderstyle.hh" #include "display.hh"
@@ -1,9 +1,14 @@
+#include "config.h" + #include "otk.hh" #include "rendercontrol.hh" #include "rendertexture.hh" -#include <stdio.h> +extern "C" { #include <X11/Xlib.h> +} + +#include <cstdio> int main(int argc, char **argv) {
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif // HAVE_CONFIG_H +#include "config.h" extern "C" { #include <X11/Xlib.h>
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif // HAVE_CONFIG_H +#include "config.h" #include "surface.hh" #include "display.hh"
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif // HAVE_CONFIG_H +#include "config.h" #include "timer.hh" #include "display.hh"@@ -10,12 +8,11 @@
extern "C" { #ifdef HAVE_SYS_SELECT_H # include <sys/select.h> -#else -# ifdef HAVE_UNISTD_H -# include <sys/types.h> -# include <unistd.h> -# endif // HAVE_UNISTD_H #endif // HAVE_SYS_SELECT_H + +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif } namespace otk {
@@ -7,16 +7,7 @@ @brief Contains the Timer class, used for timed callbacks.
*/ extern "C" { -#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 <ctime> } #include <queue>@@ -39,7 +30,9 @@ //! Compares two timeval structs
struct TimerCompare { //! Compares two timeval structs inline bool operator()(const Timer *a, const Timer *b) const { - return timercmp(&a->_timeout, &b->_timeout, >); + return ((&a->_timeout)->tv_sec == (&b->_timeout)->tv_sec) ? + ((&a->_timeout)->tv_usec > (&b->_timeout)->tv_usec) : + ((&a->_timeout)->tv_sec > (&b->_timeout)->tv_sec); } }; friend struct TimerCompare; // give access to _timeout for shitty compilers
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif // HAVE_CONFIG_H +#include "config.h" #include "truerendercontrol.hh" #include "display.hh"
@@ -1,14 +1,10 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif // HAVE_CONFIG_H +#include "config.h" #include "ustring.hh" -extern "C" { -#include <assert.h> -} +#include <cassert> namespace otk {
@@ -1,39 +1,29 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif // HAVE_CONFIG_H +#include "config.h" extern "C" { #include <X11/Xatom.h> -#ifdef HAVE_STDIO_H -#include <stdio.h> -#endif - -#ifdef HAVE_STRING_H -#include <string.h> -#endif - -#ifdef HAVE_STDLIB_H -#include <stdlib.h> -#endif - #ifdef HAVE_UNISTD_H #include <unistd.h> #endif // HAVE_UNISTD_H -#if defined(HAVE_PROCESS_H) && defined(__EMX__) -# include <process.h> -#endif // HAVE_PROCESS_H __EMX__ +// this is not checked in configure anymore!! +//#if defined(HAVE_PROCESS_H) && defined(__EMX__) +//# include <process.h> +//#endif // HAVE_PROCESS_H __EMX__ #include "../src/gettext.h" #define _(str) gettext(str) -#include <assert.h> } #include <algorithm> +#include <cassert> +#include <cstdio> +#include <cstring> +#include <cstdlib> #include "util.hh"@@ -52,16 +42,16 @@ }
void bexec(const string& command, const string& displaystring) { -#ifndef __EMX__ +//#ifndef __EMX__ if (! fork()) { setsid(); putenv(displaystring); int ret = execl("/bin/sh", "/bin/sh", "-c", command.c_str(), NULL); exit(ret); } -#else // __EMX__ - spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", command.c_str(), NULL); -#endif // !__EMX__ +//#else // __EMX__ +// spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", command.c_str(), NULL); +//#endif // !__EMX__ }
@@ -5,17 +5,6 @@
extern "C" { #include <X11/Xlib.h> #include <X11/Xutil.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 <string>
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "actions.hh" #include "openbox.hh"@@ -13,7 +11,7 @@ #include "python.hh"
#include "bindings.hh" #include "otk/display.hh" -#include <stdio.h> +#include <cstdio> #include <algorithm> namespace ob {
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "bindings.hh" #include "screen.hh"
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "client.hh" #include "frame.hh"
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" extern "C" { #ifdef SHAPE
@@ -4,19 +4,9 @@ /*! @file main.cc
@brief Main entry point for the application */ -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif // HAVE_CONFIG_H +#include "config.h" extern "C" { -#ifdef HAVE_LOCALE_H -# include <locale.h> -#endif // HAVE_LOCALE_H - -#ifdef HAVE_STDIO_H -# include <stdio.h> -#endif // HAVE_STDIO_H - #ifdef HAVE_UNISTD_H # include <sys/types.h> # include <unistd.h>@@ -27,6 +17,9 @@ }
#include "openbox.hh" #include "otk/util.hh" + +#include <clocale> +#include <cstdio> int main(int argc, char **argv) { // initialize the locale
@@ -1,8 +1,6 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "openbox.hh" #include "client.hh"@@ -20,14 +18,6 @@
extern "C" { #include <X11/cursorfont.h> -#ifdef HAVE_STDIO_H -# include <stdio.h> -#endif // HAVE_STDIO_H - -#ifdef HAVE_STDLIB_H -# include <stdlib.h> -#endif // HAVE_STDLIB_H - #ifdef HAVE_SIGNAL_H # include <signal.h> #endif // HAVE_SIGNAL_H@@ -45,6 +35,8 @@ #define _(str) gettext(str)
} #include <algorithm> +#include <cstdio> +#include <cstdlib> namespace ob {
@@ -1,18 +1,8 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" extern "C" { -#ifdef HAVE_STDIO_H -# include <stdio.h> -#endif // HAVE_STDIO_H - -#ifdef HAVE_STRING_H -# include <string.h> -#endif // HAVE_STRING_H - #ifdef HAVE_UNISTD_H # include <sys/types.h> # include <unistd.h>@@ -33,6 +23,8 @@ #include "otk/property.hh"
#include <vector> #include <algorithm> +#include <cstdio> +#include <cstring> static bool running; static int anotherWMRunning(Display *display, XErrorEvent *) {