state the license. killall the old readme data

[chaz/openbox] / otk / application.hh

diff --git a/otk/application.hh b/otk/application.hh
index 63fb4195a5286c0d6ec4d4f0c8ddc0d30de97e3e..4d7b0d894cc04307fa2f2f7bb421d5b5cfe1963f 100644 (file)
--- a/otk/application.hh
+++ b/otk/application.hh
@@ -1,23 +1,23 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef __application_hh
 #define __application_hh
 
 #include "eventdispatcher.hh"
 #include "display.hh"
 #include "configuration.hh"
-#include "timerqueuemanager.hh"
 #include "image.hh"
 #include "style.hh"
 
 namespace otk {
 
-class OtkAppWidget;
+class AppWidget;
 
-class OtkApplication : public OtkEventDispatcher {
+class Application : public EventDispatcher {
 
 public:
 
-  OtkApplication(int argc, char **argv);
-  virtual ~OtkApplication();
+  Application(int argc, char **argv);
+  virtual ~Application();
 
   virtual void run(void);
   // more bummy cool functionality
@@ -25,21 +25,21 @@ public:
   void setDockable(bool dockable) { _dockable = dockable; }
   inline bool isDockable(void) const { return _dockable; }
 
-  inline otk::Style *getStyle(void) const { return _style; }
+  inline Style *getStyle(void) const { return _style; }
   // more accessors
 
 private:
   void loadStyle(void);
 
-  OBTimerQueueManager *_timer_manager;
-  BImageControl *_img_ctrl;
+  Display _display;
+  ImageControl *_img_ctrl;
   Configuration *_style_conf;
   Style *_style;
   bool _dockable;
 
   int _appwidget_count;
 
-  friend class OtkAppWidget;
+  friend class AppWidget;
 };
 
 }