diff options
| -rw-r--r-- | src/location/labs/qdeclarativenavigator.cpp | 15 | ||||
| -rw-r--r-- | src/location/labs/qdeclarativenavigator_p_p.h | 1 |
2 files changed, 4 insertions, 12 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(); diff --git a/src/location/labs/qdeclarativenavigator_p_p.h b/src/location/labs/qdeclarativenavigator_p_p.h index 4833b13b..8849ec7a 100644 --- a/src/location/labs/qdeclarativenavigator_p_p.h +++ b/src/location/labs/qdeclarativenavigator_p_p.h @@ -82,7 +82,6 @@ class QDeclarativeNavigatorPrivate public: QDeclarativeNavigatorPrivate(QParameterizableObject *q_); - void updateReadyState(); void clearCachedData(); QParameterizableObject *q = nullptr; |