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

mobile: replace locationProvider with calls to GpsLocation::instance()

Browse source 
This makes it more obvious what we are doing. And won't make any difference
from a performance perspective.

Also converted the last call to connect using the old syntax to the new syntax.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2021-01-01 15:03:48 -08:00
parent 5048a695aa
commit c6f134a9b1
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
mobile-widgets/qmlmanager.cpp
View file

@ -289,12 +289,11 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false),
connect(&btDiscovery->localBtDevice, &QBluetoothLocalDevice::hostModeStateChanged, connect(&btDiscovery->localBtDevice, &QBluetoothLocalDevice::hostModeStateChanged,
this, &QMLManager::btHostModeChange); this, &QMLManager::btHostModeChange);
} }
// create location manager service // add log call back to the location manager service singleton
locationProvider = GpsLocation::instance(); GpsLocation::instance()->setLogCallBack(&appendTextToLogStandalone);
locationProvider->setLogCallBack(&appendTextToLogStandalone);
progress_callback = &progressCallback; progress_callback = &progressCallback;
connect(locationProvider, SIGNAL(haveSourceChanged()), this, SLOT(hasLocationSourceChanged())); connect(GpsLocation::instance(), &GpsLocation::haveSourceChanged, this, &QMLManager::hasLocationSourceChanged);
setLocationServiceAvailable(locationProvider->hasLocationsSource()); setLocationServiceAvailable(GpsLocation::instance()->hasLocationsSource());
set_git_update_cb(&gitProgressCB); set_git_update_cb(&gitProgressCB);
// present dive site lists sorted by name // present dive site lists sorted by name
@ -1614,25 +1613,25 @@ int QMLManager::addDive()
QString QMLManager::getCurrentPosition() QString QMLManager::getCurrentPosition()
{ {
static bool hasLocationSource = false; static bool hasLocationSource = false;
if (locationProvider->hasLocationsSource() != hasLocationSource) { if (GpsLocation::instance()->hasLocationsSource() != hasLocationSource) {
hasLocationSource = !hasLocationSource; hasLocationSource = !hasLocationSource;
setLocationServiceAvailable(hasLocationSource); setLocationServiceAvailable(hasLocationSource);
} }
if (!hasLocationSource) if (!hasLocationSource)
return tr("Unknown GPS location"); return tr("Unknown GPS location");
QString positionResponse = locationProvider->currentPosition(); QString positionResponse = GpsLocation::instance()->currentPosition();
if (positionResponse == GPS_CURRENT_POS) if (positionResponse == GPS_CURRENT_POS)
connect(locationProvider, &GpsLocation::acquiredPosition, this, &QMLManager::waitingForPositionChanged, Qt::UniqueConnection); connect(GpsLocation::instance(), &GpsLocation::acquiredPosition, this, &QMLManager::waitingForPositionChanged, Qt::UniqueConnection);
else else
disconnect(locationProvider, &GpsLocation::acquiredPosition, this, &QMLManager::waitingForPositionChanged); disconnect(GpsLocation::instance(), &GpsLocation::acquiredPosition, this, &QMLManager::waitingForPositionChanged);
return positionResponse; return positionResponse;
} }
void QMLManager::applyGpsData() void QMLManager::applyGpsData()
{ {
appendTextToLog("Applying GPS fiexs"); appendTextToLog("Applying GPS fiexs");
std::vector<DiveAndLocation> fixes = locationProvider->getLocations(); std::vector<DiveAndLocation> fixes = GpsLocation::instance()->getLocations();
Command::applyGPSFixes(fixes); Command::applyGPSFixes(fixes);
appendTextToLog(QString("Attached %1 GPS fixes").arg(fixes.size())); appendTextToLog(QString("Attached %1 GPS fixes").arg(fixes.size()));
if (fixes.size()) if (fixes.size())
@ -1647,19 +1646,19 @@ void QMLManager::populateGpsData()
void QMLManager::clearGpsData() void QMLManager::clearGpsData()
{ {
locationProvider->clearGpsData(); GpsLocation::instance()->clearGpsData();
populateGpsData(); populateGpsData();
} }
void QMLManager::deleteGpsFix(quint64 when) void QMLManager::deleteGpsFix(quint64 when)
{ {
locationProvider->deleteGpsFix(when); GpsLocation::instance()->deleteGpsFix(when);
populateGpsData(); populateGpsData();
} }
QString QMLManager::logText() const QString QMLManager::logText() const
{ {
QString logText = m_logText + QString("\nNumer of GPS fixes: %1").arg(locationProvider->getGpsNum()); QString logText = m_logText + QString("\nNumer of GPS fixes: %1").arg(GpsLocation::instance()->getGpsNum());
return logText; return logText;
} }
@ -1677,7 +1676,7 @@ void QMLManager::appendTextToLog(const QString &newText)
void QMLManager::setLocationServiceEnabled(bool locationServiceEnabled) void QMLManager::setLocationServiceEnabled(bool locationServiceEnabled)
{ {
m_locationServiceEnabled = locationServiceEnabled; m_locationServiceEnabled = locationServiceEnabled;
locationProvider->serviceEnable(m_locationServiceEnabled); GpsLocation::instance()->serviceEnable(m_locationServiceEnabled);
emit locationServiceEnabledChanged(); emit locationServiceEnabledChanged();
} }
@ -1690,7 +1689,7 @@ void QMLManager::setLocationServiceAvailable(bool locationServiceAvailable)
void QMLManager::hasLocationSourceChanged() void QMLManager::hasLocationSourceChanged()
{ {
setLocationServiceAvailable(locationProvider->hasLocationsSource()); setLocationServiceAvailable(GpsLocation::instance()->hasLocationsSource());
} }
void QMLManager::setVerboseEnabled(bool verboseMode) void QMLManager::setVerboseEnabled(bool verboseMode)

1
mobile-widgets/qmlmanager.h
View file

@ -254,7 +254,6 @@ private:
bool m_verboseEnabled; bool m_verboseEnabled;
bool m_diveListProcessing; bool m_diveListProcessing;
bool m_initialized; bool m_initialized;
GpsLocation *locationProvider;
bool m_loadFromCloud; bool m_loadFromCloud;
static QMLManager *m_instance; static QMLManager *m_instance;
QString m_notificationText; QString m_notificationText;