diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2023-11-29 14:02:45 +0100 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2023-11-29 22:42:42 +0100 |
commit | df5501ab5fdef30bea7c21316b423b8987af9121 (patch) | |
tree | 5a6e68e1f383cdd2529fa526fb730283785530cc | |
parent | 8af290de5a63de5d97bffff221992c31669b00de (diff) |
Replace QBoolBlocker with QScopedValueRoolback
It was pre-Qt 4.5 (so pre-C++11), while QScopedValueRollback is 4.8.
Both are still old, but with Qt 6 and C++17, we can use CTAD.
Change-Id: Ia930b1a2ed1e465a826ffffd179c1909e16583db
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r-- | src/location/quickmapitems/qdeclarativegeomapitemview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/location/quickmapitems/qdeclarativegeomapitemview.cpp b/src/location/quickmapitems/qdeclarativegeomapitemview.cpp index 27323149..6d681b4e 100644 --- a/src/location/quickmapitems/qdeclarativegeomapitemview.cpp +++ b/src/location/quickmapitems/qdeclarativegeomapitemview.cpp @@ -161,7 +161,7 @@ void QDeclarativeGeoMapItemView::modelUpdated(const QQmlChangeSet &changeSet, bo } } - QBoolBlocker createBlocker(m_creatingObject, true); + QScopedValueRollback createBlocker(m_creatingObject, true); for (const QQmlChangeSet::Change &c: changeSet.inserts()) { for (auto idx = c.start(); idx < c.end(); idx++) { QObject *delegateInstance = m_delegateModel->object(idx, m_incubationMode); @@ -291,7 +291,7 @@ void QDeclarativeGeoMapItemView::instantiateAllItems() return; // If here, m_delegateModel may contain data, but QQmlInstanceModel::object for each row hasn't been called yet. - QBoolBlocker createBlocker(m_creatingObject, true); + QScopedValueRollback createBlocker(m_creatingObject, true); for (qsizetype i = 0; i < m_delegateModel->count(); i++) { QObject *delegateInstance = m_delegateModel->object(i, m_incubationMode); addDelegateToMap(qobject_cast<QQuickItem *>(delegateInstance), i); |