diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-09-27 16:26:54 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-09-27 16:26:58 -0700 |
| commit | 9ae7040a91c3e3e0606d7abe085ef6da47efd6d2 (patch) | |
| tree | de120b115df95fb96d945581aca41cd8c760263c /mobile-widgets/qmlmanager.cpp | |
| parent | 400b218f769320221567b7b66f39c33126a7d2e1 (diff) | |
| download | subsurface-9ae7040a91c3e3e0606d7abe085ef6da47efd6d2.tar.gz | |
Revert the singleton PR
It turns out that this isn't working the way it was intended to.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets/qmlmanager.cpp')
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 62c167653..858f2c730 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -44,6 +44,7 @@ #include "core/settings/qPrefUnit.h" #include "core/trip.h" +QMLManager *QMLManager::m_instance = NULL; bool noCloudToCloud = false; #define RED_FONT QLatin1Literal("<font color=\"red\">") @@ -149,6 +150,7 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false), m_showNonDiveComputers(false) { LOG_STP("qmlmgr starting"); + m_instance = this; m_lastDevicePixelRatio = qApp->devicePixelRatio(); timer.start(); connect(qobject_cast<QApplication *>(QApplication::instance()), &QApplication::applicationStateChanged, this, &QMLManager::applicationStateChanged); @@ -449,6 +451,12 @@ QMLManager::~QMLManager() if (appLogFileOpen) appLogFile.close(); #endif + m_instance = NULL; +} + +QMLManager *QMLManager::instance() +{ + return m_instance; } #define CLOUDURL QString(prefs.cloud_base_url) @@ -1556,7 +1564,7 @@ void QMLManager::applyGpsData() void QMLManager::populateGpsData() { if (GpsListModel::instance()) - GpsListModel::instance()->update(QVector<gpsTracker>::fromList(locationProvider->currentGPSInfo().values())); + GpsListModel::instance()->update(); } void QMLManager::clearGpsData() |