diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-12-04 19:08:10 +0100 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-12-11 00:14:22 +0000 |
commit | c8658686cddee13563aca337c4172a9864caefda (patch) | |
tree | 7ee339e0f260ef846ca73571953d80fd617711a8 /src/location/labs/qdeclarativenavigator.cpp | |
parent | 77dd0e8fb870bd1d6a3e3b071471b75e5edd80b6 (diff) | |
download | qtlocation-c8658686cddee13563aca337c4172a9864caefda.tar.gz |
Remove QDeclarativeNavigatorPrivate::updateReadyState
This method was initially introduced to be used in the engines, when
QDeclarativeNavigatorPrivate was passed in place of
QDeclarativeNavigatorData. Right now there is no use for it.
Change-Id: Ic623d8c56c5685831629a906837b748e1f4017b6
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location/labs/qdeclarativenavigator.cpp')
-rw-r--r-- | src/location/labs/qdeclarativenavigator.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/location/labs/qdeclarativenavigator.cpp b/src/location/labs/qdeclarativenavigator.cpp index 7641bd2d..86c2b85a 100644 --- a/src/location/labs/qdeclarativenavigator.cpp +++ b/src/location/labs/qdeclarativenavigator.cpp @@ -191,11 +191,6 @@ QDeclarativeNavigatorPrivate::QDeclarativeNavigatorPrivate(QParameterizableObjec { } -void QDeclarativeNavigatorPrivate::updateReadyState() -{ - qobject_cast<QDeclarativeNavigator *>(q)->updateReadyState(); -} - void QDeclarativeNavigatorPrivate::clearCachedData() { const bool routeChanged = !m_currentRoute.isNull(); @@ -257,11 +252,10 @@ void QDeclarativeNavigator::setMap(QDeclarativeGeoMap *map) return; d_ptr->m_params->m_map = map; - QDeclarativeNavigatorPrivate *dptr = d_ptr.data(); connect(map, &QObject::destroyed, this, - [this, dptr]() { + [this]() { this->mapChanged(); - dptr->updateReadyState(); + this->updateReadyState(); }); emit mapChanged(); updateReadyState(); @@ -307,11 +301,10 @@ void QDeclarativeNavigator::setPositionSource(QDeclarativePositionSource *positi return; d_ptr->m_params->m_positionSource = positionSource; - QDeclarativeNavigatorPrivate *dptr = d_ptr.data(); QObject::connect(positionSource, &QObject::destroyed, - [this, dptr]() { + [this]() { this->positionSourceChanged(); - dptr->updateReadyState(); + this->updateReadyState(); } ); emit positionSourceChanged(); |