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-06-15 23:12:25 (GMT)
commitcd9df3b8144c4c41f7b57f0075fbb98ef7561296 (patch)
tree10ffc1692e4afbcb2c74b9db8c8a44b434ef62ca /src/main.cc
parent787c7a994d4328a9c90a037dd464f8007351b0c0 (diff)
downloadfluxbox_pavel-cd9df3b8144c4c41f7b57f0075fbb98ef7561296.zip
fluxbox_pavel-cd9df3b8144c4c41f7b57f0075fbb98ef7561296.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 00fa51f..057a863 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -382,7 +382,7 @@ void updateConfigFilesIfNeeded(const std::string& rc_file) {
382 const int CONFIG_VERSION = 13; // TODO: move this to 'defaults.hh' or 'config.h' 382 const int CONFIG_VERSION = 13; // TODO: move this to 'defaults.hh' or 'config.h'
383 383
384 FbTk::ResourceManager r_mgr(rc_file.c_str(), false); 384 FbTk::ResourceManager r_mgr(rc_file.c_str(), false);
385 FbTk::Resource<int> c_version(r_mgr, 0, "session.configVersion", "Session.ConfigVersion"); 385 FbTk::IntResource c_version(r_mgr, 0, "session.configVersion", "Session.ConfigVersion");
386 386
387 if (!r_mgr.load(rc_file.c_str())) { 387 if (!r_mgr.load(rc_file.c_str())) {
388 _FB_USES_NLS; 388 _FB_USES_NLS;