diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-06-11 11:00:45 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-11-01 09:52:46 (GMT) |
commit | 8c208459910f1dddcfdeb00567b990eebfc218b8 (patch) | |
tree | 47c442f906124306a52e13641d28fc6cd1ac513e /src/Toolbar.hh | |
parent | 60cd98604ae0ee62d64e3bc852898f69dae221d4 (diff) | |
download | fluxbox_pavel-8c208459910f1dddcfdeb00567b990eebfc218b8.zip fluxbox_pavel-8c208459910f1dddcfdeb00567b990eebfc218b8.tar.bz2 |
Simplify FbTk::Resource template class
by outsourcing the conversion from string/lua to the specific type (and back) to a separate
class. This change touches a lot of files because the interface of FbTk::Resource changed
slightly. However, the changes are minor.
Diffstat (limited to 'src/Toolbar.hh')
-rw-r--r-- | src/Toolbar.hh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh index 9f737b4..eca379b 100644 --- a/src/Toolbar.hh +++ b/src/Toolbar.hh | |||
@@ -184,14 +184,14 @@ private: | |||
184 | Strut *m_strut; ///< created and destroyed by BScreen | 184 | Strut *m_strut; ///< created and destroyed by BScreen |
185 | 185 | ||
186 | // resources | 186 | // resources |
187 | FbTk::Resource<bool> m_rc_auto_hide, m_rc_maximize_over, m_rc_visible; | 187 | FbTk::BoolResource m_rc_auto_hide, m_rc_maximize_over, m_rc_visible; |
188 | FbTk::Resource<int> m_rc_width_percent; | 188 | FbTk::IntResource m_rc_width_percent; |
189 | FbTk::Resource<int> m_rc_alpha; | 189 | FbTk::IntResource m_rc_alpha; |
190 | FbTk::Resource<class ResourceLayer> m_rc_layernum; | 190 | FbTk::Resource<ResourceLayer::Type, FbTk::EnumTraits<ResourceLayer::Type> > m_rc_layernum; |
191 | FbTk::Resource<int> m_rc_on_head; | 191 | FbTk::IntResource m_rc_on_head; |
192 | FbTk::Resource<Placement> m_rc_placement; | 192 | FbTk::Resource<Placement, FbTk::EnumTraits<Placement> > m_rc_placement; |
193 | FbTk::Resource<int> m_rc_height; | 193 | FbTk::IntResource m_rc_height; |
194 | FbTk::Resource<std::string> m_rc_tools; | 194 | FbTk::StringResource m_rc_tools; |
195 | std::auto_ptr<FbTk::Shape> m_shape; | 195 | std::auto_ptr<FbTk::Shape> m_shape; |
196 | typedef std::list<std::string> StringList; | 196 | typedef std::list<std::string> StringList; |
197 | StringList m_tools; | 197 | StringList m_tools; |