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 <jani@apache.org>

1 files changed, 2 insertions, 27 deletions

diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h
index 2fe2a7b5a..a34025da8 100644
--- a/core/subsurface-qt/SettingsObjectWrapper.h
+++ b/core/subsurface-qt/SettingsObjectWrapper.h
@@ -56,31 +56,6 @@ private:
 	const QString group = QStringLiteral("TecDetails");
 };
 
-/* Control the state of the Geocoding preferences */
-class GeocodingPreferences : public QObject {
-	Q_OBJECT
-	Q_PROPERTY(taxonomy_category first_category     READ firstTaxonomyCategory  WRITE setFirstTaxonomyCategory  NOTIFY firstTaxonomyCategoryChanged)
-	Q_PROPERTY(taxonomy_category second_category    READ secondTaxonomyCategory WRITE setSecondTaxonomyCategory NOTIFY secondTaxonomyCategoryChanged)
-	Q_PROPERTY(taxonomy_category third_category     READ thirdTaxonomyCategory  WRITE setThirdTaxonomyCategory  NOTIFY thirdTaxonomyCategoryChanged)
-public:
-	GeocodingPreferences(QObject *parent);
-	taxonomy_category firstTaxonomyCategory() const;
-	taxonomy_category secondTaxonomyCategory() const;
-	taxonomy_category thirdTaxonomyCategory() const;
-
-public slots:
-	void setFirstTaxonomyCategory(taxonomy_category value);
-	void setSecondTaxonomyCategory(taxonomy_category value);
-	void setThirdTaxonomyCategory(taxonomy_category value);
-
-signals:
-	void firstTaxonomyCategoryChanged(taxonomy_category value);
-	void secondTaxonomyCategoryChanged(taxonomy_category value);
-	void thirdTaxonomyCategoryChanged(taxonomy_category value);
-private:
-	const QString group = QStringLiteral("geocoding");
-};
-
 class GeneralSettingsObjectWrapper : public QObject {
 	Q_OBJECT
 	Q_PROPERTY(QString default_filename              READ defaultFilename                WRITE setDefaultFilename                NOTIFY defaultFilenameChanged)
@@ -144,7 +119,7 @@ class SettingsObjectWrapper : public QObject {
 	Q_PROPERTY(qPrefTechnicalDetails*   techical_details MEMBER techDetails CONSTANT)
 	Q_PROPERTY(PartialPressureGasSettings* pp_gas           MEMBER pp_gas CONSTANT)
 	Q_PROPERTY(qPrefFacebook*           facebook         MEMBER facebook CONSTANT)
-	Q_PROPERTY(GeocodingPreferences*       geocoding        MEMBER geocoding CONSTANT)
+	Q_PROPERTY(qPrefGeocoding*       geocoding        MEMBER geocoding CONSTANT)
 	Q_PROPERTY(qPrefProxy*              proxy            MEMBER proxy CONSTANT)
 	Q_PROPERTY(qPrefCloudStorage*       cloud_storage    MEMBER cloud_storage CONSTANT)
 	Q_PROPERTY(qPrefDivePlanner*        planner          MEMBER planner_settings CONSTANT)
@@ -163,7 +138,7 @@ public:
 	qPrefTechnicalDetails *techDetails;
 	PartialPressureGasSettings *pp_gas;
 	qPrefFacebook *facebook;
-	GeocodingPreferences *geocoding;
+	qPrefGeocoding *geocoding;
 	qPrefProxy *proxy;
 	qPrefCloudStorage *cloud_storage;
 	qPrefDivePlanner *planner_settings;