mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Untangle Library Linkage

Browse source 
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 <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2016-01-08 13:11:49 -02:00 • committed by Dirk Hohndel
parent 7b155774c5
commit 89eed5d36e
7 changed files with 36 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

30
qt-models/gpslistmodel.h
View file

@ -5,30 +5,6 @@
#include <QObject>
#include <QAbstractListModel>
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<int, QByteArray> roleNames() const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
void update();
private:
QList<GpsTracker> m_gpsFixes;
QVector<gpsTracker> m_gpsFixes;
static GpsListModel *m_instance;
};