From e826d4c63365dde4c988453846437dcb65370945 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 31 Aug 2017 01:34:38 +0300 Subject: Improve setting default values for configuration objects. --- src/dyetool/client.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/dyetool/client.cpp') 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(); -- cgit v1.2.3-60-g2f50