Centralized configuration default values using the VariableData system.

Please note that I didn't turned all the getValue() call into new ones,
simply because I have to have config object initiated which is not
forcefully the case the branding file.

Resolves: Manasource Mantis #170.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 12de1f91..152bf773 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -48,7 +48,7 @@ Theme *Theme::mInstance = 0;
 static void initDefaultThemePath()
 {
     ResourceManager *resman = ResourceManager::getInstance();
-    defaultThemePath = branding.getValue("guiThemePath", "");
+    defaultThemePath = branding.getStringValue("guiThemePath");
 
     if (!defaultThemePath.empty() && resman->isDirectory(defaultThemePath))
         return;
@@ -81,8 +81,8 @@ Skin::~Skin()
 
 void Skin::updateAlpha(float minimumOpacityAllowed)
 {
-    const float alpha = std::max((double)minimumOpacityAllowed,
-                                 config.getValue("guialpha", 0.8f));
+    const float alpha = std::max(minimumOpacityAllowed,
+                                              config.getFloatValue("guialpha"));
 
     for_each(mBorder.grid, mBorder.grid + 9,
              std::bind2nd(std::mem_fun(&Image::setAlpha), alpha));
@@ -339,9 +339,9 @@ bool Theme::tryThemePath(std::string themePath)
 void Theme::prepareThemePath()
 {
     // Try theme from settings
-    if (!tryThemePath(config.getValue("theme", "")))
+    if (!tryThemePath(config.getStringValue("theme")))
         // Try theme from branding
-        if (!tryThemePath(branding.getValue("theme", "")))
+        if (!tryThemePath(branding.getStringValue("theme")))
             // Use default
             mThemePath = defaultThemePath;