X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.h;h=8135a329d4e53b654dcd1dd65fd37208cd1c9811;hb=0be1c1e8d72f5c5d8ef73c5c6a924e1f540a205a;hp=c51ffad74c9fa553e81f096d8f04f033f5c2907d;hpb=a619b3d1c80b24ac54910ba3b27e71fa1ffd0de2;p=chaz%2Fopenbox

diff --git a/src/openbox.h b/src/openbox.h
index c51ffad7..8135a329 100644
--- a/src/openbox.h
+++ b/src/openbox.h
@@ -66,8 +66,8 @@ private:
 public:
   DataSearch(Window w, Z *d): window(w), data(d) {}
 
-  inline const Window &getWindow(void) const { return window; }
-  inline Z *getData(void) { return data; }
+  inline const Window &getWindow() const { return window; }
+  inline Z *getData() { return data; }
 };
 
 
@@ -115,74 +115,73 @@ private:
   Window masked;
   char *rc_file, **argv;
   int argc;
-  obResource config;
+  Resource config;
 
 
 protected:
-  void load_rc(void);
-  void save_rc(void);
-  void reload_rc(void);
-  void symlink_rc(const char *) const;
-  void real_rereadMenu(void);
-  void real_reconfigure(void);
+  void load();
+  void save();
+  void real_rereadMenu();
+  void real_reconfigure();
 
   virtual void process_event(XEvent *);
 
 
 public:
   Openbox(int, char **, char * = 0, char * = 0);
-  virtual ~Openbox(void);
+  virtual ~Openbox();
 
 #ifdef    HAVE_GETPID
-  inline const Atom &getOpenboxPidAtom(void) const { return openbox_pid; }
+  inline const Atom &getOpenboxPidAtom() const { return openbox_pid; }
 #endif // HAVE_GETPID
 
   Basemenu *searchMenu(Window);
 
   OpenboxWindow *searchGroup(Window, OpenboxWindow *);
   OpenboxWindow *searchWindow(Window);
-  inline OpenboxWindow *getFocusedWindow(void) { return focused_window; }
+  inline OpenboxWindow *getFocusedWindow() { return focused_window; }
 
   BScreen *getScreen(int);
   BScreen *searchScreen(Window);
 
-  inline obResource &getConfig() {
+  inline Resource &getConfig() {
     return config;
   }
-  inline const Time &getDoubleClickInterval(void) const
+  inline const Time &getDoubleClickInterval() const
     { return resource.double_click_interval; }
-  inline const Time &getLastTime(void) const { return last_time; }
+  inline const Time &getLastTime() const { return last_time; }
 
   Toolbar *searchToolbar(Window);
 
-  inline const char *getStyleFilename(void) const
+  inline const char *getStyleFilename() const
     { return resource.style_file; }
-  inline const char *getMenuFilename(void) const
+  inline const char *getMenuFilename() const
     { return resource.menu_file; }
 
-  inline const int &getColorsPerChannel(void) const
+  inline const int &getColorsPerChannel() const
     { return resource.colors_per_channel; }
 
-  inline const timeval &getAutoRaiseDelay(void) const
+  inline const timeval &getAutoRaiseDelay() const
     { return resource.auto_raise_delay; }
 
-  inline const char *getTitleBarLayout(void) const
+  inline const char *getTitleBarLayout() const
     { return resource.titlebar_layout; }
 
-  inline const unsigned long &getCacheLife(void) const
+  inline const unsigned long &getCacheLife() const
     { return resource.cache_life; }
-  inline const unsigned long &getCacheMax(void) const
+  inline const unsigned long &getCacheMax() const
     { return resource.cache_max; }
 
+  inline OpenboxWindow *getMaskedWindow() const
+    { return masked_window; }
   inline void maskWindowEvents(Window w, OpenboxWindow *bw)
     { masked = w; masked_window = bw; }
   inline void setNoFocus(Bool f) { no_focus = f; }
 
   void setFocusedWindow(OpenboxWindow *w);
-  void shutdown(void);
-  void load_rc(BScreen *);
-  void saveStyleFilename(const char *);
-  void saveMenuFilename(const char *);
+  void shutdown();
+  void setStyleFilename(const char *);
+  void setMenuFilename(const char *);
   void saveMenuSearch(Window, Basemenu *);
   void saveWindowSearch(Window, OpenboxWindow *);
   void saveToolbarSearch(Window, Toolbar *);
@@ -192,13 +191,13 @@ public:
   void removeToolbarSearch(Window);
   void removeGroupSearch(Window);
   void restart(const char * = 0);
-  void reconfigure(void);
-  void rereadMenu(void);
-  void checkMenu(void);
+  void reconfigure();
+  void rereadMenu();
+  void checkMenu();
 
   virtual Bool handleSignal(int);
 
-  virtual void timeout(void);
+  virtual void timeout();
 
 #ifdef    SLIT
   Slit *searchSlit(Window);