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

diff --git a/otk/application.hh b/otk/application.hh
index 7696e73d..6f1cebc6 100644
--- a/otk/application.hh
+++ b/otk/application.hh
@@ -1,45 +1,41 @@
+// -*- 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"
+#include "renderstyle.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 exec(void);
+  virtual void run(void);
   // more bummy cool functionality
 
   void setDockable(bool dockable) { _dockable = dockable; }
   inline bool isDockable(void) const { return _dockable; }
 
-  inline Style *getStyle(void) const { return _style; }
+  inline RenderStyle *getStyle(void) const { return _style; }
   // more accessors
 
 private:
   void loadStyle(void);
 
-  OBTimerQueueManager *_timer_manager;
-  BImageControl *_img_ctrl;
-  Configuration *_style_conf;
-  Style *_style;
+  Display _display;
+  RenderStyle *_style;
   bool _dockable;
 
   int _appwidget_count;
 
-  friend class OtkAppWidget;
+  friend class AppWidget;
 };
 
 }