rm prefixes for all elements in the otk namepsace

[chaz/openbox] / otk / timerqueue.hh

diff --git a/otk/timerqueue.hh b/otk/timerqueue.hh
index f9237a674960cf78f5db73cebc630b69a2f59b38..5a531ebe0723601af5dd5861950a39a88d068c57 100644 (file)
--- a/otk/timerqueue.hh
+++ b/otk/timerqueue.hh
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef __timerqueue_hh
 #define __timerqueue_hh
 
@@ -37,13 +37,12 @@ private:
 };
 
 struct TimerLessThan {
-  bool operator()(const OBTimer* const l, const OBTimer* const r) const {
+  bool operator()(const Timer* const l, const Timer* const r) const {
     return *r < *l;
   }
 };
 
-typedef _timer_queue<OBTimer*,
-                     std::vector<OBTimer*>, TimerLessThan> TimerQueue;
+typedef _timer_queue<Timer*, std::vector<Timer*>, TimerLessThan> TimerQueue;
 
 }