QgsSettings Q_GLOBAL_STATIC

qgis · Nov 2, 2019 · f8f9de8 · f8f9de8
1 parent 4ea4b67
commit f8f9de8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/core/qgssettings.cpp b/src/core/qgssettings.cpp
@@ -23,23 +23,23 @@
 #include "qgssettings.h"
 #include "qgslogger.h"
 
-QString QgsSettings::sGlobalSettingsPath = QString();
+Q_GLOBAL_STATIC( QString, sGlobalSettingsPath )
 
 bool QgsSettings::setGlobalSettingsPath( const QString &path )
 {
   if ( QFileInfo::exists( path ) )
   {
-    sGlobalSettingsPath = path;
+    *sGlobalSettingsPath() = path;
     return true;
   }
   return false;
 }
 
 void QgsSettings::init()
 {
-  if ( ! sGlobalSettingsPath.isEmpty() )
+  if ( ! sGlobalSettingsPath()->isEmpty() )
   {
-    mGlobalSettings = new QSettings( sGlobalSettingsPath, QSettings::IniFormat );
+    mGlobalSettings = new QSettings( *sGlobalSettingsPath(), QSettings::IniFormat );
     mGlobalSettings->setIniCodec( "UTF-8" );
   }
 }
@@ -166,6 +166,11 @@ QStringList QgsSettings::globalChildGroups() const
   return keys;
 }
 
+QString QgsSettings::globalSettingsPath()
+{
+  return *sGlobalSettingsPath();
+}
+
 QVariant QgsSettings::value( const QString &key, const QVariant &defaultValue, const QgsSettings::Section section ) const
 {
   QString pKey = prefixedKey( key, section );

diff --git a/src/core/qgssettings.h b/src/core/qgssettings.h
@@ -172,7 +172,7 @@ class CORE_EXPORT QgsSettings : public QObject
     //! Returns a list of all key top-level groups (same as childGroups) but only for groups defined in global settings.
     QStringList globalChildGroups() const;
     //! Returns the path to the Global Settings QSettings storage file
-    static QString globalSettingsPath() { return sGlobalSettingsPath; }
+    static QString globalSettingsPath();
     //! Sets the Global Settings QSettings storage file
     static bool setGlobalSettingsPath( const QString &path );
     //! Adds prefix to the current group and starts reading from an array. Returns the size of the array.
@@ -410,8 +410,6 @@ class CORE_EXPORT QgsSettings : public QObject
     void clear();
 
   private:
-
-    static QString sGlobalSettingsPath;
     void init();
     QString sanitizeKey( const QString &key ) const;
     QSettings *mUserSettings = nullptr;