5 files changed, 25 insertions, 30 deletions

diff --git a/src/Slit.hh b/src/Slit.hh
index c81cda5..75111d0 100644
--- a/src/Slit.hh
+++ b/src/Slit.hh
@@ -111,19 +111,19 @@ public:
         explicit Slit(BScreen *);
         virtual ~Slit();
 
-        inline const bool isOnTop(void) const { return on_top; }
-        inline const bool isHidden(void) const { return hidden; }
-        inline const bool doAutoHide(void) const { return do_auto_hide; }
+        inline bool isOnTop(void) const { return on_top; }
+        inline bool isHidden(void) const { return hidden; }
+        inline bool doAutoHide(void) const { return do_auto_hide; }
 
         Slitmenu &getMenu() { return slitmenu; }
 
         inline const Window &getWindowID() const { return frame.window; }
 
-        inline const int getX() const { return ((hidden) ? frame.x_hidden : frame.x); }
-        inline const int getY() const { return ((hidden) ? frame.y_hidden : frame.y); }
+        inline int getX() const { return ((hidden) ? frame.x_hidden : frame.x); }
+        inline int getY() const { return ((hidden) ? frame.y_hidden : frame.y); }
 
-        inline const unsigned int getWidth(void) const { return frame.width; }
-        inline const unsigned int getHeight(void) const { return frame.height; }
+        inline unsigned int getWidth(void) const { return frame.width; }
+        inline unsigned int getHeight(void) const { return frame.height; }
 
         void addClient(Window);
         void removeClient(Window, bool = true);
diff --git a/src/Timer.hh b/src/Timer.hh
index 91d03b7..9b48754 100644
--- a/src/Timer.hh
+++ b/src/Timer.hh
@@ -53,8 +53,8 @@ public:
         explicit BTimer(TimeoutHandler *);
         virtual ~BTimer(void);
 
-        inline const int isTiming(void) const { return m_timing; } 
-        inline const int doOnce(void) const { return m_once; }
+        inline int isTiming(void) const { return m_timing; } 
+        inline int doOnce(void) const { return m_once; }
 
         inline const timeval &getTimeout(void) const { return m_timeout; }
         inline const timeval &getStartTime(void) const { return m_start; }
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 57d3a74..35cd20b 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Workspace.cc,v 1.19 2002/05/07 13:57:09 fluxgen Exp $
+// $Id: Workspace.cc,v 1.20 2002/05/17 11:03:36 fluxgen Exp $
 
 // use GNU extensions
 #ifndef  _GNU_SOURCE
@@ -77,7 +77,7 @@ Workspace::~Workspace() {
 }
 
 
-const int Workspace::addWindow(FluxboxWindow *w, bool place) {
+int Workspace::addWindow(FluxboxWindow *w, bool place) {
         if (! w)
                 return -1;
 
@@ -127,8 +127,9 @@ const int Workspace::addWindow(FluxboxWindow *w, bool place) {
 }
 
 
-const int Workspace::removeWindow(FluxboxWindow *w) {
-        if (! w) return -1;
+int Workspace::removeWindow(FluxboxWindow *w) {
+        if (! w) 
+                return -1;
 
         stackingList.remove(w);
 
@@ -324,7 +325,7 @@ FluxboxWindow *Workspace::getWindow(unsigned int index) {
 }
 
 
-const int Workspace::getCount(void) const {
+int Workspace::getCount(void) const {
         return windowList.size();
 }
 
diff --git a/src/Workspace.hh b/src/Workspace.hh
index fa7f245..7bf72f2 100644
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -54,8 +54,8 @@ public:
         void update();
         void setCurrent();
         void shutdown();
-        const int addWindow(FluxboxWindow *window, bool place = false);
-        const int removeWindow(FluxboxWindow *);
+        int addWindow(FluxboxWindow *window, bool place = false);
+        int removeWindow(FluxboxWindow *);
 
         inline BScreen *getScreen() const { return screen; }    
         inline FluxboxWindow *getLastFocusedWindow(void) const { return lastfocus; }    
@@ -69,7 +69,7 @@ public:
         inline const Windows &getWindowList() const { return windowList; }
         bool isCurrent() const;
         bool isLastWindow(FluxboxWindow *window) const;
-        const int getCount() const;
+        int getCount() const;
 
 protected:
         void placeWindow(FluxboxWindow *);
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index e9448dd..73daa94 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: fluxbox.hh,v 1.18 2002/05/02 07:14:22 fluxgen Exp $
+// $Id: fluxbox.hh,v 1.19 2002/05/17 11:07:36 fluxgen Exp $
 
 #ifndef  FLUXBOX_HH
 #define  FLUXBOX_HH
@@ -101,22 +101,16 @@ public:
         
         inline const std::vector<Fluxbox::Titlebar>& getTitlebarRight() { return *m_rc_titlebar_right; }
         inline const std::vector<Fluxbox::Titlebar>& getTitlebarLeft() { return *m_rc_titlebar_left; }
-        inline const char *getStyleFilename(void)
-                { return m_rc_stylefile->c_str(); }
+        inline const char *getStyleFilename(void) const { return m_rc_stylefile->c_str(); }
 
-        inline const char *getMenuFilename(void)
-                { return m_rc_menufile->c_str(); }
+        inline const char *getMenuFilename(void) const { return m_rc_menufile->c_str(); }
 
-        inline const int &getColorsPerChannel(void)
-                { return *m_rc_colors_per_channel; }
+        inline int getColorsPerChannel(void) const { return *m_rc_colors_per_channel; }
 
-        inline const timeval &getAutoRaiseDelay(void) const
-                { return resource.auto_raise_delay; }
+        inline const timeval &getAutoRaiseDelay(void) const { return resource.auto_raise_delay; }
 
-        inline const unsigned int getCacheLife(void)
-                { return *m_rc_cache_life * 60000; }
-        inline const unsigned int getCacheMax(void)
-                { return *m_rc_cache_max; }
+        inline unsigned int getCacheLife(void) const { return *m_rc_cache_life * 60000; }
+        inline unsigned int getCacheMax(void) const { return *m_rc_cache_max; }
 
         inline void maskWindowEvents(Window w, FluxboxWindow *bw)
                 { masked = w; masked_window = bw; }