diff options
-rw-r--r-- | core/settings/qPref.cpp | 1 | ||||
-rw-r--r-- | core/settings/qPrefDisplay.cpp | 1 | ||||
-rw-r--r-- | core/settings/qPrefDiveComputer.cpp | 1 | ||||
-rw-r--r-- | core/settings/qPrefDivePlanner.cpp | 1 | ||||
-rw-r--r-- | core/settings/qPrefFacebook.cpp | 1 | ||||
-rw-r--r-- | core/settings/qPrefGeneral.cpp | 1 | ||||
-rw-r--r-- | core/settings/qPrefGeocoding.cpp | 1 | ||||
-rw-r--r-- | core/settings/qPrefGeocoding.h | 6 | ||||
-rw-r--r-- | core/settings/qPrefLocationService.cpp | 1 | ||||
-rw-r--r-- | core/settings/qPrefPartialPressureGas.cpp | 1 | ||||
-rw-r--r-- | core/settings/qPrefProxy.cpp | 1 | ||||
-rw-r--r-- | core/settings/qPrefUnit.cpp | 1 |
12 files changed, 14 insertions, 3 deletions
diff --git a/core/settings/qPref.cpp b/core/settings/qPref.cpp index 90aedd925..d1e3d8b23 100644 --- a/core/settings/qPref.cpp +++ b/core/settings/qPref.cpp @@ -5,6 +5,7 @@ qPref::qPref(QObject *parent) : QObject(parent) { } + qPref *qPref::instance() { static qPref *self = new qPref; diff --git a/core/settings/qPrefDisplay.cpp b/core/settings/qPrefDisplay.cpp index 4d218e19e..bb793d711 100644 --- a/core/settings/qPrefDisplay.cpp +++ b/core/settings/qPrefDisplay.cpp @@ -44,6 +44,7 @@ static int st_lastState_default = false; qPrefDisplay::qPrefDisplay(QObject *parent) : QObject(parent) { } + qPrefDisplay *qPrefDisplay::instance() { static qPrefDisplay *self = new qPrefDisplay; diff --git a/core/settings/qPrefDiveComputer.cpp b/core/settings/qPrefDiveComputer.cpp index 7b5fa061e..60b0de266 100644 --- a/core/settings/qPrefDiveComputer.cpp +++ b/core/settings/qPrefDiveComputer.cpp @@ -7,6 +7,7 @@ static const QString group = QStringLiteral("DiveComputer"); qPrefDiveComputer::qPrefDiveComputer(QObject *parent) : QObject(parent) { } + qPrefDiveComputer *qPrefDiveComputer::instance() { static qPrefDiveComputer *self = new qPrefDiveComputer; diff --git a/core/settings/qPrefDivePlanner.cpp b/core/settings/qPrefDivePlanner.cpp index 78ee53111..ecb8fcf3b 100644 --- a/core/settings/qPrefDivePlanner.cpp +++ b/core/settings/qPrefDivePlanner.cpp @@ -8,6 +8,7 @@ static const QString group = QStringLiteral("Planner"); qPrefDivePlanner::qPrefDivePlanner(QObject *parent) : QObject(parent) { } + qPrefDivePlanner *qPrefDivePlanner::instance() { static qPrefDivePlanner *self = new qPrefDivePlanner; diff --git a/core/settings/qPrefFacebook.cpp b/core/settings/qPrefFacebook.cpp index 8ce8faf08..02c1df072 100644 --- a/core/settings/qPrefFacebook.cpp +++ b/core/settings/qPrefFacebook.cpp @@ -7,6 +7,7 @@ static const QString group = QStringLiteral("WebApps/Facebook"); qPrefFacebook::qPrefFacebook(QObject *parent) : QObject(parent) { } + qPrefFacebook*qPrefFacebook::instance() { static qPrefFacebook *self = new qPrefFacebook; diff --git a/core/settings/qPrefGeneral.cpp b/core/settings/qPrefGeneral.cpp index f2ae46494..14868abcd 100644 --- a/core/settings/qPrefGeneral.cpp +++ b/core/settings/qPrefGeneral.cpp @@ -14,6 +14,7 @@ static const bool st_diveshareExport_private_default = false; qPrefGeneral::qPrefGeneral(QObject *parent) : QObject(parent) { } + qPrefGeneral *qPrefGeneral::instance() { static qPrefGeneral *self = new qPrefGeneral; diff --git a/core/settings/qPrefGeocoding.cpp b/core/settings/qPrefGeocoding.cpp index 9597799ca..1b1813731 100644 --- a/core/settings/qPrefGeocoding.cpp +++ b/core/settings/qPrefGeocoding.cpp @@ -7,6 +7,7 @@ static const QString group = QStringLiteral("geocoding"); qPrefGeocoding::qPrefGeocoding(QObject *parent) : QObject(parent) { } + qPrefGeocoding *qPrefGeocoding::instance() { static qPrefGeocoding *self = new qPrefGeocoding; diff --git a/core/settings/qPrefGeocoding.h b/core/settings/qPrefGeocoding.h index 3ed3fb034..9af704e47 100644 --- a/core/settings/qPrefGeocoding.h +++ b/core/settings/qPrefGeocoding.h @@ -17,9 +17,9 @@ public: static qPrefGeocoding *instance(); // Load/Sync local settings (disk) and struct preference - void loadSync(bool doSync); - void load() { loadSync(false); } - void sync() { loadSync(true); } + static void loadSync(bool doSync); + static void load() { loadSync(false); } + static void sync() { loadSync(true); } public: taxonomy_category first_taxonomy_category() { return prefs.geocoding.category[0]; } diff --git a/core/settings/qPrefLocationService.cpp b/core/settings/qPrefLocationService.cpp index 7c9bc8378..716a194c9 100644 --- a/core/settings/qPrefLocationService.cpp +++ b/core/settings/qPrefLocationService.cpp @@ -7,6 +7,7 @@ static const QString group = QStringLiteral("LocationService"); qPrefLocationService::qPrefLocationService(QObject *parent) : QObject(parent) { } + qPrefLocationService *qPrefLocationService::instance() { static qPrefLocationService *self = new qPrefLocationService; diff --git a/core/settings/qPrefPartialPressureGas.cpp b/core/settings/qPrefPartialPressureGas.cpp index 4ff74c646..d7d20952a 100644 --- a/core/settings/qPrefPartialPressureGas.cpp +++ b/core/settings/qPrefPartialPressureGas.cpp @@ -7,6 +7,7 @@ static const QString group = QStringLiteral("TecDetails"); qPrefPartialPressureGas::qPrefPartialPressureGas(QObject *parent) : QObject(parent) { } + qPrefPartialPressureGas *qPrefPartialPressureGas::instance() { static qPrefPartialPressureGas *self = new qPrefPartialPressureGas; diff --git a/core/settings/qPrefProxy.cpp b/core/settings/qPrefProxy.cpp index b9bd90ea9..4ca02815b 100644 --- a/core/settings/qPrefProxy.cpp +++ b/core/settings/qPrefProxy.cpp @@ -9,6 +9,7 @@ static const QString group = QStringLiteral("Network"); qPrefProxy::qPrefProxy(QObject *parent) : QObject(parent) { } + qPrefProxy *qPrefProxy::instance() { static qPrefProxy *self = new qPrefProxy; diff --git a/core/settings/qPrefUnit.cpp b/core/settings/qPrefUnit.cpp index c2f47b225..ec50f7da3 100644 --- a/core/settings/qPrefUnit.cpp +++ b/core/settings/qPrefUnit.cpp @@ -8,6 +8,7 @@ static const QString group = QStringLiteral("Units"); qPrefUnits::qPrefUnits(QObject *parent) : QObject(parent) { } + qPrefUnits *qPrefUnits::instance() { static qPrefUnits *self = new qPrefUnits; |