summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tcanabrava@kde.org>2016-11-01 11:28:08 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-11-01 09:34:47 -0700
commit3966f3e7dd1421da72c8920c2fd6b246f0ee063a (patch)
treecf87bddfa57fab376f33d423b1061b679f82d38c
parent7f60951e75b89016102ff27b9c0196a1040bbb39 (diff)
downloadsubsurface-3966f3e7dd1421da72c8920c2fd6b246f0ee063a.tar.gz
Preferences tests: location updates & bug fix
Fixed loading the location preferences. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--core/subsurface-qt/SettingsObjectWrapper.cpp7
-rw-r--r--core/subsurface-qt/SettingsObjectWrapper.h2
-rw-r--r--tests/testpreferences.cpp13
3 files changed, 14 insertions, 8 deletions
diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp
index 0cd0568b4..d692c4b6d 100644
--- a/core/subsurface-qt/SettingsObjectWrapper.cpp
+++ b/core/subsurface-qt/SettingsObjectWrapper.cpp
@@ -2229,13 +2229,6 @@ void SettingsObjectWrapper::load()
// Subsurface webservice id is stored outside of the groups
GET_TXT("subsurface_webservice_uid", userid);
- // but the related time / distance threshold (only used in the mobile app)
- // are in their own group
- s.beginGroup("locationService");
- GET_INT("distance_threshold", distance_threshold);
- GET_INT("time_threshold", time_threshold);
- s.endGroup();
-
// GeoManagement
s.beginGroup("geocoding");
diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h
index d9b8196d4..bd12da5f5 100644
--- a/core/subsurface-qt/SettingsObjectWrapper.h
+++ b/core/subsurface-qt/SettingsObjectWrapper.h
@@ -668,7 +668,7 @@ signals:
void timeThresholdChanged(int value);
void distanceThresholdChanged(int value);
private:
- const QString group = QStringLiteral("locationService");
+ const QString group = QStringLiteral("LocationService");
};
class SettingsObjectWrapper : public QObject {
diff --git a/tests/testpreferences.cpp b/tests/testpreferences.cpp
index 9ad3ee079..c1ef2a8e2 100644
--- a/tests/testpreferences.cpp
+++ b/tests/testpreferences.cpp
@@ -537,6 +537,19 @@ void TestPreferences::testPreferences()
TEST(pref->animation_settings->animationSpeed(), 20);
pref->animation_settings->setAnimationSpeed(30);
TEST(pref->animation_settings->animationSpeed(), 30);
+
+ auto location = pref->location_settings;
+ location->setTimeThreshold(10);
+ location->setDistanceThreshold(20);
+
+ TEST(location->timeThreshold(), 10);
+ TEST(location->distanceThreshold(), 20);
+
+ location->setTimeThreshold(30);
+ location->setDistanceThreshold(40);
+
+ TEST(location->timeThreshold(), 30);
+ TEST(location->distanceThreshold(), 40);
}
QTEST_MAIN(TestPreferences)