From 7747dc49a30beb0c7f165fab0685bfc563d14386 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sat, 4 Apr 2015 11:15:47 +0200
Subject: [PATCH] Settings type fix.

---
 src/gui/formabout.cpp                  | 2 +-
 src/miscellaneous/databasefactory.cpp  | 2 +-
 src/miscellaneous/settings.cpp         | 8 ++++----
 src/miscellaneous/settings.h           | 6 +++---
 src/miscellaneous/settingsproperties.h | 9 +++++----
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/gui/formabout.cpp b/src/gui/formabout.cpp
index a0fdc1344..8c60ec459 100755
--- a/src/gui/formabout.cpp
+++ b/src/gui/formabout.cpp
@@ -105,7 +105,7 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout)
                                                                                  APP_NAME));
 
   // Load additional paths information.
-  if (qApp->settings()->type() == SettingsType::Portable) {
+  if (qApp->settings()->type() == SettingsProperties::Portable) {
     m_ui->m_txtPathsSettingsType->setText(tr("FULLY portable"));
     m_ui->m_txtPathsDatabaseRoot->setText(QDir::toNativeSeparators(qApp->applicationDirPath() + QDir::separator() + QString(APP_DB_SQLITE_PATH)));
   }
diff --git a/src/miscellaneous/databasefactory.cpp b/src/miscellaneous/databasefactory.cpp
index 2a76189c4..2ebe6b9ab 100755
--- a/src/miscellaneous/databasefactory.cpp
+++ b/src/miscellaneous/databasefactory.cpp
@@ -114,7 +114,7 @@ void DatabaseFactory::finishRestoration() {
 }
 
 void DatabaseFactory::sqliteAssemblyDatabaseFilePath()  {
-  if (qApp->settings()->type() == SettingsType::Portable) {
+  if (qApp->settings()->type() == SettingsProperties::Portable) {
     m_sqliteDatabaseFilePath = qApp->applicationDirPath() + QDir::separator() + QString(APP_DB_SQLITE_PATH);
   }
   else {
diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp
index 1cf8eab5f..983e0b959 100755
--- a/src/miscellaneous/settings.cpp
+++ b/src/miscellaneous/settings.cpp
@@ -238,7 +238,7 @@ DVALUE(bool) Browser::QueueTabsDef  = true;
 // Categories.
 DKEY Categories::ID                         = "categories_expand_states";
 
-Settings::Settings(const QString &file_name, Format format, const SettingsType &status, QObject *parent)
+Settings::Settings(const QString &file_name, Format format, const SettingsProperties::SettingsType &status, QObject *parent)
   : QSettings(file_name, format, parent), m_initializationStatus(status) {
 }
 
@@ -298,7 +298,7 @@ Settings *Settings::setupSettings(QObject *parent) {
   QWebSettings::setIconDatabasePath(web_path);
 
   // Check if portable settings are available.
-  if (properties.m_type == SettingsType::Portable) {
+  if (properties.m_type == SettingsProperties::Portable) {
     qDebug("Initializing settings in '%s' (portable way).", qPrintable(QDir::toNativeSeparators(properties.m_absoluteSettingsFileName)));
   }
   else {
@@ -325,11 +325,11 @@ SettingsProperties Settings::determineProperties() {
   bool will_we_use_portable_settings = portable_settings_available && !non_portable_settings_exist;
 
   if (will_we_use_portable_settings) {
-    properties.m_type = SettingsType::Portable;
+    properties.m_type = SettingsProperties::Portable;
     properties.m_baseDirectory = app_path;
   }
   else {
-    properties.m_type = SettingsType::NonPortable;
+    properties.m_type = SettingsProperties::NonPortable;
     properties.m_baseDirectory = home_path;
   }
 
diff --git a/src/miscellaneous/settings.h b/src/miscellaneous/settings.h
index ab0cef82f..234129fa4 100755
--- a/src/miscellaneous/settings.h
+++ b/src/miscellaneous/settings.h
@@ -272,7 +272,7 @@ class Settings : public QSettings {
     virtual ~Settings();
 
     // Type of used settings.
-    inline SettingsType type() const {
+    inline SettingsProperties::SettingsType type() const {
       return m_initializationStatus;
     }
 
@@ -313,9 +313,9 @@ class Settings : public QSettings {
 
   private:
     // Constructor.
-    explicit Settings(const QString &file_name, Format format, const SettingsType &type, QObject *parent = 0);
+    explicit Settings(const QString &file_name, Format format, const SettingsProperties::SettingsType &type, QObject *parent = 0);
 
-    SettingsType m_initializationStatus;
+    SettingsProperties::SettingsType m_initializationStatus;
 };
 
 #endif // SETTINGS_H
diff --git a/src/miscellaneous/settingsproperties.h b/src/miscellaneous/settingsproperties.h
index 258c91a7f..2c7384299 100755
--- a/src/miscellaneous/settingsproperties.h
+++ b/src/miscellaneous/settingsproperties.h
@@ -5,13 +5,14 @@
 
 
 // Describes possible types of loaded settings.
-enum SettingsType {
-  Portable,
-  NonPortable
-};
 
 // Describes characteristics of settings.
 struct SettingsProperties {
+    enum SettingsType {
+      Portable,
+      NonPortable
+    };
+
     SettingsType m_type;
     QString m_baseDirectory;
     QString m_settingsSuffix;