From 5bc99194da2db9f561a04751e7ed206a03dcc9c3 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 11 Sep 2021 16:53:44 -0700 Subject: [PATCH] mobile: remove locationService interfaces Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/main.qml | 1 - mobile-widgets/qmlmanager.cpp | 16 +--------------- mobile-widgets/qmlmanager.h | 12 ------------ 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index d775ab685..917bc1652 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -39,7 +39,6 @@ Kirigami.ApplicationWindow { pageStack.globalToolBar.maximumHeight: Kirigami.Units.gridUnit * 2 property alias notificationText: manager.notificationText - property alias locationServiceEnabled: manager.locationServiceEnabled property alias pluggedInDeviceName: manager.pluggedInDeviceName property alias defaultCylinderIndex: settingsWindow.defaultCylinderIndex property bool filterToggle: false diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 1553e1a4b..eb44faaaf 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -201,7 +201,7 @@ static bool unsavedChanges() return unsaved_changes() || !Command::isClean(); } -QMLManager::QMLManager() : m_locationServiceEnabled(false), +QMLManager::QMLManager() : m_verboseEnabled(false), m_diveListProcessing(false), m_initialized(false), @@ -1639,20 +1639,6 @@ void QMLManager::appendTextToLog(const QString &newText) qDebug() << QString::number(timer.elapsed() / 1000.0,'f', 3) + ": " + newText; } -void QMLManager::setLocationServiceEnabled(bool locationServiceEnabled) -{ - m_locationServiceEnabled = locationServiceEnabled; - GpsLocation::instance()->serviceEnable(m_locationServiceEnabled); - emit locationServiceEnabledChanged(); -} - -void QMLManager::setLocationServiceAvailable(bool locationServiceAvailable) -{ - appendTextToLog(QStringLiteral("location service is ") + (locationServiceAvailable ? QStringLiteral("available") : QStringLiteral("not available"))); - m_locationServiceAvailable = locationServiceAvailable; - emit locationServiceAvailableChanged(); -} - void QMLManager::setVerboseEnabled(bool verboseMode) { m_verboseEnabled = verboseMode; diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h index 2ccfa374b..96dff77b5 100644 --- a/mobile-widgets/qmlmanager.h +++ b/mobile-widgets/qmlmanager.h @@ -27,8 +27,6 @@ struct DiveSiteChange; // An obscure implementation artifact - remove in due cou class QMLManager : public QObject { Q_OBJECT - Q_PROPERTY(bool locationServiceEnabled MEMBER m_locationServiceEnabled WRITE setLocationServiceEnabled NOTIFY locationServiceEnabledChanged) - Q_PROPERTY(bool locationServiceAvailable MEMBER m_locationServiceAvailable WRITE setLocationServiceAvailable NOTIFY locationServiceAvailableChanged) Q_PROPERTY(bool loadFromCloud MEMBER m_loadFromCloud WRITE setLoadFromCloud NOTIFY loadFromCloudChanged) Q_PROPERTY(QString startPageText MEMBER m_startPageText WRITE setStartPageText NOTIFY startPageTextChanged) Q_PROPERTY(bool verboseEnabled MEMBER m_verboseEnabled WRITE setVerboseEnabled NOTIFY verboseEnabledChanged) @@ -125,12 +123,6 @@ public: Q_INVOKABLE void registerError(QString error); QString consumeError(); - bool locationServiceEnabled() const; - void setLocationServiceEnabled(bool locationServiceEnable); - - bool locationServiceAvailable() const; - void setLocationServiceAvailable(bool locationServiceAvailable); - bool verboseEnabled() const; void setVerboseEnabled(bool verboseMode); @@ -240,8 +232,6 @@ private: DiveSiteSortedModel locationModel; QString m_startPageText; QString m_lastError; - bool m_locationServiceEnabled; - bool m_locationServiceAvailable; bool m_verboseEnabled; bool m_diveListProcessing; bool m_initialized; @@ -284,8 +274,6 @@ private: qPrefCloudStorage::cloud_status m_oldStatus; signals: - void locationServiceEnabledChanged(); - void locationServiceAvailableChanged(); void verboseEnabledChanged(); void diveListProcessingChanged(); void initializedChanged();