diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-10-07 14:46:06 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-07 13:47:53 +0000 |
commit | 8eb4d52342fe3a6ede1c1dce3174d95bfa0cea88 (patch) | |
tree | 0f5556c5e4098e75853e3d9ee2620e0306f0cf2a /share/qtcreator/qml/qmlpuppet/qml2puppet/instances | |
parent | 90de29d530dfc2921d5179977b3393c11a3cc238 (diff) |
Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.
Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.
Task-number: QTBUG-99313
Change-Id: I88edd91395849574436299b8badda21bb93bea39
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances')
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp | 12 | ||||
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp index 608354aa4a..1021a56823 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp @@ -1424,9 +1424,9 @@ Qt5InformationNodeInstanceServer::~Qt5InformationNodeInstanceServer() if (m_editView3DData.rootItem) m_editView3DData.rootItem->disconnect(this); - for (auto view : qAsConst(m_view3Ds)) + for (auto view : std::as_const(m_view3Ds)) view->disconnect(); - for (auto node : qAsConst(m_3DSceneMap)) + for (auto node : std::as_const(m_3DSceneMap)) node->disconnect(); if (m_editView3DData.rootItem) @@ -1720,7 +1720,7 @@ QObject *Qt5InformationNodeInstanceServer::findView3DForInstance( // If no ancestor View3D was found, check if the scene root is specified as importScene in // some View3D. QObject *sceneRoot = find3DSceneRoot(instance); - for (const auto &view3D : qAsConst(m_view3Ds)) { + for (const auto &view3D : std::as_const(m_view3Ds)) { auto view = qobject_cast<QQuick3DViewport *>(view3D); if (view && sceneRoot == view->importScene()) return view3D; @@ -1740,7 +1740,7 @@ QObject *Qt5InformationNodeInstanceServer::findView3DForSceneRoot( return findView3DForInstance(instanceForObject(sceneRoot)); } else { // No instance, so the scene root must be scene property of one of the views - for (const auto &view3D : qAsConst(m_view3Ds)) { + for (const auto &view3D : std::as_const(m_view3Ds)) { auto view = qobject_cast<QQuick3DViewport *>(view3D); if (view && sceneRoot == view->scene()) return view3D; @@ -1825,7 +1825,7 @@ QObject *Qt5InformationNodeInstanceServer::find3DSceneRoot([[maybe_unused]] QObj return find3DSceneRoot(instanceForObject(obj)); // If there is no instance, obj could be a scene in a View3D - for (const auto &viewObj : qAsConst(m_view3Ds)) { + for (const auto &viewObj : std::as_const(m_view3Ds)) { const auto view = qobject_cast<QQuick3DViewport *>(viewObj); if (view && view->scene() == obj) return obj; @@ -2684,7 +2684,7 @@ void Qt5InformationNodeInstanceServer::handlePickTarget( return; } - for (auto childItem : qAsConst(childItems)) { + for (auto childItem : std::as_const(childItems)) { if (!hasInstanceForObject(childItem)) { // Children of components do not have instances, but will still need to be pickable // and redirect their pick to the component diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp index df6c7b27f5..6f3fced1b7 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp @@ -63,7 +63,7 @@ void Qt5PreviewNodeInstanceServer::collectItemChangesAndSendChangeCommands() stateInstances.append(instance.stateInstances()); } - for (ServerNodeInstance instance : qAsConst(stateInstances)) { + for (ServerNodeInstance instance : std::as_const(stateInstances)) { instance.activateState(); QImage previewImage = renderPreviewImage(); if (!previewImage.isNull()) |