use the c++ std cheaders

diff --git a/configure.ac b/configure.ac
index 3511aa4..c5302aa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/otk/application.cc b/otk/application.cc
index ffa33ab..94842ca 100644 (file)
--- a/otk/application.cc
+++ b/otk/application.cc
@@ -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"

diff --git a/otk/appwidget.cc b/otk/appwidget.cc
index 5c963f7..113998f 100644 (file)
--- a/otk/appwidget.cc
+++ b/otk/appwidget.cc
@@ -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"

diff --git a/otk/button.cc b/otk/button.cc
index c0f4810..774aa11 100644 (file)
--- a/otk/button.cc
+++ b/otk/button.cc
@@ -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 "button.hh"
 

diff --git a/otk/display.cc b/otk/display.cc
index cf4e22e..cb13440 100644 (file)
--- a/otk/display.cc
+++ b/otk/display.cc
@@ -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 @@ extern "C" {
 #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
@@ -45,6 +39,8 @@ extern "C" {
 #define _(str) gettext(str)
 }
 
+#include <cstdio>
+
 namespace otk {
 
 

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 8c245dd..0560eec 100644 (file)
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -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 {

diff --git a/otk/eventhandler.cc b/otk/eventhandler.cc
index c867d80..6539d58 100644 (file)
--- a/otk/eventhandler.cc
+++ b/otk/eventhandler.cc
@@ -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"

diff --git a/otk/font.cc b/otk/font.cc
index 4c3a347..424c13f 100644 (file)
--- a/otk/font.cc
+++ b/otk/font.cc
@@ -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
-
-extern "C" {
-#ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-#endif // HAVE_STDLIB_H
-}
+#include "config.h"
 
+#include <cstdlib>
 #include <iostream>
 #include <algorithm>
 

diff --git a/otk/font.hh b/otk/font.hh
index 16c47f2..618d4f6 100644 (file)
--- a/otk/font.hh
+++ b/otk/font.hh
@@ -11,7 +11,7 @@ extern "C" {
 #include <X11/Xft/Xft.h>
 }
 
-#include <assert.h>
+#include <cassert>
 
 namespace otk {
 

diff --git a/otk/label.cc b/otk/label.cc
index c17e295..751fff3 100644 (file)
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -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"

diff --git a/otk/otk_test.cc b/otk/otk_test.cc
index b438b3b..f10c4b3 100644 (file)
--- a/otk/otk_test.cc
+++ b/otk/otk_test.cc
@@ -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"

diff --git a/otk/property.cc b/otk/property.cc
index 3962691..699dd91 100644 (file)
--- a/otk/property.cc
+++ b/otk/property.cc
@@ -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 {
 

diff --git a/otk/property.hh b/otk/property.hh
index 1dc0893..22b62fe 100644 (file)
--- a/otk/property.hh
+++ b/otk/property.hh
@@ -11,11 +11,10 @@
 
 extern "C" {
 #include <X11/Xlib.h>
-
-#include <assert.h>
 }
 
 #include <vector>
+#include <cassert>
 
 namespace otk {
 

diff --git a/otk/pseudorendercontrol.cc b/otk/pseudorendercontrol.cc
index 813eb4d..e239a4f 100644 (file)
--- a/otk/pseudorendercontrol.cc
+++ b/otk/pseudorendercontrol.cc
@@ -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"

diff --git a/otk/rendercolor.cc b/otk/rendercolor.cc
index be9521b..5917b00 100644 (file)
--- a/otk/rendercolor.cc
+++ b/otk/rendercolor.cc
@@ -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 {
 

diff --git a/otk/rendercontrol.cc b/otk/rendercontrol.cc
index bf69a4e..58c8f55 100644 (file)
--- a/otk/rendercontrol.cc
+++ b/otk/rendercontrol.cc
@@ -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"

diff --git a/otk/renderstyle.cc b/otk/renderstyle.cc
index ae2a3a1..e7ae0e0 100644 (file)
--- a/otk/renderstyle.cc
+++ b/otk/renderstyle.cc
@@ -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"

diff --git a/otk/rendertest.cc b/otk/rendertest.cc
index 484a08f..b3a03a0 100644 (file)
--- a/otk/rendertest.cc
+++ b/otk/rendertest.cc
@@ -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)
 {

diff --git a/otk/screeninfo.cc b/otk/screeninfo.cc
index 535156e..2838c89 100644 (file)
--- a/otk/screeninfo.cc
+++ b/otk/screeninfo.cc
@@ -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>

diff --git a/otk/surface.cc b/otk/surface.cc
index 60e6824..7d7c0c5 100644 (file)
--- a/otk/surface.cc
+++ b/otk/surface.cc
@@ -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"

diff --git a/otk/timer.cc b/otk/timer.cc
index 4f99361..0a00831 100644 (file)
--- a/otk/timer.cc
+++ b/otk/timer.cc
@@ -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 {

diff --git a/otk/timer.hh b/otk/timer.hh
index 0ca8be8..556475c 100644 (file)
--- a/otk/timer.hh
+++ b/otk/timer.hh
@@ -7,16 +7,7 @@
 */
 
 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 @@ private:
   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

diff --git a/otk/truerendercontrol.cc b/otk/truerendercontrol.cc
index fffaa05..ec7bc46 100644 (file)
--- a/otk/truerendercontrol.cc
+++ b/otk/truerendercontrol.cc
@@ -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"

diff --git a/otk/ustring.cc b/otk/ustring.cc
index 7dbe8ec..8ffe07f 100644 (file)
--- a/otk/ustring.cc
+++ b/otk/ustring.cc
@@ -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 {
 

diff --git a/otk/util.cc b/otk/util.cc
index b33a114..03df393 100644 (file)
--- a/otk/util.cc
+++ b/otk/util.cc
@@ -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 @@ string expandTilde(const string& s) {
 
 
 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__
 }
 
 

diff --git a/otk/util.hh b/otk/util.hh
index e00a4e1..22d45fb 100644 (file)
--- a/otk/util.hh
+++ b/otk/util.hh
@@ -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>

diff --git a/src/actions.cc b/src/actions.cc
index bb5088e..3eb2921 100644 (file)
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -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 "bindings.hh"
 #include "otk/display.hh"
 
-#include <stdio.h>
+#include <cstdio>
 #include <algorithm>
 
 namespace ob {

diff --git a/src/bindings.cc b/src/bindings.cc
index 167d0a8..138aba8 100644 (file)
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -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"

diff --git a/src/client.cc b/src/client.cc
index e2c2dcb..2543457 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -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"

diff --git a/src/frame.cc b/src/frame.cc
index 17ebdb6..5f63d17 100644 (file)
--- a/src/frame.cc
+++ b/src/frame.cc
@@ -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

diff --git a/src/main.cc b/src/main.cc
index 83cbf51..1304778 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -4,19 +4,9 @@
   @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>
@@ -28,6 +18,9 @@ extern "C" {
 #include "openbox.hh"
 #include "otk/util.hh"
 
+#include <clocale>
+#include <cstdio>
+
 int main(int argc, char **argv) {
   // initialize the locale
   if (!setlocale(LC_ALL, ""))

diff --git a/src/openbox.cc b/src/openbox.cc
index 24b3278..9c1041a 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -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 @@ extern "C" {
 }
 
 #include <algorithm>
+#include <cstdio>
+#include <cstdlib>
 
 namespace ob {
 

diff --git a/src/screen.cc b/src/screen.cc
index 4878d7b..024c509 100644 (file)
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -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 @@ extern "C" {
 
 #include <vector>
 #include <algorithm>
+#include <cstdio>
+#include <cstring>
 
 static bool running;
 static int anotherWMRunning(Display *display, XErrorEvent *) {

diff --git a/wrap/ob.i b/wrap/ob.i
index 33cc540..0ba9a90 100644 (file)
--- a/wrap/ob.i
+++ b/wrap/ob.i
@@ -3,9 +3,7 @@
 %module ob
 
 %{
-#ifdef HAVE_CONFIG_H
-#  include "../config.h"
-#endif
+#include "config.h"
 
 #include "frame.hh"
 #include "openbox.hh"