diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-06-11 11:00:45 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2013-02-16 23:49:23 (GMT) |
commit | eb0eef14134ee667c60f75f53de4e24950f3c117 (patch) | |
tree | 58b35842e1f84666373478bca3386be037a7a019 /src/fluxbox.hh | |
parent | 3b7c1a3c220b7ccec0dee7804d36dabfe81449c4 (diff) | |
download | fluxbox_pavel-eb0eef14134ee667c60f75f53de4e24950f3c117.zip fluxbox_pavel-eb0eef14134ee667c60f75f53de4e24950f3c117.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.hh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh index f83934a..868d65c 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh | |||
@@ -233,20 +233,20 @@ private: | |||
233 | 233 | ||
234 | //--- Resources | 234 | //--- Resources |
235 | 235 | ||
236 | FbTk::Resource<bool> m_rc_ignoreborder; | 236 | FbTk::BoolResource m_rc_ignoreborder; |
237 | FbTk::Resource<bool> m_rc_pseudotrans; | 237 | FbTk::BoolResource m_rc_pseudotrans; |
238 | FbTk::Resource<int> m_rc_colors_per_channel, | 238 | FbTk::IntResource m_rc_colors_per_channel, |
239 | m_rc_double_click_interval, | 239 | m_rc_double_click_interval, |
240 | m_rc_tabs_padding; | 240 | m_rc_tabs_padding; |
241 | FbTk::Resource<std::string> m_rc_stylefile, | 241 | FbTk::StringResource m_rc_stylefile, |
242 | m_rc_styleoverlayfile, | 242 | m_rc_styleoverlayfile, |
243 | m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile, | 243 | m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile, |
244 | m_rc_appsfile; | 244 | m_rc_appsfile; |
245 | 245 | ||
246 | 246 | ||
247 | FbTk::Resource<TabsAttachArea> m_rc_tabs_attach_area; | 247 | FbTk::Resource<TabsAttachArea, FbTk::EnumTraits<TabsAttachArea> > m_rc_tabs_attach_area; |
248 | FbTk::Resource<unsigned int> m_rc_cache_life, m_rc_cache_max; | 248 | FbTk::UIntResource m_rc_cache_life, m_rc_cache_max; |
249 | FbTk::Resource<time_t> m_rc_auto_raise_delay; | 249 | FbTk::Resource<time_t, FbTk::IntTraits<time_t> > m_rc_auto_raise_delay; |
250 | 250 | ||
251 | typedef std::map<Window, WinClient *> WinClientMap; | 251 | typedef std::map<Window, WinClient *> WinClientMap; |
252 | WinClientMap m_window_search; | 252 | WinClientMap m_window_search; |