WE DONT USE BASE DISPLAY FOR ANYTHING ANY MORE!!@^!*@*!! YAY

[chaz/openbox] / src / timer.hh

diff --git a/src/timer.hh b/src/timer.hh
index b022b0c43ebeb2c5c0980bdd7865d50dd279425d..121dfbc9f6bd62432c52f9f1106bd0036eae0f49 100644 (file)
--- a/src/timer.hh
+++ b/src/timer.hh
@@ -15,6 +15,12 @@ extern "C" {
 #endif // TIME_WITH_SYS_TIME
 }
 
+#include <queue>
+#include <algorithm>
+#include <vector>
+
+namespace ob {
+
 // forward declaration
 class TimerQueueManager;
 
@@ -64,9 +70,6 @@ public:
 };
 
 
-#include <queue>
-#include <algorithm>
-
 template <class _Tp, class _Sequence, class _Compare>
 class _timer_queue: protected std::priority_queue<_Tp, _Sequence, _Compare> {
 public:
@@ -97,7 +100,6 @@ struct TimerLessThan {
   }
 };
 
-#include <vector>
 typedef _timer_queue<BTimer*, std::vector<BTimer*>, TimerLessThan> TimerQueue;
 
 class TimerQueueManager {
@@ -106,4 +108,6 @@ public:
   virtual void removeTimer(BTimer* timer) = 0;
 };
 
+}
+
 #endif // _BLACKBOX_Timer_hh