From e826d4c63365dde4c988453846437dcb65370945 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 31 Aug 2017 01:34:38 +0300
Subject: Improve setting default values for configuration objects.

---
 src/unittests/utils/chatutils.cc            | 4 ++--
 src/unittests/utils/stringutils.cc          | 2 +-
 src/unittests/utils/translation/poparser.cc | 4 ++--
 src/unittests/utils/xml.cc                  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/unittests/utils')

diff --git a/src/unittests/utils/chatutils.cc b/src/unittests/utils/chatutils.cc
index 681d91d3e..69e79db27 100644
--- a/src/unittests/utils/chatutils.cc
+++ b/src/unittests/utils/chatutils.cc
@@ -92,8 +92,8 @@ TEST_CASE("chatutils replaceVars", "")
     Dirs::initHomeDir();
 
     ConfigManager::initConfiguration();
-    getConfigDefaults2(config.getDefaultValues());
-    branding.setDefaultValues(getBrandingDefaults());
+    setConfigDefaults2(config);
+    setBrandingDefaults(branding);
 
     gui = new Gui();
     gui->postInit(mainGraphics);
diff --git a/src/unittests/utils/stringutils.cc b/src/unittests/utils/stringutils.cc
index ee0a00cb0..44bc4d13f 100644
--- a/src/unittests/utils/stringutils.cc
+++ b/src/unittests/utils/stringutils.cc
@@ -1498,7 +1498,7 @@ TEST_CASE("stringuntils replaceItemLinks", "")
 
     ItemDB::NamedItemInfos &namedInfos = ItemDB::getNamedItemInfosTest();
     ItemDB::ItemInfos &infos = ItemDB::getItemInfosTest();
-    paths.setDefaultValues(getPathsDefaults());
+    setPathsDefaults(paths);
     ItemInfo *info = new ItemInfo;
     info->setId(123456);
     info->setName("test name 1");
diff --git a/src/unittests/utils/translation/poparser.cc b/src/unittests/utils/translation/poparser.cc
index f724e66fb..a299617e9 100644
--- a/src/unittests/utils/translation/poparser.cc
+++ b/src/unittests/utils/translation/poparser.cc
@@ -83,8 +83,8 @@ TEST_CASE("PoParser tests", "PoParser")
     Dirs::initHomeDir();
 
     ConfigManager::initConfiguration();
-    getConfigDefaults2(config.getDefaultValues());
-    branding.setDefaultValues(getBrandingDefaults());
+    setConfigDefaults2(config);
+    setBrandingDefaults(branding);
 
     ActorSprite::load();
     gui = new Gui();
diff --git a/src/unittests/utils/xml.cc b/src/unittests/utils/xml.cc
index f9f7990f8..f27b65597 100644
--- a/src/unittests/utils/xml.cc
+++ b/src/unittests/utils/xml.cc
@@ -81,8 +81,8 @@ TEST_CASE("xml doc", "")
     Dirs::initHomeDir();
 
     ConfigManager::initConfiguration();
-    getConfigDefaults2(config.getDefaultValues());
-    branding.setDefaultValues(getBrandingDefaults());
+    setConfigDefaults2(config);
+    setBrandingDefaults(branding);
 
     theme = new Theme;
     Theme::selectSkin();
-- 
cgit v1.2.3-70-g09d2