move screen.cc/hh to bbscreen.cc/hh

[chaz/openbox] / util / epist / keytree.hh

diff --git a/util/epist/keytree.hh b/util/epist/keytree.hh
index 21acb2710705fdd77697bc5da99c6018541717df..172195ad2f58b3a9aefcdc3602f24e5b0bb00f35 100644 (file)
--- a/util/epist/keytree.hh
+++ b/util/epist/keytree.hh
@@ -24,7 +24,7 @@
 #define _keytree_hh
 
 #include <list>
-#include "../../src/Timer.hh"
+#include "../../src/timer.hh"
 #include "actions.hh"
 #include "screen.hh"
 
@@ -40,7 +40,7 @@ struct keynode {
 class keytree : public TimeoutHandler {
 public:
   keytree(Display *, epist *);
-  ~keytree();
+  virtual ~keytree();
 
   void grabDefaults(screen *);
   void ungrabDefaults(screen *);
@@ -72,8 +72,8 @@ private:
   keynode *_head;
   keynode *_current;
   Display *_display;
-  BTimer *_timer;
   screen *_timeout_screen;
+  BTimer *_timer;
   epist *_epist;
 };