aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Theme.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/FbTk/Theme.hh
parente90c3678d9e54bc9251619fdee2d7341f042167b (diff)
downloadfluxbox_pavel-e1f362ae764884a4cd1e1673292cb37d5a85f89c.zip
fluxbox_pavel-e1f362ae764884a4cd1e1673292cb37d5a85f89c.tar.bz2
'inline' in class declaration is implicitly inline
Diffstat (limited to 'src/FbTk/Theme.hh')
-rw-r--r--src/FbTk/Theme.hh20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/FbTk/Theme.hh b/src/FbTk/Theme.hh
index df2cea7..a935686 100644
--- a/src/FbTk/Theme.hh
+++ b/src/FbTk/Theme.hh
@@ -66,7 +66,7 @@ public:
66 ThemeItem(FbTk::Theme &tm, const std::string &name, const std::string &altname); 66 ThemeItem(FbTk::Theme &tm, const std::string &name, const std::string &altname);
67 virtual ~ThemeItem(); 67 virtual ~ThemeItem();
68 /// specialized 68 /// specialized
69 void setDefaultValue(); 69 void setDefaultValue();
70 /// specialized 70 /// specialized
71 virtual void setFromString(const char *strval); 71 virtual void setFromString(const char *strval);
72 /// specialized 72 /// specialized
@@ -77,10 +77,10 @@ public:
77 @name access operators 77 @name access operators
78 */ 78 */
79 /**@{*/ 79 /**@{*/
80 inline T& operator*() { return m_value; } 80 T& operator*() { return m_value; }
81 inline const T& operator*() const { return m_value; } 81 const T& operator*() const { return m_value; }
82 inline T *operator->() { return &m_value; } 82 T *operator->() { return &m_value; }
83 inline const T *operator->() const { return &m_value; } 83 const T *operator->() const { return &m_value; }
84 /**@}*/ 84 /**@}*/
85 85
86 FbTk::Theme &theme() { return m_tm; } 86 FbTk::Theme &theme() { return m_tm; }
@@ -112,7 +112,7 @@ public:
112 FbTk::Subject &reconfigSig() { return m_reconfig_sig; } 112 FbTk::Subject &reconfigSig() { return m_reconfig_sig; }
113 const FbTk::Subject &reconfigSig() const { return m_reconfig_sig; } 113 const FbTk::Subject &reconfigSig() const { return m_reconfig_sig; }
114 114
115 115
116private: 116private:
117 const int m_screen_num; 117 const int m_screen_num;
118 118
@@ -131,7 +131,7 @@ public:
131 typedef std::vector<ThemeList> ScreenThemeVector; 131 typedef std::vector<ThemeList> ScreenThemeVector;
132 132
133 static ThemeManager &instance(); 133 static ThemeManager &instance();
134 /// load style file "filename" to screen 134 /// load style file "filename" to screen
135 bool load(const std::string &filename, const std::string &overlay_filename, int screen_num = -1); 135 bool load(const std::string &filename, const std::string &overlay_filename, int screen_num = -1);
136 std::string resourceValue(const std::string &name, const std::string &altname); 136 std::string resourceValue(const std::string &name, const std::string &altname);
137 void loadTheme(Theme &tm); 137 void loadTheme(Theme &tm);
@@ -149,9 +149,9 @@ private:
149 ~ThemeManager() { } 149 ~ThemeManager() { }
150 150
151 friend class FbTk::Theme; // so only theme can register itself in constructor 151 friend class FbTk::Theme; // so only theme can register itself in constructor
152 /// @return false if screen_num if out of 152 /// @return false if screen_num if out of
153 /// range or theme already registered, else true 153 /// range or theme already registered, else true
154 bool registerTheme(FbTk::Theme &tm); 154 bool registerTheme(FbTk::Theme &tm);
155 /// @return false if theme isn't registred in the manager 155 /// @return false if theme isn't registred in the manager
156 bool unregisterTheme(FbTk::Theme &tm); 156 bool unregisterTheme(FbTk::Theme &tm);
157 /// map each theme manager to a screen 157 /// map each theme manager to a screen
@@ -167,7 +167,7 @@ private:
167 167
168 168
169template <typename T> 169template <typename T>
170ThemeItem<T>::ThemeItem(FbTk::Theme &tm, 170ThemeItem<T>::ThemeItem(FbTk::Theme &tm,
171 const std::string &name, const std::string &altname): 171 const std::string &name, const std::string &altname):
172 ThemeItem_base(name, altname), 172 ThemeItem_base(name, altname),
173 m_tm(tm) { 173 m_tm(tm) {