From af2201545205d5bf0844a993b05950e6f12805dd Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Fri, 10 Aug 2018 17:45:34 +0200 Subject: core: activate qPrefGeocoding remove Geocoding from SettingsObjectWrapper and reference qPrefFacebook update files using SettingsObjectWrapper/Geocoding to use qPrefFacebook this activated qPrefGeocoding and removed the similar class from SettingsObjectWrapper. Signed-off-by: Jan Iversen --- tests/testpreferences.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'tests') diff --git a/tests/testpreferences.cpp b/tests/testpreferences.cpp index 85534ccee..92e0596ef 100644 --- a/tests/testpreferences.cpp +++ b/tests/testpreferences.cpp @@ -57,22 +57,22 @@ void TestPreferences::testPreferences() TEST(pp->po2ThresholdMin(), 4.0); TEST(pp->po2ThresholdMax(), 5.0); - auto geo = pref->geocoding; - geo->setFirstTaxonomyCategory(TC_NONE); - geo->setSecondTaxonomyCategory(TC_OCEAN); - geo->setThirdTaxonomyCategory(TC_COUNTRY); - - TEST(geo->firstTaxonomyCategory(), TC_NONE); - TEST(geo->secondTaxonomyCategory(), TC_OCEAN); - TEST(geo->thirdTaxonomyCategory(), TC_COUNTRY); - - geo->setFirstTaxonomyCategory(TC_OCEAN); - geo->setSecondTaxonomyCategory(TC_COUNTRY); - geo->setThirdTaxonomyCategory(TC_NONE); - - TEST(geo->firstTaxonomyCategory(), TC_OCEAN); - TEST(geo->secondTaxonomyCategory(), TC_COUNTRY); - TEST(geo->thirdTaxonomyCategory(), TC_NONE); + auto geo = qPrefGeocoding::instance(); + geo->set_first_taxonomy_category(TC_NONE); + geo->set_second_taxonomy_category(TC_OCEAN); + geo->set_third_taxonomy_category(TC_COUNTRY); + + TEST(geo->first_taxonomy_category(), TC_NONE); + TEST(geo->second_taxonomy_category(), TC_OCEAN); + TEST(geo->third_taxonomy_category(), TC_COUNTRY); + + geo->set_first_taxonomy_category(TC_OCEAN); + geo->set_second_taxonomy_category(TC_COUNTRY); + geo->set_third_taxonomy_category(TC_NONE); + + TEST(geo->first_taxonomy_category(), TC_OCEAN); + TEST(geo->second_taxonomy_category(), TC_COUNTRY); + TEST(geo->third_taxonomy_category(), TC_NONE); auto general = pref->general_settings; general->setDefaultFilename("filename"); -- cgit v1.2.3-70-g09d2