core: make methods in qPrefPrivate static

Small cleanup, using static methods is simpler and faster

Added propSetValue and propValue instead of exposing setting
variable.

Signed-off-by: Jan Iversen <jani@apache.org>

1 files changed, 20 insertions, 7 deletions

diff --git a/core/settings/qPrefPrivate.cpp b/core/settings/qPrefPrivate.cpp
index 0275791cf..ff335a94f 100644
--- a/core/settings/qPrefPrivate.cpp
+++ b/core/settings/qPrefPrivate.cpp
@@ -1,17 +1,30 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "qPrefPrivate.h"
 
-qPrefPrivate::qPrefPrivate(QObject *parent) : QObject(parent)
+#include <QSettings>
+
+void qPrefPrivate::copy_txt(const char **name, const QString &string)
 {
+	free((void *)*name);
+	*name = copy_qstring(string);
 }
-qPrefPrivate *qPrefPrivate::instance()
+
+void qPrefPrivate::propSetValue(const QString &key, const QVariant &value)
 {
-	static qPrefPrivate *self = new qPrefPrivate;
-	return self;
+	// REMARK: making s static (which would be logical) does NOT work
+	// because it gets initialized too early.
+	// Having it as a local variable is light weight, because it is an
+	// interface class.
+	QSettings s;
+	s.setValue(key, value);
 }
 
-void qPrefPrivate::copy_txt(const char **name, const QString &string)
+QVariant qPrefPrivate::propValue(const QString &key, const QVariant &defaultValue)
 {
-	free((void *)*name);
-	*name = copy_qstring(string);
+	// REMARK: making s static (which would be logical) does NOT work
+	// because it gets initialized too early.
+	// Having it as a local variable is light weight, because it is an
+	// interface class.
+	QSettings s;
+	return  s.value(key, defaultValue);
 }