From d02a03983d91da1d10aac5b0a5d84d15e94e9291 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Sat, 16 Jun 2018 16:03:31 +0200 Subject: core: add qPref.h_and qPrefprivate.h add 2 header files and 1 cpp file (qPrefPrivate does not have an implementation) The rewrite/consoliadation of SettingsObjectWrapper, qmlmanager, qmlpref and planner needs a place to put common private parts (qPrefPrivate) and 1 common class (qPref). Signed-off-by: Jan Iversen --- core/settings/qPref.cpp | 18 +++++++++++ core/settings/qPref.h | 25 +++++++++++++++ core/settings/qPref_private.h | 72 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 core/settings/qPref.cpp create mode 100644 core/settings/qPref.h create mode 100644 core/settings/qPref_private.h (limited to 'core/settings') diff --git a/core/settings/qPref.cpp b/core/settings/qPref.cpp new file mode 100644 index 000000000..b703c1fcb --- /dev/null +++ b/core/settings/qPref.cpp @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "qPref_private.h" +#include "qPref.h" + + +qPref *qPref::m_instance = NULL; +qPref *qPref::instance() +{ + if (!m_instance) + m_instance = new qPref; + return m_instance; +} + + + +void qPref::loadSync(bool doSync) +{ +} diff --git a/core/settings/qPref.h b/core/settings/qPref.h new file mode 100644 index 000000000..4170e5e64 --- /dev/null +++ b/core/settings/qPref.h @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0 +#ifndef QPREF_H +#define QPREF_H + +#include +#include "core/pref.h" + +class qPref : public QObject { + Q_OBJECT + +public: + qPref(QObject *parent = NULL) : QObject(parent) {}; + ~qPref() {}; + static qPref *instance(); + + // Load/Sync local settings (disk) and struct preference + void loadSync(bool doSync); + +public: + +private: + static qPref *m_instance; +}; + +#endif diff --git a/core/settings/qPref_private.h b/core/settings/qPref_private.h new file mode 100644 index 000000000..96a3b1e5e --- /dev/null +++ b/core/settings/qPref_private.h @@ -0,0 +1,72 @@ +// SPDX-License-Identifier: GPL-2.0 +#ifndef QPREFPRIVATE_H +#define QPREFPRIVATE_H + +// Header used by all qPref implementations to avoid duplicating code + +#include +#include +#include +#include "core/qthelper.h" + +#define COPY_TXT(name, string) \ +{ \ + free((void *)prefs.name); \ + prefs.name = copy_qstring(string); \ +} + +#define LOADSYNC_INT(name, field) \ +{ \ + QSettings s; \ + if (doSync) \ + s.setValue(group + name, prefs.field); \ + else \ + prefs.field = s.value(group + name, default_prefs.field).toInt(); \ +} + +#define LOADSYNC_INT_DEF(name, field, defval) \ +{ \ + QSettings s; \ + if (doSync) \ + s.setValue(group + name, prefs.field); \ + else \ + prefs.field = s.value(group + name, defval).toInt(); \ +} + +#define LOADSYNC_ENUM(name, type, field) \ +{ \ + QSettings s; \ + if (doSync) \ + s.setValue(group + name, prefs.field); \ + else \ + prefs.field = (enum type)s.value(group + name, default_prefs.field).toInt(); \ +} + +#define LOADSYNC_BOOL(name, field) \ +{ \ + QSettings s; \ + if (doSync) \ + s.setValue(group + name, prefs.field); \ + else \ + prefs.field = s.value(group + name, default_prefs.field).toBool(); \ +} + +#define LOADSYNC_DOUBLE(name, field) \ +{ \ + QSettings s; \ + if (doSync) \ + s.setValue(group + name, prefs.field); \ + else \ + prefs.field = s.value(group + name, default_prefs.field).toDouble(); \ +} + +#define LOADSYNC_TXT(name, field) \ +{ \ + QSettings s; \ + if (doSync) \ + s.setValue(group + name, prefs.field); \ + else \ + prefs.field = copy_qstring(s.value(group + name, default_prefs.field).toString()); \ +} + +#endif -- cgit v1.2.3-70-g09d2