mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: Pass gpsTrackers directly to GpsListModel::update()

Browse source 
Instead of using the GpsLocation singleton in GpsListModel::update()
to extract the gpsTrackers, pass the gpsTrackers as function argument.

The caller has direct access to the GpsLocation object anyway and this
make things less entangled.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-09-22 14:52:25 +02:00
parent eae9a99615
commit 8576edd8d6
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mobile-widgets/qmlmanager.cpp
View file

@ -1556,7 +1556,7 @@ void QMLManager::applyGpsData()
void QMLManager::populateGpsData() void QMLManager::populateGpsData()
{ {
if (GpsListModel::instance()) if (GpsListModel::instance())
GpsListModel::instance()->update(); GpsListModel::instance()->update(QVector<gpsTracker>::fromList(locationProvider->currentGPSInfo().values()));
} }
void QMLManager::clearGpsData() void QMLManager::clearGpsData()

3
qt-models/gpslistmodel.cpp
View file

@ -7,9 +7,8 @@ GpsListModel::GpsListModel(QObject *parent) : QAbstractListModel(parent)
{ {
} }
void GpsListModel::update() void GpsListModel::update(QVector<gpsTracker> trackers)
{ {
QVector<gpsTracker> trackers = QVector<gpsTracker>::fromList(GpsLocation::instance()->currentGPSInfo().values());
beginResetModel(); beginResetModel();
m_gpsFixes = trackers; m_gpsFixes = trackers;
endResetModel(); endResetModel();

2
qt-models/gpslistmodel.h
View file

@ -24,7 +24,7 @@ public:
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const;
QHash<int, QByteArray> roleNames() const; QHash<int, QByteArray> roleNames() const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
void update(); void update(QVector<gpsTracker> trackers);
private: private:
QVector<gpsTracker> m_gpsFixes; QVector<gpsTracker> m_gpsFixes;
}; };