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>2013-02-16 23:49:23 (GMT)
commiteb0eef14134ee667c60f75f53de4e24950f3c117 (patch)
tree58b35842e1f84666373478bca3386be037a7a019 /src/main.cc
parent3b7c1a3c220b7ccec0dee7804d36dabfe81449c4 (diff)
downloadfluxbox_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/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 a8d4608..fecda80 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -415,7 +415,7 @@ void updateConfigFilesIfNeeded(const std::string& rc_file) {
415 const int CONFIG_VERSION = 13; // TODO: move this to 'defaults.hh' or 'config.h' 415 const int CONFIG_VERSION = 13; // TODO: move this to 'defaults.hh' or 'config.h'
416 416
417 FbTk::ResourceManager r_mgr(rc_file.c_str(), false); 417 FbTk::ResourceManager r_mgr(rc_file.c_str(), false);
418 FbTk::Resource<int> c_version(r_mgr, 0, "session.configVersion", "Session.ConfigVersion"); 418 FbTk::IntResource c_version(r_mgr, 0, "session.configVersion", "Session.ConfigVersion");
419 419
420 if (!r_mgr.load(rc_file.c_str())) { 420 if (!r_mgr.load(rc_file.c_str())) {
421 _FB_USES_NLS; 421 _FB_USES_NLS;