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

20
subsurface-core/gpslocation.cpp
View file

@ -327,33 +327,29 @@ void GpsLocation::applyLocations()
mark_divelist_changed(true);
}
#ifdef SUBSURFACE_MOBILE
void GpsLocation::updateModel()
QVector< gpsTracker > GpsLocation::currentGPSInfo() const
{
GpsListModel *gpsListModel = GpsListModel::instance();
if (!gpsListModel) {
qDebug() << "no gpsListModel";
return;
}
QVector<gpsTracker> trackers;
int cnt = geoSettings->value("count", 0).toInt();
if (cnt == 0) {
qDebug() << "no gps fixes";
gpsListModel->clear();
return;
return trackers;
}
// create a table with the GPS information
trackers.reserve(cnt);
struct gpsTracker gt;
for (int i = 0; i < cnt; i++) {
gt.latitude.udeg = geoSettings->value(QString("gpsFix%1_lat").arg(i)).toInt();
gt.longitude.udeg = geoSettings->value(QString("gpsFix%1_lon").arg(i)).toInt();
gt.when = geoSettings->value(QString("gpsFix%1_time").arg(i)).toULongLong();
gt.name = geoSettings->value(QString("gpsFix%1_name").arg(i)).toString();
gpsListModel->addGpsFix(&gt);
trackers.append(gt);
}
qDebug() << "added" << cnt << "gps fixes to model";
return trackers;
}
#endif
void GpsLocation::clearGpsData()
{