X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.hh;h=a0795acc6c27700cbc533d3eb6a22703cf786560;hb=b989ec13f7774bdb4b2b8675a65da56cb2fe0ef4;hp=7696e73d3860cd5ef23327faf23600b1eb1dea77;hpb=12a95bfdb31595ec53d72adef4e0fd6bf1ccf218;p=chaz%2Fopenbox

diff --git a/otk/application.hh b/otk/application.hh
index 7696e73d..a0795acc 100644
--- a/otk/application.hh
+++ b/otk/application.hh
@@ -1,3 +1,4 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef __application_hh
 #define __application_hh
 
@@ -10,16 +11,16 @@
 
 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 exec(void);
+  virtual void run(void);
   // more bummy cool functionality
 
   void setDockable(bool dockable) { _dockable = dockable; }
@@ -31,15 +32,16 @@ public:
 private:
   void loadStyle(void);
 
-  OBTimerQueueManager *_timer_manager;
-  BImageControl *_img_ctrl;
+  Display _display;
+  TimerQueueManager *_timer_manager;
+  ImageControl *_img_ctrl;
   Configuration *_style_conf;
   Style *_style;
   bool _dockable;
 
   int _appwidget_count;
 
-  friend class OtkAppWidget;
+  friend class AppWidget;
 };
 
 }