summaryrefslogtreecommitdiff
path: root/src/dyetool/client.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-31 01:34:38 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-31 01:34:38 +0300
commite826d4c63365dde4c988453846437dcb65370945 (patch)
tree1bd23d4694c06d97e7e8c885253c0100fe6142b9 /src/dyetool/client.cpp
parent75ca03c95c90064e67fa9eaddb4c609196dd3a27 (diff)
downloadplus-e826d4c63365dde4c988453846437dcb65370945.tar.gz
plus-e826d4c63365dde4c988453846437dcb65370945.tar.bz2
plus-e826d4c63365dde4c988453846437dcb65370945.tar.xz
plus-e826d4c63365dde4c988453846437dcb65370945.zip
Improve setting default values for configuration objects.
Diffstat (limited to 'src/dyetool/client.cpp')
-rw-r--r--src/dyetool/client.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp
index 18fb9943c..42b570a6b 100644
--- a/src/dyetool/client.cpp
+++ b/src/dyetool/client.cpp
@@ -163,7 +163,7 @@ void Client::gameInit()
// Load branding information
if (!settings.options.brandingPath.empty())
branding.init(settings.options.brandingPath);
- branding.setDefaultValues(getBrandingDefaults());
+ setBrandingDefaults(branding);
Dirs::initRootDir();
Dirs::initHomeDir();
@@ -187,7 +187,7 @@ void Client::gameInit()
if (settings.options.test.empty())
ConfigManager::backupConfig("config.xml");
ConfigManager::initConfiguration();
- paths.setDefaultValues(getPathsDefaults());
+ setPathsDefaults(paths);
initPaths();
logger->log("init 4");
logger->setDebugLog(config.getBoolValue("debugLog"));
@@ -400,7 +400,7 @@ void Client::initGraphics()
graphicsManager.initGraphics();
imageHelper->postInit();
- getConfigDefaults2(config.getDefaultValues());
+ setConfigDefaults2(config);
WindowManager::applyGrabMode();
WindowManager::applyGamma();
@@ -676,7 +676,7 @@ int Client::gameExec()
logger->log("Init paths");
paths.init("paths.xml", UseVirtFs_true);
- paths.setDefaultValues(getPathsDefaults());
+ setPathsDefaults(paths);
initPaths();
TranslationManager::loadCurrentLang();
TranslationManager::loadDictionaryLang();