diff options
-rw-r--r-- | mobile-widgets/CMakeLists.txt | 1 | ||||
-rw-r--r-- | mobile-widgets/qml/main.qml | 4 | ||||
-rw-r--r-- | mobile-widgets/qmlprefs.cpp | 45 | ||||
-rw-r--r-- | mobile-widgets/qmlprefs.h | 33 | ||||
-rw-r--r-- | packaging/ios/Subsurface-mobile.pro | 2 |
5 files changed, 0 insertions, 85 deletions
diff --git a/mobile-widgets/CMakeLists.txt b/mobile-widgets/CMakeLists.txt index 69cf7b4ec..1eecb7d3b 100644 --- a/mobile-widgets/CMakeLists.txt +++ b/mobile-widgets/CMakeLists.txt @@ -2,7 +2,6 @@ set(SUBSURFACE_MOBILE_SRCS qmlmanager.cpp - qmlprefs.cpp qml/kirigami/src/columnview.cpp qml/kirigami/src/delegaterecycler.cpp qml/kirigami/src/enums.cpp diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index a32fbb543..78d10e46c 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -818,10 +818,6 @@ if you have network connectivity and want to sync your data to cloud storage."), } } - QMLPrefs { - id: prefs - } - QMLManager { id: manager } diff --git a/mobile-widgets/qmlprefs.cpp b/mobile-widgets/qmlprefs.cpp deleted file mode 100644 index 3c2da7f73..000000000 --- a/mobile-widgets/qmlprefs.cpp +++ /dev/null @@ -1,45 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include "qmlprefs.h" -#include "qmlmanager.h" - -#include "core/membuffer.h" -#include "core/gpslocation.h" -#include "core/settings/qPrefUnit.h" - - -/*** Global and constructors ***/ -QMLPrefs *QMLPrefs::m_instance = NULL; - -QMLPrefs::QMLPrefs() : - m_oldStatus(qPrefCloudStorage::CS_UNKNOWN) -{ - // This strange construct is needed because QMLEngine calls new and that - // cannot be overwritten - if (!m_instance) - m_instance = this; -} - -QMLPrefs::~QMLPrefs() -{ - m_instance = NULL; -} - -QMLPrefs *QMLPrefs::instance() -{ - return m_instance; -} - - -/*** public functions ***/ -qPrefCloudStorage::cloud_status QMLPrefs::oldStatus() const -{ - return m_oldStatus; -} - -void QMLPrefs::setOldStatus(const qPrefCloudStorage::cloud_status value) -{ - if (m_oldStatus != value) { - m_oldStatus = value; - emit oldStatusChanged(); - } -} diff --git a/mobile-widgets/qmlprefs.h b/mobile-widgets/qmlprefs.h deleted file mode 100644 index 99ba038e2..000000000 --- a/mobile-widgets/qmlprefs.h +++ /dev/null @@ -1,33 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#ifndef QMLPREFS_H -#define QMLPREFS_H - -#include <QObject> -#include "core/settings/qPrefCloudStorage.h" -#include "core/settings/qPrefDisplay.h" - - -class QMLPrefs : public QObject { - Q_OBJECT - Q_PROPERTY(qPrefCloudStorage::cloud_status oldStatus - MEMBER m_oldStatus - WRITE setOldStatus - NOTIFY oldStatusChanged) -public: - QMLPrefs(); - ~QMLPrefs(); - - static QMLPrefs *instance(); - - qPrefCloudStorage::cloud_status oldStatus() const; - void setOldStatus(const qPrefCloudStorage::cloud_status value); - -private: - static QMLPrefs *m_instance; - qPrefCloudStorage::cloud_status m_oldStatus; - -signals: - void oldStatusChanged(); -}; - -#endif diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro index e8f4b2146..4b8aa079c 100644 --- a/packaging/ios/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile.pro @@ -111,7 +111,6 @@ SOURCES += ../../subsurface-mobile-main.cpp \ ../../backend-shared/exportfuncs.cpp \ ../../backend-shared/plannershared.cpp \ ../../mobile-widgets/qmlmanager.cpp \ - ../../mobile-widgets/qmlprefs.cpp \ ../../qt-models/divelistmodel.cpp \ ../../qt-models/diveplotdatamodel.cpp \ ../../qt-models/gpslistmodel.cpp \ @@ -244,7 +243,6 @@ HEADERS += \ ../../backend-shared/exportfuncs.h \ ../../backend-shared/plannershared.h \ ../../mobile-widgets/qmlmanager.h \ - ../../mobile-widgets/qmlprefs.h \ ../../map-widget/qmlmapwidgethelper.h \ ../../qt-models/divelistmodel.h \ ../../qt-models/diveplotdatamodel.h \ |