diff options
-rw-r--r-- | src/Slit.hh | 14 | ||||
-rw-r--r-- | src/Timer.hh | 4 | ||||
-rw-r--r-- | src/Workspace.cc | 11 | ||||
-rw-r--r-- | src/Workspace.hh | 6 | ||||
-rw-r--r-- | src/fluxbox.hh | 20 |
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: | |||
111 | explicit Slit(BScreen *); | 111 | explicit Slit(BScreen *); |
112 | virtual ~Slit(); | 112 | virtual ~Slit(); |
113 | 113 | ||
114 | inline const bool isOnTop(void) const { return on_top; } | 114 | inline bool isOnTop(void) const { return on_top; } |
115 | inline const bool isHidden(void) const { return hidden; } | 115 | inline bool isHidden(void) const { return hidden; } |
116 | inline const bool doAutoHide(void) const { return do_auto_hide; } | 116 | inline bool doAutoHide(void) const { return do_auto_hide; } |
117 | 117 | ||
118 | Slitmenu &getMenu() { return slitmenu; } | 118 | Slitmenu &getMenu() { return slitmenu; } |
119 | 119 | ||
120 | inline const Window &getWindowID() const { return frame.window; } | 120 | inline const Window &getWindowID() const { return frame.window; } |
121 | 121 | ||
122 | inline const int getX() const { return ((hidden) ? frame.x_hidden : frame.x); } | 122 | inline int getX() const { return ((hidden) ? frame.x_hidden : frame.x); } |
123 | inline const int getY() const { return ((hidden) ? frame.y_hidden : frame.y); } | 123 | inline int getY() const { return ((hidden) ? frame.y_hidden : frame.y); } |
124 | 124 | ||
125 | inline const unsigned int getWidth(void) const { return frame.width; } | 125 | inline unsigned int getWidth(void) const { return frame.width; } |
126 | inline const unsigned int getHeight(void) const { return frame.height; } | 126 | inline unsigned int getHeight(void) const { return frame.height; } |
127 | 127 | ||
128 | void addClient(Window); | 128 | void addClient(Window); |
129 | void removeClient(Window, bool = true); | 129 | 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: | |||
53 | explicit BTimer(TimeoutHandler *); | 53 | explicit BTimer(TimeoutHandler *); |
54 | virtual ~BTimer(void); | 54 | virtual ~BTimer(void); |
55 | 55 | ||
56 | inline const int isTiming(void) const { return m_timing; } | 56 | inline int isTiming(void) const { return m_timing; } |
57 | inline const int doOnce(void) const { return m_once; } | 57 | inline int doOnce(void) const { return m_once; } |
58 | 58 | ||
59 | inline const timeval &getTimeout(void) const { return m_timeout; } | 59 | inline const timeval &getTimeout(void) const { return m_timeout; } |
60 | inline const timeval &getStartTime(void) const { return m_start; } | 60 | 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 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Workspace.cc,v 1.19 2002/05/07 13:57:09 fluxgen Exp $ | 25 | // $Id: Workspace.cc,v 1.20 2002/05/17 11:03:36 fluxgen Exp $ |
26 | 26 | ||
27 | // use GNU extensions | 27 | // use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -77,7 +77,7 @@ Workspace::~Workspace() { | |||
77 | } | 77 | } |
78 | 78 | ||
79 | 79 | ||
80 | const int Workspace::addWindow(FluxboxWindow *w, bool place) { | 80 | int Workspace::addWindow(FluxboxWindow *w, bool place) { |
81 | if (! w) | 81 | if (! w) |
82 | return -1; | 82 | return -1; |
83 | 83 | ||
@@ -127,8 +127,9 @@ const int Workspace::addWindow(FluxboxWindow *w, bool place) { | |||
127 | } | 127 | } |
128 | 128 | ||
129 | 129 | ||
130 | const int Workspace::removeWindow(FluxboxWindow *w) { | 130 | int Workspace::removeWindow(FluxboxWindow *w) { |
131 | if (! w) return -1; | 131 | if (! w) |
132 | return -1; | ||
132 | 133 | ||
133 | stackingList.remove(w); | 134 | stackingList.remove(w); |
134 | 135 | ||
@@ -324,7 +325,7 @@ FluxboxWindow *Workspace::getWindow(unsigned int index) { | |||
324 | } | 325 | } |
325 | 326 | ||
326 | 327 | ||
327 | const int Workspace::getCount(void) const { | 328 | int Workspace::getCount(void) const { |
328 | return windowList.size(); | 329 | return windowList.size(); |
329 | } | 330 | } |
330 | 331 | ||
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: | |||
54 | void update(); | 54 | void update(); |
55 | void setCurrent(); | 55 | void setCurrent(); |
56 | void shutdown(); | 56 | void shutdown(); |
57 | const int addWindow(FluxboxWindow *window, bool place = false); | 57 | int addWindow(FluxboxWindow *window, bool place = false); |
58 | const int removeWindow(FluxboxWindow *); | 58 | int removeWindow(FluxboxWindow *); |
59 | 59 | ||
60 | inline BScreen *getScreen() const { return screen; } | 60 | inline BScreen *getScreen() const { return screen; } |
61 | inline FluxboxWindow *getLastFocusedWindow(void) const { return lastfocus; } | 61 | inline FluxboxWindow *getLastFocusedWindow(void) const { return lastfocus; } |
@@ -69,7 +69,7 @@ public: | |||
69 | inline const Windows &getWindowList() const { return windowList; } | 69 | inline const Windows &getWindowList() const { return windowList; } |
70 | bool isCurrent() const; | 70 | bool isCurrent() const; |
71 | bool isLastWindow(FluxboxWindow *window) const; | 71 | bool isLastWindow(FluxboxWindow *window) const; |
72 | const int getCount() const; | 72 | int getCount() const; |
73 | 73 | ||
74 | protected: | 74 | protected: |
75 | void placeWindow(FluxboxWindow *); | 75 | 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 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: fluxbox.hh,v 1.18 2002/05/02 07:14:22 fluxgen Exp $ | 25 | // $Id: fluxbox.hh,v 1.19 2002/05/17 11:07:36 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef FLUXBOX_HH | 27 | #ifndef FLUXBOX_HH |
28 | #define FLUXBOX_HH | 28 | #define FLUXBOX_HH |
@@ -101,22 +101,16 @@ public: | |||
101 | 101 | ||
102 | inline const std::vector<Fluxbox::Titlebar>& getTitlebarRight() { return *m_rc_titlebar_right; } | 102 | inline const std::vector<Fluxbox::Titlebar>& getTitlebarRight() { return *m_rc_titlebar_right; } |
103 | inline const std::vector<Fluxbox::Titlebar>& getTitlebarLeft() { return *m_rc_titlebar_left; } | 103 | inline const std::vector<Fluxbox::Titlebar>& getTitlebarLeft() { return *m_rc_titlebar_left; } |
104 | inline const char *getStyleFilename(void) | 104 | inline const char *getStyleFilename(void) const { return m_rc_stylefile->c_str(); } |
105 | { return m_rc_stylefile->c_str(); } | ||
106 | 105 | ||
107 | inline const char *getMenuFilename(void) | 106 | inline const char *getMenuFilename(void) const { return m_rc_menufile->c_str(); } |
108 | { return m_rc_menufile->c_str(); } | ||
109 | 107 | ||
110 | inline const int &getColorsPerChannel(void) | 108 | inline int getColorsPerChannel(void) const { return *m_rc_colors_per_channel; } |
111 | { return *m_rc_colors_per_channel; } | ||
112 | 109 | ||
113 | inline const timeval &getAutoRaiseDelay(void) const | 110 | inline const timeval &getAutoRaiseDelay(void) const { return resource.auto_raise_delay; } |
114 | { return resource.auto_raise_delay; } | ||
115 | 111 | ||
116 | inline const unsigned int getCacheLife(void) | 112 | inline unsigned int getCacheLife(void) const { return *m_rc_cache_life * 60000; } |
117 | { return *m_rc_cache_life * 60000; } | 113 | inline unsigned int getCacheMax(void) const { return *m_rc_cache_max; } |
118 | inline const unsigned int getCacheMax(void) | ||
119 | { return *m_rc_cache_max; } | ||
120 | 114 | ||
121 | inline void maskWindowEvents(Window w, FluxboxWindow *bw) | 115 | inline void maskWindowEvents(Window w, FluxboxWindow *bw) |
122 | { masked = w; masked_window = bw; } | 116 | { masked = w; masked_window = bw; } |