Avoid unneeded QSettings instantiation

guettli · Nov 17, 2021 · d36fb8d · d36fb8d
1 parent 174bf3f
commit d36fb8d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/src/common/config.cpp b/src/common/config.cpp
@@ -173,26 +173,37 @@ void ensureWindowOnScreen(QWidget *w)
     ensureWindowOnScreen(w, pos);
 }
 
-} // namespace
-
-QString getConfigurationFilePath(const char *suffix)
+QString getConfigurationFilePathHelper()
 {
     const QSettings settings(
                 QSettings::IniFormat, QSettings::UserScope,
                 QCoreApplication::organizationName(),
                 QCoreApplication::applicationName() );
-    QString path = settings.fileName();
+    return settings.fileName();
+}
+
+} // namespace
+
+const QString &getConfigurationFilePath()
+{
+    static const QString path = getConfigurationFilePathHelper();
+    return path;
+}
+
+QString getConfigurationFilePath(const char *suffix)
+{
+    QString path = getConfigurationFilePath();
     // Replace suffix.
     const int i = path.lastIndexOf(QLatin1Char('.'));
     Q_ASSERT(i != -1);
     Q_ASSERT( path.endsWith(QLatin1String(".ini")) );
     return path.leftRef(i) + QLatin1String(suffix);
 }
 
-QString settingsDirectoryPath()
+const QString &settingsDirectoryPath()
 {
     static const QString path =
-        QDir::cleanPath( getConfigurationFilePath("") + QLatin1String("/..") );
+        QDir::cleanPath( getConfigurationFilePath() + QLatin1String("/..") );
     return path;
 }
 

diff --git a/src/common/config.h b/src/common/config.h
@@ -26,6 +26,8 @@ class QString;
 class QVariant;
 class QWidget;
 
+QString getConfigurationFilePath();
+
 QString getConfigurationFilePath(const char *suffix);
 
 QString settingsDirectoryPath();

diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
@@ -21,6 +21,7 @@
 
 #include "ui_configtabappearance.h"
 
+#include "common/config.h"
 #include "common/log.h"
 #include "gui/iconfont.h"
 #include "platform/platformnativeinterface.h"
@@ -749,10 +750,7 @@ QColor evalColor(const QString &expression, const Theme &theme, const Values &va
 
 QString defaultUserThemePath()
 {
-    QSettings settings(QSettings::IniFormat, QSettings::UserScope,
-                       QCoreApplication::organizationName(),
-                       QCoreApplication::applicationName());
-    return QDir::cleanPath(settings.fileName() + "/../themes");
+    return QDir::cleanPath(settingsDirectoryPath() + "/themes");
 }
 
 QStringList themePaths()