From d146d381e87bb1bed7945112549989b20484a45e Mon Sep 17 00:00:00 2001
From: Valentina Zhuravska <zhuravska19@gmail.com>
Date: Sun, 18 Oct 2015 14:51:14 +0300
Subject: [PATCH] Save valentina.exe Path Preferences to a file accessible by
 tape.exe without commonSettings

--HG--
branch : feature
---
 src/libs/vmisc/vcommonsettings.cpp | 17 ++++++++++-------
 src/libs/vmisc/vcommonsettings.h   |  2 --
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/libs/vmisc/vcommonsettings.cpp b/src/libs/vmisc/vcommonsettings.cpp
index 9845f75c7..97bc09826 100644
--- a/src/libs/vmisc/vcommonsettings.cpp
+++ b/src/libs/vmisc/vcommonsettings.cpp
@@ -68,47 +68,50 @@ const QString VCommonSettings::SettingGeneralToolbarsState             = QString
 //---------------------------------------------------------------------------------------------------------------------
 VCommonSettings::VCommonSettings(Format format, Scope scope, const QString &organization,
                             const QString &application, QObject *parent)
-    :QSettings(format, scope, organization, application, parent), commonSettings(format, scope, organization)
+    :QSettings(format, scope, organization, application, parent)
 {}
 
 //---------------------------------------------------------------------------------------------------------------------
 QString VCommonSettings::GetPathIndividualMeasurements() const
 {
-    QSettings settings(commonSettings.format(), commonSettings.scope(), commonSettings.organizationName());
+    QSettings settings(this->format(), this->scope(), this->organizationName());
     return settings.value(SettingPathsIndividualMeasurements, QDir::homePath()).toString();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 void VCommonSettings::SetPathIndividualMeasurements(const QString &value)
 {
-    commonSettings.setValue(SettingPathsIndividualMeasurements, value);
+    QSettings settings(this->format(), this->scope(), this->organizationName());
+    settings.setValue(SettingPathsIndividualMeasurements, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 QString VCommonSettings::GetPathStandardMeasurements() const
 {
-    QSettings settings(commonSettings.format(), commonSettings.scope(), commonSettings.organizationName());
+    QSettings settings(this->format(), this->scope(), this->organizationName());
     return settings.value(SettingPathsStandardMeasurements, StandardTablesPath()).toString();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 void VCommonSettings::SetPathStandardMeasurements(const QString &value)
 {
-    commonSettings.setValue(SettingPathsStandardMeasurements, value);
+    QSettings settings(this->format(), this->scope(), this->organizationName());
+    settings.setValue(SettingPathsStandardMeasurements, value);
 }
 
 
 //---------------------------------------------------------------------------------------------------------------------
 QString VCommonSettings::GetPathTemplate() const
 {
-    QSettings settings(commonSettings.format(), commonSettings.scope(), commonSettings.organizationName());
+    QSettings settings(this->format(), this->scope(), this->organizationName());
     return settings.value(SettingPathsTemplates, TemplatesPath()).toString();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 void VCommonSettings::SetPathTemplate(const QString &value)
 {
-    commonSettings.setValue(SettingPathsTemplates, value);
+    QSettings settings(this->format(), this->scope(), this->organizationName());
+    settings.setValue(SettingPathsTemplates, value);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vmisc/vcommonsettings.h b/src/libs/vmisc/vcommonsettings.h
index 5f4cdfda9..99ec159ad 100644
--- a/src/libs/vmisc/vcommonsettings.h
+++ b/src/libs/vmisc/vcommonsettings.h
@@ -102,8 +102,6 @@ public:
 private:
     Q_DISABLE_COPY(VCommonSettings)
 
-    QSettings commonSettings;
-
     static const QString SettingPathsIndividualMeasurements;
     static const QString SettingPathsStandardMeasurements;
     static const QString SettingPathsTemplates;