summaryrefslogtreecommitdiffstats
path: root/core/settings/qPref.h
diff options
context:
space:
mode:
authorGravatar jan Iversen <jani@apache.org>2018-08-14 09:56:20 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-08-15 16:11:39 -0700
commit0825f644e0b98190d68e0b63c4204fa8282e84b4 (patch)
tree82f9c2bfba158b25f1988e8614d28d2d67221a50 /core/settings/qPref.h
parent253d868328a8c43aacff3ad9e40c923881cae862 (diff)
downloadsubsurface-0825f644e0b98190d68e0b63c4204fa8282e84b4.tar.gz
core: make qPref.* use static
Prepare qPref.* to run load/sync Make variables and methods static to give easy access Make getter inline to give faster access Signed-off-by: Jan Iversen <jani@apache.org>:wq
Diffstat (limited to 'core/settings/qPref.h')
-rw-r--r--core/settings/qPref.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/core/settings/qPref.h b/core/settings/qPref.h
index 805bf68c5..36fd9d09a 100644
--- a/core/settings/qPref.h
+++ b/core/settings/qPref.h
@@ -1,8 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
#ifndef QPREF_H
#define QPREF_H
-
#include "core/pref.h"
+#include "ssrf-version.h"
+
#include <QObject>
#include "qPrefAnimations.h"
@@ -32,9 +33,8 @@ public:
static qPref *instance();
// Load/Sync local settings (disk) and struct preference
- void loadSync(bool doSync);
- void load() { loadSync(false); }
- void sync() { loadSync(true); }
+ static void load() { loadSync(false); }
+ static void sync() { loadSync(true); }
public:
enum cloud_status {
@@ -45,8 +45,11 @@ public:
CS_NOCLOUD
};
- const QString canonical_version() const;
- const QString mobile_version() const;
+ static const QString canonical_version() { return QString(CANONICAL_VERSION_STRING); }
+ static const QString mobile_version() { return QString(MOBILE_VERSION_STRING); }
+
+private:
+ static void loadSync(bool doSync);
};
#endif