merged with 2_1-merged-to-HEAD-2002-09-30

[chaz/openbox] / src / Screen.hh

diff --git a/src/Screen.hh b/src/Screen.hh
index 517e186c5bb0b15c5da9e9204f764e014feafc67..c96c973e0ce2ea635e4b504a29e741ecc5314f4f 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -199,7 +199,7 @@ private:
   bool parseMenuFile(FILE *file, Rootmenu *menu);
 
 #ifdef    BITMAPBUTTONS
-  void readDatabaseMask(const string &rname,
+  void readDatabaseMask(const std::string &rname,
                         PixmapMask &pixmapMask,
                         const Configuration &style);
 #endif // BITMAPBUTTONS
@@ -272,7 +272,7 @@ public:
   inline Slit *getSlit(void) { return slit; }
   inline Toolbar *getToolbar(void) { return toolbar; }
 
-  Workspace *getWorkspace(unsigned int index);
+  Workspace *getWorkspace(unsigned int index) const;
 
   inline Workspace *getCurrentWorkspace(void) { return current_workspace; }
 
@@ -397,9 +397,9 @@ public:
   void reassociateWindow(BlackboxWindow *w, unsigned int wkspc_id,
                          bool ignore_sticky);
   void propagateWindowName(const BlackboxWindow *bw);
-  void prevFocus(void);
-  void nextFocus(void);
-  void raiseFocus(void);
+  void prevFocus(void) const;
+  void nextFocus(void) const;
+  void raiseFocus(void) const;
   void load_rc(void);
   void save_rc(void);
   void reconfigure(void);