From 75ce813a27fc22fca8e4b1c7484333235c9caea6 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Mon, 6 Aug 2018 17:36:29 +0200 Subject: core: activate qPrefLocationService remove LocationService from SettingsObjectWrapper and reference qPrefLocationService update files using SettingsObjectWrapper/LocationService to use qPrefLocationService this activated qPrefLocationService and removed the similar class from SettingsObjectWrapper. Signed-off-by: Jan Iversen --- core/subsurface-qt/SettingsObjectWrapper.h | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'core/subsurface-qt/SettingsObjectWrapper.h') diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h index 7b84f26d5..3af79404e 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.h +++ b/core/subsurface-qt/SettingsObjectWrapper.h @@ -183,24 +183,6 @@ private: const QString group = QStringLiteral("Language"); }; -class LocationServiceSettingsObjectWrapper : public QObject { - Q_OBJECT - Q_PROPERTY(int time_threshold READ timeThreshold WRITE setTimeThreshold NOTIFY timeThresholdChanged) - Q_PROPERTY(int distance_threshold READ distanceThreshold WRITE setDistanceThreshold NOTIFY distanceThresholdChanged) -public: - LocationServiceSettingsObjectWrapper(QObject *parent); - int timeThreshold() const; - int distanceThreshold() const; -public slots: - void setTimeThreshold(int value); - void setDistanceThreshold(int value); -signals: - void timeThresholdChanged(int value); - void distanceThresholdChanged(int value); -private: - const QString group = QStringLiteral("LocationService"); -}; - class SettingsObjectWrapper : public QObject { Q_OBJECT @@ -216,7 +198,7 @@ class SettingsObjectWrapper : public QObject { Q_PROPERTY(qPrefDisplay* display MEMBER display_settings CONSTANT) Q_PROPERTY(LanguageSettingsObjectWrapper* language MEMBER language_settings CONSTANT) Q_PROPERTY(qPrefAnimations* animation MEMBER animation_settings CONSTANT) - Q_PROPERTY(LocationServiceSettingsObjectWrapper* Location MEMBER location_settings CONSTANT) + Q_PROPERTY(qPrefLocationService* Location MEMBER location_settings CONSTANT) Q_PROPERTY(qPrefUpdateManager* update MEMBER update_manager_settings CONSTANT) Q_PROPERTY(qPrefDiveComputer* dive_computer MEMBER dive_computer_settings CONSTANT) @@ -235,7 +217,7 @@ public: qPrefDisplay *display_settings; LanguageSettingsObjectWrapper *language_settings; qPrefAnimations *animation_settings; - LocationServiceSettingsObjectWrapper *location_settings; + qPrefLocationService *location_settings; qPrefUpdateManager *update_manager_settings; qPrefDiveComputer *dive_computer_settings; -- cgit v1.2.3-70-g09d2