aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-06-11 11:00:45 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-11-01 09:52:46 (GMT)
commit8c208459910f1dddcfdeb00567b990eebfc218b8 (patch)
tree47c442f906124306a52e13641d28fc6cd1ac513e /src/fluxbox.hh
parent60cd98604ae0ee62d64e3bc852898f69dae221d4 (diff)
downloadfluxbox_paul-8c208459910f1dddcfdeb00567b990eebfc218b8.zip
fluxbox_paul-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/fluxbox.hh')
-rw-r--r--src/fluxbox.hh14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index d1e8e93..dad58f8 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -234,20 +234,20 @@ private:
234 234
235 //--- Resources 235 //--- Resources
236 236
237 FbTk::Resource<bool> m_rc_ignoreborder; 237 FbTk::BoolResource m_rc_ignoreborder;
238 FbTk::Resource<bool> m_rc_pseudotrans; 238 FbTk::BoolResource m_rc_pseudotrans;
239 FbTk::Resource<int> m_rc_colors_per_channel, 239 FbTk::IntResource m_rc_colors_per_channel,
240 m_rc_double_click_interval, 240 m_rc_double_click_interval,
241 m_rc_tabs_padding; 241 m_rc_tabs_padding;
242 FbTk::Resource<std::string> m_rc_stylefile, 242 FbTk::StringResource m_rc_stylefile,
243 m_rc_styleoverlayfile, 243 m_rc_styleoverlayfile,
244 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile, 244 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile,
245 m_rc_appsfile; 245 m_rc_appsfile;
246 246
247 247
248 FbTk::Resource<TabsAttachArea> m_rc_tabs_attach_area; 248 FbTk::Resource<TabsAttachArea, FbTk::EnumTraits<TabsAttachArea> > m_rc_tabs_attach_area;
249 FbTk::Resource<unsigned int> m_rc_cache_life, m_rc_cache_max; 249 FbTk::UIntResource m_rc_cache_life, m_rc_cache_max;
250 FbTk::Resource<time_t> m_rc_auto_raise_delay; 250 FbTk::Resource<time_t, FbTk::IntTraits<time_t> > m_rc_auto_raise_delay;
251 251
252 typedef std::map<Window, WinClient *> WinClientMap; 252 typedef std::map<Window, WinClient *> WinClientMap;
253 WinClientMap m_window_search; 253 WinClientMap m_window_search;