X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.hh;h=6f1cebc6087100194e71ddb91e3ea6b4d3b750ba;hb=59ef3022a4ce0a23e6d54f7d73a2aa77721e9cc9;hp=a0795acc6c27700cbc533d3eb6a22703cf786560;hpb=c97915f445017d36667a6ad32767fa41d14d23b1;p=chaz%2Fopenbox

diff --git a/otk/application.hh b/otk/application.hh
index a0795acc..6f1cebc6 100644
--- a/otk/application.hh
+++ b/otk/application.hh
@@ -4,10 +4,7 @@
 
 #include "eventdispatcher.hh"
 #include "display.hh"
-#include "configuration.hh"
-#include "timerqueuemanager.hh"
-#include "image.hh"
-#include "style.hh"
+#include "renderstyle.hh"
 
 namespace otk {
 
@@ -26,17 +23,14 @@ public:
   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);
 
   Display _display;
-  TimerQueueManager *_timer_manager;
-  ImageControl *_img_ctrl;
-  Configuration *_style_conf;
-  Style *_style;
+  RenderStyle *_style;
   bool _dockable;
 
   int _appwidget_count;