aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.hh
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2007-12-29 21:38:53 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2007-12-29 21:38:53 (GMT)
commite1f362ae764884a4cd1e1673292cb37d5a85f89c (patch)
tree137430b26aee6f3638f27281d3757c2c75ef4b20 /src/Toolbar.hh
parente90c3678d9e54bc9251619fdee2d7341f042167b (diff)
downloadfluxbox_pavel-e1f362ae764884a4cd1e1673292cb37d5a85f89c.zip
fluxbox_pavel-e1f362ae764884a4cd1e1673292cb37d5a85f89c.tar.bz2
'inline' in class declaration is implicitly inline
Diffstat (limited to 'src/Toolbar.hh')
-rw-r--r--src/Toolbar.hh56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 1e6b6a5..c648c05 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -24,8 +24,8 @@
24 24
25// $Id$ 25// $Id$
26 26
27#ifndef TOOLBAR_HH 27#ifndef TOOLBAR_HH
28#define TOOLBAR_HH 28#define TOOLBAR_HH
29 29
30#include "ToolbarTheme.hh" 30#include "ToolbarTheme.hh"
31#include "LayerMenu.hh" 31#include "LayerMenu.hh"
@@ -53,19 +53,19 @@ class ImageControl;
53class Shape; 53class Shape;
54} 54}
55 55
56/// The toolbar. 56/// The toolbar.
57/// Handles iconbar, workspace name view and clock view 57/// Handles iconbar, workspace name view and clock view
58class Toolbar: public FbTk::EventHandler, public FbTk::Observer, public LayerObject { 58class Toolbar: public FbTk::EventHandler, public FbTk::Observer, public LayerObject {
59public: 59public:
60 60
61 /// Toolbar placement on the screen 61 /// Toolbar placement on the screen
62 enum Placement{ 62 enum Placement{
63 // top and bottom placement 63 // top and bottom placement
64 TOPLEFT = 1, BOTTOMLEFT, TOPCENTER, 64 TOPLEFT = 1, BOTTOMLEFT, TOPCENTER,
65 BOTTOMCENTER, TOPRIGHT, BOTTOMRIGHT, 65 BOTTOMCENTER, TOPRIGHT, BOTTOMRIGHT,
66 // left and right placement 66 // left and right placement
67 LEFTCENTER, LEFTBOTTOM, LEFTTOP, 67 LEFTCENTER, LEFTBOTTOM, LEFTTOP,
68 RIGHTCENTER, RIGHTBOTTOM, RIGHTTOP 68 RIGHTCENTER, RIGHTBOTTOM, RIGHTTOP
69 }; 69 };
70 70
71 /// Create a toolbar on the screen with specific width 71 /// Create a toolbar on the screen with specific width
@@ -93,7 +93,7 @@ public:
93 void exposeEvent(XExposeEvent &ee); 93 void exposeEvent(XExposeEvent &ee);
94 void handleEvent(XEvent &event); 94 void handleEvent(XEvent &event);
95 //@} 95 //@}
96 96
97 void reconfigure(); 97 void reconfigure();
98 void setPlacement(Placement where); 98 void setPlacement(Placement where);
99 99
@@ -101,35 +101,35 @@ public:
101 101
102 int layerNumber() const { return const_cast<FbTk::XLayerItem &>(m_layeritem).getLayerNum(); } 102 int layerNumber() const { return const_cast<FbTk::XLayerItem &>(m_layeritem).getLayerNum(); }
103 103
104 inline const FbTk::Menu &menu() const { return m_toolbarmenu; } 104 const FbTk::Menu &menu() const { return m_toolbarmenu; }
105 inline FbTk::Menu &menu() { return m_toolbarmenu; } 105 FbTk::Menu &menu() { return m_toolbarmenu; }
106 inline FbTk::Menu &placementMenu() { return m_placementmenu; } 106 FbTk::Menu &placementMenu() { return m_placementmenu; }
107 inline const FbTk::Menu &placementMenu() const { return m_placementmenu; } 107 const FbTk::Menu &placementMenu() const { return m_placementmenu; }
108 108
109 inline FbTk::Menu &layerMenu() { return m_layermenu; } 109 FbTk::Menu &layerMenu() { return m_layermenu; }
110 inline const FbTk::Menu &layerMenu() const { return m_layermenu; } 110 const FbTk::Menu &layerMenu() const { return m_layermenu; }
111 111
112 /// are we hidden? 112 /// are we hidden?
113 inline bool isHidden() const { return m_hidden; } 113 bool isHidden() const { return m_hidden; }
114 /// do we auto hide the toolbar? 114 /// do we auto hide the toolbar?
115 inline bool doAutoHide() const { return *m_rc_auto_hide; } 115 bool doAutoHide() const { return *m_rc_auto_hide; }
116 /// @return X window of the toolbar 116 /// @return X window of the toolbar
117 inline const FbTk::FbWindow &window() const { return frame.window; } 117 const FbTk::FbWindow &window() const { return frame.window; }
118 inline BScreen &screen() { return m_screen; } 118 BScreen &screen() { return m_screen; }
119 inline const BScreen &screen() const { return m_screen; } 119 const BScreen &screen() const { return m_screen; }
120 inline unsigned int width() const { return frame.window.width(); } 120 unsigned int width() const { return frame.window.width(); }
121 inline unsigned int height() const { return frame.window.height(); } 121 unsigned int height() const { return frame.window.height(); }
122 inline int x() const { return isHidden() ? frame.x_hidden : frame.x; } 122 int x() const { return isHidden() ? frame.x_hidden : frame.x; }
123 inline int y() const { return isHidden() ? frame.y_hidden : frame.y; } 123 int y() const { return isHidden() ? frame.y_hidden : frame.y; }
124 inline Placement placement() const { return *m_rc_placement; } 124 Placement placement() const { return *m_rc_placement; }
125 /// @return pointer to iconbar if it got one, else 0 125 /// @return pointer to iconbar if it got one, else 0
126 inline const ToolbarTheme &theme() const { return m_theme; } 126 const ToolbarTheme &theme() const { return m_theme; }
127 inline ToolbarTheme &theme() { return m_theme; } 127 ToolbarTheme &theme() { return m_theme; }
128 bool isVertical() const; 128 bool isVertical() const;
129 129
130 inline int getOnHead() const { return *m_rc_on_head; } 130 int getOnHead() const { return *m_rc_on_head; }
131 131
132 inline unsigned char alpha() const { return *m_rc_alpha; } 132 unsigned char alpha() const { return *m_rc_alpha; }
133private: 133private:
134 void rearrangeItems(); 134 void rearrangeItems();
135 void deleteItems(); 135 void deleteItems();
@@ -165,7 +165,7 @@ private:
165 165
166 // themes 166 // themes
167 ToolbarTheme m_theme; 167 ToolbarTheme m_theme;
168 168
169 169
170 typedef std::list<ToolbarItem *> ItemList; 170 typedef std::list<ToolbarItem *> ItemList;
171 ItemList m_item_list; 171 ItemList m_item_list;