aboutsummaryrefslogtreecommitdiff
path: root/src/main.cc
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/main.cc
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/main.cc')
-rw-r--r--src/main.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cc b/src/main.cc
index 8aea835..7fba919 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -400,7 +400,7 @@ void updateConfigFilesIfNeeded(const std::string& rc_file) {
400 const int CONFIG_VERSION = 13; // TODO: move this to 'defaults.hh' or 'config.h' 400 const int CONFIG_VERSION = 13; // TODO: move this to 'defaults.hh' or 'config.h'
401 401
402 FbTk::ResourceManager r_mgr(rc_file.c_str(), false); 402 FbTk::ResourceManager r_mgr(rc_file.c_str(), false);
403 FbTk::Resource<int> c_version(r_mgr, 0, "session.configVersion", "Session.ConfigVersion"); 403 FbTk::IntResource c_version(r_mgr, 0, "session.configVersion", "Session.ConfigVersion");
404 404
405 if (!r_mgr.load(rc_file.c_str())) { 405 if (!r_mgr.load(rc_file.c_str())) {
406 _FB_USES_NLS; 406 _FB_USES_NLS;