diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2007-12-29 21:38:53 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2007-12-29 21:38:53 (GMT) |
commit | e1f362ae764884a4cd1e1673292cb37d5a85f89c (patch) | |
tree | 137430b26aee6f3638f27281d3757c2c75ef4b20 /src/Slit.hh | |
parent | e90c3678d9e54bc9251619fdee2d7341f042167b (diff) | |
download | fluxbox-e1f362ae764884a4cd1e1673292cb37d5a85f89c.zip fluxbox-e1f362ae764884a4cd1e1673292cb37d5a85f89c.tar.bz2 |
'inline' in class declaration is implicitly inline
Diffstat (limited to 'src/Slit.hh')
-rw-r--r-- | src/Slit.hh | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/Slit.hh b/src/Slit.hh index da21263..bc7a948 100644 --- a/src/Slit.hh +++ b/src/Slit.hh | |||
@@ -8,24 +8,24 @@ | |||
8 | // copy of this software and associated documentation files (the "Software"), | 8 | // copy of this software and associated documentation files (the "Software"), |
9 | // to deal in the Software without restriction, including without limitation | 9 | // to deal in the Software without restriction, including without limitation |
10 | // the rights to use, copy, modify, merge, publish, distribute, sublicense, | 10 | // the rights to use, copy, modify, merge, publish, distribute, sublicense, |
11 | // and/or sell copies of the Software, and to permit persons to whom the | 11 | // and/or sell copies of the Software, and to permit persons to whom the |
12 | // Software is furnished to do so, subject to the following conditions: | 12 | // Software is furnished to do so, subject to the following conditions: |
13 | // | 13 | // |
14 | // The above copyright notice and this permission notice shall be included in | 14 | // The above copyright notice and this permission notice shall be included in |
15 | // all copies or substantial portions of the Software. | 15 | // all copies or substantial portions of the Software. |
16 | // | 16 | // |
17 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | 17 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
18 | // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 18 | // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
19 | // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | 19 | // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
20 | // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | 20 | // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
21 | // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | 21 | // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
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$ | 25 | /// $Id$ |
26 | 26 | ||
27 | #ifndef SLIT_HH | 27 | #ifndef SLIT_HH |
28 | #define SLIT_HH | 28 | #define SLIT_HH |
29 | 29 | ||
30 | 30 | ||
31 | #include "LayerMenu.hh" | 31 | #include "LayerMenu.hh" |
@@ -54,7 +54,7 @@ class Layer; | |||
54 | /// Handles dock apps | 54 | /// Handles dock apps |
55 | class Slit: public FbTk::EventHandler, public FbTk::Observer, public LayerObject { | 55 | class Slit: public FbTk::EventHandler, public FbTk::Observer, public LayerObject { |
56 | public: | 56 | public: |
57 | typedef std::list<SlitClient *> SlitClients; | 57 | typedef std::list<SlitClient *> SlitClients; |
58 | /** | 58 | /** |
59 | Client alignment | 59 | Client alignment |
60 | */ | 60 | */ |
@@ -100,7 +100,7 @@ public: | |||
100 | //@} | 100 | //@} |
101 | 101 | ||
102 | void update(FbTk::Subject *subj); | 102 | void update(FbTk::Subject *subj); |
103 | 103 | ||
104 | void moveToLayer(int layernum); | 104 | void moveToLayer(int layernum); |
105 | void toggleHidden(); | 105 | void toggleHidden(); |
106 | 106 | ||
@@ -111,29 +111,29 @@ public: | |||
111 | 111 | ||
112 | int layerNumber() const { return m_layeritem->getLayerNum(); } | 112 | int layerNumber() const { return m_layeritem->getLayerNum(); } |
113 | 113 | ||
114 | inline bool isHidden() const { return m_hidden; } | 114 | bool isHidden() const { return m_hidden; } |
115 | inline bool acceptKdeDockapp() const { return *m_rc_kde_dockapp; } | 115 | bool acceptKdeDockapp() const { return *m_rc_kde_dockapp; } |
116 | inline bool doAutoHide() const { return *m_rc_auto_hide; } | 116 | bool doAutoHide() const { return *m_rc_auto_hide; } |
117 | inline Direction direction() const { return *m_rc_direction; } | 117 | Direction direction() const { return *m_rc_direction; } |
118 | inline Placement placement() const { return *m_rc_placement; } | 118 | Placement placement() const { return *m_rc_placement; } |
119 | inline int getOnHead() const { return *m_rc_on_head; } | 119 | int getOnHead() const { return *m_rc_on_head; } |
120 | void saveOnHead(int head); | 120 | void saveOnHead(int head); |
121 | FbTk::Menu &menu() { return m_slitmenu; } | 121 | FbTk::Menu &menu() { return m_slitmenu; } |
122 | 122 | ||
123 | inline const FbTk::FbWindow &window() const { return frame.window; } | 123 | const FbTk::FbWindow &window() const { return frame.window; } |
124 | 124 | ||
125 | inline int x() const { return (m_hidden ? frame.x_hidden : frame.x); } | 125 | int x() const { return (m_hidden ? frame.x_hidden : frame.x); } |
126 | inline int y() const { return (m_hidden ? frame.y_hidden : frame.y); } | 126 | int y() const { return (m_hidden ? frame.y_hidden : frame.y); } |
127 | 127 | ||
128 | inline unsigned int width() const { return frame.width; } | 128 | unsigned int width() const { return frame.width; } |
129 | inline unsigned int height() const { return frame.height; } | 129 | unsigned int height() const { return frame.height; } |
130 | const SlitClients &clients() const { return m_client_list; } | 130 | const SlitClients &clients() const { return m_client_list; } |
131 | SlitClients &clients() { return m_client_list; } | 131 | SlitClients &clients() { return m_client_list; } |
132 | private: | 132 | private: |
133 | void updateAlpha(); | 133 | void updateAlpha(); |
134 | void clearWindow(); | 134 | void clearWindow(); |
135 | void setupMenu(); | 135 | void setupMenu(); |
136 | 136 | ||
137 | void removeClient(SlitClient *client, bool remap, bool destroy); | 137 | void removeClient(SlitClient *client, bool remap, bool destroy); |
138 | void loadClientList(const char *filename); | 138 | void loadClientList(const char *filename); |
139 | void updateClientmenu(); | 139 | void updateClientmenu(); |
@@ -153,9 +153,9 @@ private: | |||
153 | 153 | ||
154 | struct frame { | 154 | struct frame { |
155 | frame(const FbTk::FbWindow &parent): | 155 | frame(const FbTk::FbWindow &parent): |
156 | window(parent, 0, 0, 10, 10, | 156 | window(parent, 0, 0, 10, 10, |
157 | SubstructureRedirectMask | ButtonPressMask | | 157 | SubstructureRedirectMask | ButtonPressMask | |
158 | EnterWindowMask | LeaveWindowMask | ExposureMask, | 158 | EnterWindowMask | LeaveWindowMask | ExposureMask, |
159 | true), // override redirect | 159 | true), // override redirect |
160 | x(0), y(0), x_hidden(0), y_hidden(0), | 160 | x(0), y(0), x_hidden(0), y_hidden(0), |
161 | width(10), height(10) {} | 161 | width(10), height(10) {} |