aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Subsurface-mobile.pro2
-rw-r--r--core/gpslocation.cpp1
-rw-r--r--mobile-widgets/qmlmanager.cpp9
-rw-r--r--mobile-widgets/qmlmanager.h1
-rw-r--r--qt-models/CMakeLists.txt2
-rw-r--r--qt-models/gpslistmodel.cpp72
-rw-r--r--qt-models/gpslistmodel.h32
-rw-r--r--subsurface-helper.cpp7
8 files changed, 0 insertions, 126 deletions
diff --git a/Subsurface-mobile.pro b/Subsurface-mobile.pro
index 2e1b6a959..7a147e925 100644
--- a/Subsurface-mobile.pro
+++ b/Subsurface-mobile.pro
@@ -152,7 +152,6 @@ SOURCES += subsurface-mobile-main.cpp \
mobile-widgets/themeinterface.cpp \
qt-models/divesummarymodel.cpp \
qt-models/diveplotdatamodel.cpp \
- qt-models/gpslistmodel.cpp \
qt-models/completionmodels.cpp \
qt-models/divelocationmodel.cpp \
qt-models/maplocationmodel.cpp \
@@ -311,7 +310,6 @@ HEADERS += \
map-widget/qmlmapwidgethelper.h \
qt-models/divesummarymodel.h \
qt-models/diveplotdatamodel.h \
- qt-models/gpslistmodel.h \
qt-models/divelocationmodel.h \
qt-models/completionmodels.h \
qt-models/weightsysteminfomodel.h \
diff --git a/core/gpslocation.cpp b/core/gpslocation.cpp
index 72f0bb557..f4bb71374 100644
--- a/core/gpslocation.cpp
+++ b/core/gpslocation.cpp
@@ -2,7 +2,6 @@
#include "core/gpslocation.h"
#include "core/divesite.h"
#include "core/dive.h"
-#include "qt-models/gpslistmodel.h"
#include "core/pref.h"
#include "core/qthelper.h"
#include "core/errorhelper.h"
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp
index ee70679d5..31bf438d8 100644
--- a/mobile-widgets/qmlmanager.cpp
+++ b/mobile-widgets/qmlmanager.cpp
@@ -20,7 +20,6 @@
#include <QBluetoothLocalDevice>
-#include "qt-models/gpslistmodel.h"
#include "qt-models/completionmodels.h"
#include "qt-models/messagehandlermodel.h"
#include "qt-models/tankinfomodel.h"
@@ -1684,22 +1683,14 @@ void QMLManager::applyGpsData()
changesNeedSaving();
}
-void QMLManager::populateGpsData()
-{
- if (GpsListModel::instance())
- GpsListModel::instance()->update();
-}
-
void QMLManager::clearGpsData()
{
GpsLocation::instance()->clearGpsData();
- populateGpsData();
}
void QMLManager::deleteGpsFix(quint64 when)
{
GpsLocation::instance()->deleteGpsFix(when);
- populateGpsData();
}
QString QMLManager::logText() const
diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h
index f20856a8e..0f2db2e7a 100644
--- a/mobile-widgets/qmlmanager.h
+++ b/mobile-widgets/qmlmanager.h
@@ -214,7 +214,6 @@ public slots:
void redo();
int addDive();
void applyGpsData();
- void populateGpsData();
void cancelDownloadDC();
void clearGpsData();
QString getCombinedLogs();
diff --git a/qt-models/CMakeLists.txt b/qt-models/CMakeLists.txt
index 3c1ded741..3210bac7c 100644
--- a/qt-models/CMakeLists.txt
+++ b/qt-models/CMakeLists.txt
@@ -55,8 +55,6 @@ set(SUBSURFACE_DESKTOP_MODELS_LIB_SRCS
set(SUBSURFACE_MOBILE_MODELS_LIB_SRCS
divesummarymodel.cpp
divesummarymodel.h
- gpslistmodel.cpp
- gpslistmodel.h
messagehandlermodel.cpp
messagehandlermodel.h
mobilelistmodel.cpp
diff --git a/qt-models/gpslistmodel.cpp b/qt-models/gpslistmodel.cpp
deleted file mode 100644
index 1cb6c8271..000000000
--- a/qt-models/gpslistmodel.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include "qt-models/gpslistmodel.h"
-#include "core/subsurface-qt/divelistnotifier.h"
-#include "core/qthelper.h"
-#include <QVector>
-
-GpsListModel::GpsListModel()
-{
- connect(&diveListNotifier, &DiveListNotifier::dataReset, this, &GpsListModel::update);
-}
-
-void GpsListModel::update()
-{
- GpsLocation *glp = GpsLocation::instance();
- if (!glp)
- return;
- QVector<gpsTracker> trackers = QVector<gpsTracker>::fromList(glp->currentGPSInfo().values());
- beginResetModel();
- m_gpsFixes = trackers;
- endResetModel();
-}
-
-void GpsListModel::clear()
-{
- if (m_gpsFixes.count()) {
- beginRemoveRows(QModelIndex(), 0, m_gpsFixes.count() - 1);
- m_gpsFixes.clear();
- endRemoveRows();
- }
-}
-
-int GpsListModel::rowCount(const QModelIndex&) const
-{
- return m_gpsFixes.count();
-}
-
-QVariant GpsListModel::data(const QModelIndex &index, int role) const
-{
- if (index.row() < 0 || index.row() > m_gpsFixes.count())
- return QVariant();
-
- const gpsTracker &gt = m_gpsFixes[index.row()];
-
- if (role == GpsDateRole)
- return get_short_dive_date_string(gt.when);
- else if (role == GpsWhenRole)
- return gt.when;
- else if (role == GpsNameRole)
- return gt.name;
- else if (role == GpsLatitudeRole)
- return QString::number(gt.location.lat.udeg / 1000000.0, 'f', 6);
- else if (role == GpsLongitudeRole)
- return QString::number(gt.location.lon.udeg / 1000000.0, 'f', 6);
- return QVariant();
-}
-
-QHash<int, QByteArray> GpsListModel::roleNames() const
-{
- QHash<int, QByteArray> roles;
- roles[GpsDateRole] = "date";
- roles[GpsWhenRole] = "when";
- roles[GpsNameRole] = "name";
- roles[GpsLatitudeRole] = "latitude";
- roles[GpsLongitudeRole] = "longitude";
- return roles;
-}
-
-GpsListModel *GpsListModel::instance()
-{
- static GpsListModel self;
- return &self;
-}
diff --git a/qt-models/gpslistmodel.h b/qt-models/gpslistmodel.h
deleted file mode 100644
index bce84c985..000000000
--- a/qt-models/gpslistmodel.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#ifndef GPSLISTMODEL_H
-#define GPSLISTMODEL_H
-
-#include "core/gpslocation.h"
-#include <QObject>
-#include <QAbstractListModel>
-
-class GpsListModel : public QAbstractListModel
-{
- Q_OBJECT
-public:
- enum GpsListRoles {
- GpsDateRole = Qt::UserRole + 1,
- GpsNameRole,
- GpsLatitudeRole,
- GpsLongitudeRole,
- GpsWhenRole
- };
-
- static GpsListModel *instance();
- void clear();
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
- QHash<int, QByteArray> roleNames() const;
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- void update();
-private:
- GpsListModel();
- QVector<gpsTracker> m_gpsFixes;
-};
-
-#endif // GPSLISTMODEL_H
diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp
index 11f471a8b..39a830f20 100644
--- a/subsurface-helper.cpp
+++ b/subsurface-helper.cpp
@@ -19,7 +19,6 @@
#include "mobile-widgets/statsmanager.h"
#include "stats/chartlistmodel.h"
#include "qt-models/divesummarymodel.h"
-#include "qt-models/gpslistmodel.h"
#include "qt-models/messagehandlermodel.h"
#include "qt-models/mobilelistmodel.h"
#include "profile-widget/qmlprofile.h"
@@ -116,12 +115,6 @@ void run_mobile_ui(double initial_font_size)
// this is frustrating, but we appear to need different import paths on different OSs
engine.addImportPath(":");
engine.addImportPath("qrc://imports");
- QSortFilterProxyModel *gpsSortModel = new QSortFilterProxyModel(nullptr);
- gpsSortModel->setSourceModel(GpsListModel::instance());
- gpsSortModel->setDynamicSortFilter(true);
- gpsSortModel->setSortRole(GpsListModel::GpsWhenRole);
- gpsSortModel->sort(0, Qt::DescendingOrder);
- ctxt->setContextProperty("gpsModel", gpsSortModel);
ctxt->setContextProperty("vendorList", vendorList);
ctxt->setContextProperty("swipeModel", MobileModels::instance()->swipeModel());
ctxt->setContextProperty("diveModel", MobileModels::instance()->listModel());
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-24 02:14:10 +0000