mirror of
https://github.com/subsurface/subsurface.git
synced 2025-01-19 14:25:27 +00:00
core: create qPrefLocationService from SettingsObjectWrapper
Update set/get functions to follow common name scheme: - get function have same name as in struct prefs - set function have set_<name> - signal function have <name>_changed one class one .h/.cpp is the C++ idiom. Having load/sync of each variable in 1 functions (in contrast to the distributed way SettingsObjectWrapper handles it) secures the same storage name is used. Having the set/get/load/sync functions grouped together makes it easier to get an overview. REMARK: this commit only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
parent
c42a6e4027
commit
2b11fd4cc8
6 changed files with 71 additions and 0 deletions
|
@ -109,6 +109,7 @@ set(SUBSURFACE_CORE_LIB_SRCS
|
||||||
settings/qPrefDiveComputer.cpp
|
settings/qPrefDiveComputer.cpp
|
||||||
settings/qPrefDivePlanner.cpp
|
settings/qPrefDivePlanner.cpp
|
||||||
settings/qPrefFacebook.cpp
|
settings/qPrefFacebook.cpp
|
||||||
|
settings/qPrefLocationService.cpp
|
||||||
settings/qPrefPrivate.cpp
|
settings/qPrefPrivate.cpp
|
||||||
settings/qPrefProxy.cpp
|
settings/qPrefProxy.cpp
|
||||||
settings/qPrefTechnicalDetails.cpp
|
settings/qPrefTechnicalDetails.cpp
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
#include "qPrefDiveComputer.h"
|
#include "qPrefDiveComputer.h"
|
||||||
#include "qPrefDivePlanner.h"
|
#include "qPrefDivePlanner.h"
|
||||||
#include "qPrefFacebook.h"
|
#include "qPrefFacebook.h"
|
||||||
|
#include "qPrefLocationService.h"
|
||||||
#include "qPrefProxy.h"
|
#include "qPrefProxy.h"
|
||||||
#include "qPrefTechnicalDetails.h"
|
#include "qPrefTechnicalDetails.h"
|
||||||
#include "qPrefUnit.h"
|
#include "qPrefUnit.h"
|
||||||
|
|
25
core/settings/qPrefLocationService.cpp
Normal file
25
core/settings/qPrefLocationService.cpp
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
// SPDX-License-Identifier: GPL-2.0
|
||||||
|
#include "qPrefLocationService.h"
|
||||||
|
#include "qPref.h"
|
||||||
|
#include "qPrefPrivate.h"
|
||||||
|
|
||||||
|
static const QString group = QStringLiteral("LocationService");
|
||||||
|
|
||||||
|
qPrefLocationService::qPrefLocationService(QObject *parent) : QObject(parent)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
qPrefLocationService *qPrefLocationService::instance()
|
||||||
|
{
|
||||||
|
static qPrefLocationService *self = new qPrefLocationService;
|
||||||
|
return self;
|
||||||
|
}
|
||||||
|
|
||||||
|
void qPrefLocationService::loadSync(bool doSync)
|
||||||
|
{
|
||||||
|
disk_distance_threshold(doSync);
|
||||||
|
disk_time_threshold(doSync);
|
||||||
|
}
|
||||||
|
|
||||||
|
HANDLE_PREFERENCE_INT(LocationService, "/distance_threshold", distance_threshold);
|
||||||
|
|
||||||
|
HANDLE_PREFERENCE_INT(LocationService, "/time_threshold", time_threshold);
|
41
core/settings/qPrefLocationService.h
Normal file
41
core/settings/qPrefLocationService.h
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
// SPDX-License-Identifier: GPL-2.0
|
||||||
|
#ifndef QPREFLOCATIONSERVICE_H
|
||||||
|
#define QPREFLOCATIONSERVICE_H
|
||||||
|
#include "core/pref.h"
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
|
||||||
|
class qPrefLocationService : public QObject {
|
||||||
|
Q_OBJECT
|
||||||
|
Q_PROPERTY(int distance_threshold READ distance_threshold WRITE set_distance_threshold NOTIFY distance_threshold_changed);
|
||||||
|
Q_PROPERTY(int time_threshold READ time_threshold WRITE set_time_threshold NOTIFY time_threshold_changed);
|
||||||
|
|
||||||
|
public:
|
||||||
|
qPrefLocationService(QObject *parent = NULL);
|
||||||
|
static qPrefLocationService *instance();
|
||||||
|
|
||||||
|
// Load/Sync local settings (disk) and struct preference
|
||||||
|
void loadSync(bool doSync);
|
||||||
|
void load() { loadSync(false); }
|
||||||
|
void sync() { loadSync(true); }
|
||||||
|
|
||||||
|
public:
|
||||||
|
int distance_threshold() { return prefs.distance_threshold; }
|
||||||
|
int time_threshold() { return prefs.time_threshold; }
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
void set_distance_threshold(int value);
|
||||||
|
void set_time_threshold(int value);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void distance_threshold_changed(int value);
|
||||||
|
void time_threshold_changed(int value);
|
||||||
|
|
||||||
|
|
||||||
|
private:
|
||||||
|
void disk_distance_threshold(bool doSync);
|
||||||
|
void disk_time_threshold(bool doSync);
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
|
@ -20,6 +20,7 @@ public:
|
||||||
friend class qPrefDiveComputer;
|
friend class qPrefDiveComputer;
|
||||||
friend class qPrefDivePlanner;
|
friend class qPrefDivePlanner;
|
||||||
friend class qPrefFacebook;
|
friend class qPrefFacebook;
|
||||||
|
friend class qPrefLocationService;
|
||||||
friend class qPrefProxy;
|
friend class qPrefProxy;
|
||||||
friend class qPrefTechnicalDetails;
|
friend class qPrefTechnicalDetails;
|
||||||
friend class qPrefUnits;
|
friend class qPrefUnits;
|
||||||
|
|
|
@ -84,6 +84,7 @@ SOURCES += ../../subsurface-mobile-main.cpp \
|
||||||
../../core/settings/qPrefDiveComputer.cpp \
|
../../core/settings/qPrefDiveComputer.cpp \
|
||||||
../../core/settings/qPrefDivePlanner.cpp \
|
../../core/settings/qPrefDivePlanner.cpp \
|
||||||
../../core/settings/qPrefFacebook.cpp \
|
../../core/settings/qPrefFacebook.cpp \
|
||||||
|
../../core/settings/qPrefLocationService.cpp \
|
||||||
../../core/settings/qPrefPrivate.cpp \
|
../../core/settings/qPrefPrivate.cpp \
|
||||||
../../core/settings/qPrefProxy.cpp \
|
../../core/settings/qPrefProxy.cpp \
|
||||||
../../core/settings/qPrefTechnicalDetails.cpp \
|
../../core/settings/qPrefTechnicalDetails.cpp \
|
||||||
|
@ -202,6 +203,7 @@ HEADERS += \
|
||||||
../../core/settings/qPrefDiveComputer.h \
|
../../core/settings/qPrefDiveComputer.h \
|
||||||
../../core/settings/qPrefDivePlanner.h \
|
../../core/settings/qPrefDivePlanner.h \
|
||||||
../../core/settings/qPrefFacebook.h \
|
../../core/settings/qPrefFacebook.h \
|
||||||
|
../../core/settings/qPrefLocationService.h \
|
||||||
../../core/settings/qPrefPrivate.h \
|
../../core/settings/qPrefPrivate.h \
|
||||||
../../core/settings/qPrefProxy.h \
|
../../core/settings/qPrefProxy.h \
|
||||||
../../core/settings/qPrefTechnicalDetails.h \
|
../../core/settings/qPrefTechnicalDetails.h \
|
||||||
|
|
Loading…
Add table
Reference in a new issue