From 89eed5d36e611f882dbf1e2686ad389f65688fa1 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Fri, 8 Jan 2016 13:11:49 -0200 Subject: Untangle Library Linkage with the adittion of gpslistmodel/location, the libraries qt-models had a direct dependency on subsurface-core, and subsurface-core had a direct dependency on qt-models, this is bad. Moving a bit of code around I'v managed to clean this out, and also to clear a bit of uneeded code (GpsTracker and gpsTracker where basically the same thing.) Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-models/gpslistmodel.h | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) (limited to 'qt-models/gpslistmodel.h') diff --git a/qt-models/gpslistmodel.h b/qt-models/gpslistmodel.h index 35a5a03c4..91a15540f 100644 --- a/qt-models/gpslistmodel.h +++ b/qt-models/gpslistmodel.h @@ -5,30 +5,6 @@ #include #include -class GpsTracker -{ -private: - quint64 m_when; - qint32 m_latitude; - qint32 m_longitude; - QString m_name; - -public: - GpsTracker(struct gpsTracker *gt) - { - m_when = gt->when; - m_latitude = gt->latitude.udeg; - m_longitude = gt->longitude.udeg; - m_name = gt->name; - } - GpsTracker(); - ~GpsTracker(); - uint64_t when() const; - int32_t latitude() const; - int32_t longitude() const; - QString name() const; -}; - class GpsListModel : public QAbstractListModel { Q_OBJECT @@ -43,14 +19,14 @@ public: static GpsListModel *instance(); GpsListModel(QObject *parent = 0); - void addGpsFix(struct gpsTracker *g); + void addGpsFix(gpsTracker g); void clear(); int rowCount(const QModelIndex &parent = QModelIndex()) const; QHash roleNames() const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - + void update(); private: - QList m_gpsFixes; + QVector m_gpsFixes; static GpsListModel *m_instance; }; -- cgit v1.2.3-70-g09d2