mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: activate qPrefGeocoding

Browse source 
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 <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-10 17:45:34 +02:00 • committed by Dirk Hohndel
parent 3cd698361c
commit af22015452
6 changed files with 23 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tests/testpreferences.cpp
View file

@ -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);
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->firstTaxonomyCategory(), TC_NONE);
TEST(geo->secondTaxonomyCategory(), TC_OCEAN);
TEST(geo->thirdTaxonomyCategory(), TC_COUNTRY);
TEST(geo->first_taxonomy_category(), TC_NONE);
TEST(geo->second_taxonomy_category(), TC_OCEAN);
TEST(geo->third_taxonomy_category(), TC_COUNTRY);
geo->setFirstTaxonomyCategory(TC_OCEAN);
geo->setSecondTaxonomyCategory(TC_COUNTRY);
geo->setThirdTaxonomyCategory(TC_NONE);
geo->set_first_taxonomy_category(TC_OCEAN);
geo->set_second_taxonomy_category(TC_COUNTRY);
geo->set_third_taxonomy_category(TC_NONE);
TEST(geo->firstTaxonomyCategory(), TC_OCEAN);
TEST(geo->secondTaxonomyCategory(), TC_COUNTRY);
TEST(geo->thirdTaxonomyCategory(), 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");