diff options
498 files changed, 1270 insertions, 1270 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp index b673da14417..0e349f7b86e 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp +++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp @@ -413,7 +413,7 @@ void NodeInstanceClientProxy::readDataStream() break; } - for (const QVariant &command : qAsConst(commandList)) + for (const QVariant &command : std::as_const(commandList)) dispatchCommand(command); } diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp index e805255520d..7109bddae0f 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp @@ -206,7 +206,7 @@ QVector4D GeneralHelper::focusNodesToCamera(QQuick3DCamera *camera, float defaul totalMinBound = {-halfExtent, -halfExtent, -halfExtent}; totalMaxBound = {halfExtent, halfExtent, halfExtent}; } - for (const auto node : qAsConst(nodeList)) { + for (const auto node : std::as_const(nodeList)) { auto model = qobject_cast<QQuick3DModel *>(node); qreal maxExtent = defaultExtent; QVector3D center = node->scenePosition(); @@ -345,7 +345,7 @@ void GeneralHelper::alignCameras(QQuick3DCamera *camera, const QVariant &nodes) nodeList.append(cameraNode); } - for (QQuick3DCamera *node : qAsConst(nodeList)) { + for (QQuick3DCamera *node : std::as_const(nodeList)) { node->setPosition(camera->position()); node->setRotation(camera->rotation()); } @@ -587,7 +587,7 @@ void GeneralHelper::setMultiSelectionTargets(QQuick3DNode *multiSelectRootNode, // Filter selection to contain only topmost parent nodes in the selection m_multiSelDataMap.clear(); m_multiSelNodes.clear(); - for (auto &connection : qAsConst(m_multiSelectConnections)) + for (auto &connection : std::as_const(m_multiSelectConnections)) disconnect(connection); m_multiSelectConnections.clear(); m_multiSelectRootNode = multiSelectRootNode; @@ -599,7 +599,7 @@ void GeneralHelper::setMultiSelectionTargets(QQuick3DNode *multiSelectRootNode, if (node) selNodes.insert(node); } - for (const auto selNode : qAsConst(selNodes)) { + for (const auto selNode : std::as_const(selNodes)) { bool found = false; QQuick3DNode *parent = selNode->parentNode(); while (parent) { @@ -617,7 +617,7 @@ void GeneralHelper::setMultiSelectionTargets(QQuick3DNode *multiSelectRootNode, // The new selection should be notified by creator immediately after anyway. m_multiSelDataMap.clear(); m_multiSelNodes.clear(); - for (auto &connection : qAsConst(m_multiSelectConnections)) + for (auto &connection : std::as_const(m_multiSelectConnections)) disconnect(connection); m_multiSelectConnections.clear(); })); @@ -643,7 +643,7 @@ void GeneralHelper::resetMultiSelectionNode() m_multiSelNodeData = {}; if (!m_multiSelDataMap.isEmpty()) { - for (const auto &data : qAsConst(m_multiSelDataMap)) + for (const auto &data : std::as_const(m_multiSelDataMap)) m_multiSelNodeData.startScenePos += data.startScenePos; m_multiSelNodeData.startScenePos /= m_multiSelDataMap.size(); } @@ -880,9 +880,9 @@ bool GeneralHelper::getBounds(QQuick3DViewport *view3D, QQuick3DNode *node, QVec }; // Combine all child bounds - for (const auto &newBounds : qAsConst(minBoundsVec)) + for (const auto &newBounds : std::as_const(minBoundsVec)) combineMinBounds(localMinBounds, newBounds); - for (const auto &newBounds : qAsConst(maxBoundsVec)) + for (const auto &newBounds : std::as_const(maxBoundsVec)) combineMaxBounds(localMaxBounds, newBounds); if (qobject_cast<QQuick3DModel *>(node)) { diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.cpp index 6df12f5563b..11980478484 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.cpp @@ -31,7 +31,7 @@ SelectionBoxGeometry::SelectionBoxGeometry() SelectionBoxGeometry::~SelectionBoxGeometry() { - for (auto &connection : qAsConst(m_connections)) + for (auto &connection : std::as_const(m_connections)) QObject::disconnect(connection); m_connections.clear(); } @@ -145,7 +145,7 @@ void SelectionBoxGeometry::doUpdateGeometry() GeometryBase::doUpdateGeometry(); - for (auto &connection : qAsConst(m_connections)) + for (auto &connection : std::as_const(m_connections)) QObject::disconnect(connection); m_connections.clear(); @@ -278,9 +278,9 @@ void SelectionBoxGeometry::getBounds( }; // Combine all child bounds - for (const auto &newBounds : qAsConst(minBoundsVec)) + for (const auto &newBounds : std::as_const(minBoundsVec)) combineMinBounds(localMinBounds, newBounds); - for (const auto &newBounds : qAsConst(maxBoundsVec)) + for (const auto &newBounds : std::as_const(maxBoundsVec)) combineMaxBounds(localMaxBounds, newBounds); if (qobject_cast<QQuick3DModel *>(node)) { diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp index 608354aa4a6..1021a56823f 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 df6c7b27f5b..6f3fced1b78 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()) diff --git a/src/app/main.cpp b/src/app/main.cpp index 35e3ccb7629..db8ce6bde89 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -584,7 +584,7 @@ int main(int argc, char **argv) if (!overrideLanguage.isEmpty()) uiLanguages.prepend(overrideLanguage); const QString &creatorTrPath = resourcePath() + "/translations"; - for (QString locale : qAsConst(uiLanguages)) { + for (QString locale : std::as_const(uiLanguages)) { locale = QLocale(locale).name(); if (translator.load("qtcreator_" + locale, creatorTrPath)) { const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath); diff --git a/src/libs/3rdparty/cplusplus/Bind.cpp b/src/libs/3rdparty/cplusplus/Bind.cpp index e7d5bf78bad..4ad562eb0c6 100644 --- a/src/libs/3rdparty/cplusplus/Bind.cpp +++ b/src/libs/3rdparty/cplusplus/Bind.cpp @@ -2019,7 +2019,7 @@ bool Bind::visit(SimpleDeclarationAST *ast) } } - for (const auto &nameAndLoc : qAsConst(namesAndLocations)) { + for (const auto &nameAndLoc : std::as_const(namesAndLocations)) { const int sourceLocation = nameAndLoc.second; Declaration *decl = control()->newDeclaration(sourceLocation, nameAndLoc.first); if (const Type * const t = declTy.type(); t && declTy.isTypedef() && t->asClassType() diff --git a/src/libs/advanceddockingsystem/dockareatitlebar.cpp b/src/libs/advanceddockingsystem/dockareatitlebar.cpp index acc79de1422..039b33eaaf4 100644 --- a/src/libs/advanceddockingsystem/dockareatitlebar.cpp +++ b/src/libs/advanceddockingsystem/dockareatitlebar.cpp @@ -381,7 +381,7 @@ namespace ADS { DockWidget* dockWidget = d->m_tabBar->currentTab()->dockWidget(); if (!d->m_dockWidgetActionsButtons.isEmpty()) { - for (auto button : qAsConst(d->m_dockWidgetActionsButtons)) { + for (auto button : std::as_const(d->m_dockWidgetActionsButtons)) { d->m_layout->removeWidget(button); delete button; } diff --git a/src/libs/advanceddockingsystem/dockcontainerwidget.cpp b/src/libs/advanceddockingsystem/dockcontainerwidget.cpp index f0c6211a65d..eff53f33186 100644 --- a/src/libs/advanceddockingsystem/dockcontainerwidget.cpp +++ b/src/libs/advanceddockingsystem/dockcontainerwidget.cpp @@ -204,7 +204,7 @@ namespace ADS return; m_visibleDockAreaCount = 0; - for (auto dockArea : qAsConst(m_dockAreas)) + for (auto dockArea : std::as_const(m_dockAreas)) m_visibleDockAreaCount += dockArea->isHidden() ? 0 : 1; } @@ -1110,7 +1110,7 @@ namespace ADS DockAreaWidget *DockContainerWidget::dockAreaAt(const QPoint &globalPosition) const { - for (auto dockArea : qAsConst(d->m_dockAreas)) { + for (auto dockArea : std::as_const(d->m_dockAreas)) { if (dockArea->isVisible() && dockArea->rect().contains(dockArea->mapFromGlobal(globalPosition))) return dockArea; @@ -1131,7 +1131,7 @@ namespace ADS int DockContainerWidget::visibleDockAreaCount() const { int result = 0; - for (auto dockArea : qAsConst(d->m_dockAreas)) + for (auto dockArea : std::as_const(d->m_dockAreas)) result += dockArea->isHidden() ? 0 : 1; return result; @@ -1221,7 +1221,7 @@ namespace ADS QList<DockAreaWidget *> DockContainerWidget::openedDockAreas() const { QList<DockAreaWidget *> result; - for (auto dockArea : qAsConst(d->m_dockAreas)) { + for (auto dockArea : std::as_const(d->m_dockAreas)) { if (!dockArea->isHidden()) result.append(dockArea); } @@ -1361,7 +1361,7 @@ namespace ADS QList<DockWidget *> DockContainerWidget::dockWidgets() const { QList<DockWidget *> result; - for (const auto dockArea : qAsConst(d->m_dockAreas)) + for (const auto dockArea : std::as_const(d->m_dockAreas)) result.append(dockArea->dockWidgets()); return result; @@ -1370,7 +1370,7 @@ namespace ADS DockWidget::DockWidgetFeatures DockContainerWidget::features() const { DockWidget::DockWidgetFeatures features(DockWidget::AllDockWidgetFeatures); - for (const auto dockArea : qAsConst(d->m_dockAreas)) + for (const auto dockArea : std::as_const(d->m_dockAreas)) features &= dockArea->features(); return features; @@ -1383,7 +1383,7 @@ namespace ADS void DockContainerWidget::closeOtherAreas(DockAreaWidget *keepOpenArea) { - for (const auto dockArea : qAsConst(d->m_dockAreas)) { + for (const auto dockArea : std::as_const(d->m_dockAreas)) { if (dockArea == keepOpenArea) continue; diff --git a/src/libs/advanceddockingsystem/dockmanager.cpp b/src/libs/advanceddockingsystem/dockmanager.cpp index edd4b7d9bdb..5771241dc33 100644 --- a/src/libs/advanceddockingsystem/dockmanager.cpp +++ b/src/libs/advanceddockingsystem/dockmanager.cpp @@ -106,13 +106,13 @@ namespace ADS void hideFloatingWidgets() { // Hide updates of floating widgets from user - for (auto floatingWidget : qAsConst(m_floatingWidgets)) + for (auto floatingWidget : std::as_const(m_floatingWidgets)) floatingWidget->hide(); } void markDockWidgetsDirty() { - for (auto dockWidget : qAsConst(m_dockWidgetsMap)) + for (auto dockWidget : std::as_const(m_dockWidgetsMap)) dockWidget->setProperty("dirty", true); } @@ -216,7 +216,7 @@ namespace ADS // function are invisible to the user now and have no assigned dock area // They do not belong to any dock container, until the user toggles the // toggle view action the next time - for (auto dockWidget : qAsConst(m_dockWidgetsMap)) { + for (auto dockWidget : std::as_const(m_dockWidgetsMap)) { if (dockWidget->property(internal::dirtyProperty).toBool()) { dockWidget->flagAsUnassigned(); emit dockWidget->viewToggled(false); @@ -233,7 +233,7 @@ namespace ADS // The dock areas because the previous toggleView() action has changed // the dock area index int count = 0; - for (auto dockContainer : qAsConst(m_containers)) { + for (auto dockContainer : std::as_const(m_containers)) { count++; for (int i = 0; i < dockContainer->dockAreaCount(); ++i) { DockAreaWidget *dockArea = dockContainer->dockArea(i); @@ -259,7 +259,7 @@ namespace ADS { // Finally we need to send the topLevelChanged() signals for all dock // widgets if top level changed - for (auto dockContainer : qAsConst(m_containers)) { + for (auto dockContainer : std::as_const(m_containers)) { DockWidget *topLevelDockWidget = dockContainer->topLevelDockWidget(); if (topLevelDockWidget) { topLevelDockWidget->emitTopLevelChanged(true); @@ -329,7 +329,7 @@ namespace ADS // Using a temporal vector since the destructor of // FloatingDockWidgetContainer alters d->m_floatingWidgets. std::vector<FloatingDockContainer *> aboutToDeletes; - for (auto floatingWidget : qAsConst(d->m_floatingWidgets)) { + for (auto floatingWidget : std::as_const(d->m_floatingWidgets)) { if (floatingWidget) aboutToDeletes.push_back(floatingWidget); } @@ -483,7 +483,7 @@ namespace ADS stream.writeAttribute("version", QString::number(CurrentVersion)); stream.writeAttribute("userVersion", QString::number(version)); stream.writeAttribute("containers", QString::number(d->m_containers.count())); - for (auto container : qAsConst(d->m_containers)) + for (auto container : std::as_const(d->m_containers)) container->saveState(stream); stream.writeEndElement(); @@ -527,7 +527,7 @@ namespace ADS if (d->m_uninitializedFloatingWidgets.empty()) return; - for (auto floatingWidget : qAsConst(d->m_uninitializedFloatingWidgets)) + for (auto floatingWidget : std::as_const(d->m_uninitializedFloatingWidgets)) floatingWidget->show(); d->m_uninitializedFloatingWidgets.clear(); diff --git a/src/libs/advanceddockingsystem/dockoverlay.cpp b/src/libs/advanceddockingsystem/dockoverlay.cpp index 012a5e80e3a..7b680abea90 100644 --- a/src/libs/advanceddockingsystem/dockoverlay.cpp +++ b/src/libs/advanceddockingsystem/dockoverlay.cpp @@ -592,7 +592,7 @@ namespace ADS { if (windowHandle()->devicePixelRatio() == d->m_lastDevicePixelRatio) // TODO return; - for (auto widget : qAsConst(d->m_dropIndicatorWidgets)) + for (auto widget : std::as_const(d->m_dropIndicatorWidgets)) d->updateDropIndicatorIcon(widget); d->m_lastDevicePixelRatio = devicePixelRatioF(); diff --git a/src/libs/aggregation/aggregate.cpp b/src/libs/aggregation/aggregate.cpp index 0da4ebd8b7f..26924d50926 100644 --- a/src/libs/aggregation/aggregate.cpp +++ b/src/libs/aggregation/aggregate.cpp @@ -176,7 +176,7 @@ Aggregate::~Aggregate() QList<QObject *> components; { QWriteLocker locker(&lock()); - for (QObject *component : qAsConst(m_components)) { + for (QObject *component : std::as_const(m_components)) { disconnect(component, &QObject::destroyed, this, &Aggregate::deleteSelf); aggregateMap().remove(component); } diff --git a/src/libs/aggregation/aggregate.h b/src/libs/aggregation/aggregate.h index ef7b4e69ba1..a640822d46f 100644 --- a/src/libs/aggregation/aggregate.h +++ b/src/libs/aggregation/aggregate.h @@ -26,7 +26,7 @@ public: template <typename T> T *component() { QReadLocker locker(&lock()); - for (QObject *component : qAsConst(m_components)) { + for (QObject *component : std::as_const(m_components)) { if (T *result = qobject_cast<T *>(component)) return result; } @@ -36,7 +36,7 @@ public: template <typename T> QList<T *> components() { QReadLocker locker(&lock()); QList<T *> results; - for (QObject *component : qAsConst(m_components)) { + for (QObject *component : std::as_const(m_components)) { if (T *result = qobject_cast<T *>(component)) { results << result; } diff --git a/src/libs/cplusplus/AlreadyConsideredClassContainer.h b/src/libs/cplusplus/AlreadyConsideredClassContainer.h index f7a0cd84298..a4571dd720e 100644 --- a/src/libs/cplusplus/AlreadyConsideredClassContainer.h +++ b/src/libs/cplusplus/AlreadyConsideredClassContainer.h @@ -26,7 +26,7 @@ public: return true; SafeMatcher matcher; - for (const T *existingItem : qAsConst(_container)) { + for (const T *existingItem : std::as_const(_container)) { if (Matcher::match(existingItem, item, &matcher)) return true; } diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp index 6cc7c49da5e..a121594c8e1 100644 --- a/src/libs/cplusplus/CppDocument.cpp +++ b/src/libs/cplusplus/CppDocument.cpp @@ -299,7 +299,7 @@ void Document::setLastModified(const QDateTime &lastModified) QStringList Document::includedFiles() const { QStringList files; - for (const Include &i : qAsConst(_resolvedIncludes)) + for (const Include &i : std::as_const(_resolvedIncludes)) files.append(i.resolvedFileName()); files.removeDuplicates(); return files; @@ -488,7 +488,7 @@ Symbol *Document::lastVisibleSymbolAt(int line, int column) const const Macro *Document::findMacroDefinitionAt(int line) const { - for (const Macro ¯o : qAsConst(_definedMacros)) { + for (const Macro ¯o : std::as_const(_definedMacros)) { if (macro.line() == line) return ¯o; } @@ -497,7 +497,7 @@ const Macro *Document::findMacroDefinitionAt(int line) const const Document::MacroUse *Document::findMacroUseAt(int utf16charsOffset) const { - for (const Document::MacroUse &use : qAsConst(_macroUses)) { + for (const Document::MacroUse &use : std::as_const(_macroUses)) { if (use.containsUtf16charOffset(utf16charsOffset) && (utf16charsOffset < use.utf16charsBegin() + use.macro().nameToQString().size())) { return &use; @@ -508,7 +508,7 @@ const Document::MacroUse *Document::findMacroUseAt(int utf16charsOffset) const const Document::UndefinedMacroUse *Document::findUndefinedMacroUseAt(int utf16charsOffset) const { - for (const Document::UndefinedMacroUse &use : qAsConst(_undefinedMacroUses)) { + for (const Document::UndefinedMacroUse &use : std::as_const(_undefinedMacroUses)) { if (use.containsUtf16charOffset(utf16charsOffset) && (utf16charsOffset < use.utf16charsBegin() + QString::fromUtf8(use.name(), use.name().size()).length())) diff --git a/src/libs/cplusplus/FindUsages.cpp b/src/libs/cplusplus/FindUsages.cpp index 2f52079bdc6..8141cda12d8 100644 --- a/src/libs/cplusplus/FindUsages.cpp +++ b/src/libs/cplusplus/FindUsages.cpp @@ -399,7 +399,7 @@ private: if (!klass) { if (const auto namedType = baseExprType->asNamedType()) { items = context.lookup(namedType->name(), item->scope()); - for (const LookupItem &item : qAsConst(items)) { + for (const LookupItem &item : std::as_const(items)) { if ((klass = item.type()->asClassType())) break; } @@ -410,7 +410,7 @@ private: items = context.lookup(memberAccess->member_name->name, klass); if (items.isEmpty()) return Usage::Type::Other; - for (const LookupItem &item : qAsConst(items)) { + for (const LookupItem &item : std::as_const(items)) { if (item.type()->asFunctionType()) { if (item.type().isConst()) return Usage::Type::Read; diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 3c12070e913..dee9e65d21a 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -1357,7 +1357,7 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, for (int i = 0; i < argumentCountOfSpecialization; ++i) templParams.insert(templateSpecialization->templateParameterAt(i)->name(), i); - for (const Name *baseName : qAsConst(allBases)) { + for (const Name *baseName : std::as_const(allBases)) { ClassOrNamespace *baseBinding = nullptr; if (const Identifier *nameId = baseName->asNameId()) { @@ -1435,7 +1435,7 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, // Find the missing bases for regular (non-template) types. // Ex.: class A : public B<Some>::Type {}; - for (const Name *baseName : qAsConst(allBases)) { + for (const Name *baseName : std::as_const(allBases)) { ClassOrNamespace *binding = this; if (const QualifiedNameId *qBaseName = baseName->asQualifiedNameId()) { if (const Name *qualification = qBaseName->base()) diff --git a/src/libs/cplusplus/Macro.cpp b/src/libs/cplusplus/Macro.cpp index a3046e8e832..bd36ec39b95 100644 --- a/src/libs/cplusplus/Macro.cpp +++ b/src/libs/cplusplus/Macro.cpp @@ -47,7 +47,7 @@ QString Macro::decoratedName() const if (f._functionLike) { text += QLatin1Char('('); bool first = true; - for (const QByteArray &formal : qAsConst(_formals)) { + for (const QByteArray &formal : std::as_const(_formals)) { if (! first) text += QLatin1String(", "); else diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp index bbd0e8d30a1..d6b89a1aad3 100644 --- a/src/libs/cplusplus/MatchingText.cpp +++ b/src/libs/cplusplus/MatchingText.cpp @@ -522,7 +522,7 @@ QString MatchingText::insertMatchingBrace(const QTextCursor &cursor, const QStri } QString result; - for (const QChar &ch : qAsConst(text)) { + for (const QChar &ch : std::as_const(text)) { if (ch == QLatin1Char('(')) result += QLatin1Char(')'); else if (ch == QLatin1Char('[')) result += QLatin1Char(']'); else if (ch == QLatin1Char('{')) result += QLatin1Char('}'); diff --git a/src/libs/extensionsystem/optionsparser.cpp b/src/libs/extensionsystem/optionsparser.cpp index dd19474ba7c..8773523267f 100644 --- a/src/libs/extensionsystem/optionsparser.cpp +++ b/src/libs/extensionsystem/optionsparser.cpp @@ -176,7 +176,7 @@ bool OptionsParser::checkForLoadOption() return false; if (nextToken(RequiredToken)) { if (m_currentArg == QLatin1String("all")) { - for (PluginSpec *spec : qAsConst(m_pmPrivate->pluginSpecs)) + for (PluginSpec *spec : std::as_const(m_pmPrivate->pluginSpecs)) spec->d->setForceEnabled(true); m_isDependencyRefreshNeeded = true; } else { @@ -203,7 +203,7 @@ bool OptionsParser::checkForNoLoadOption() return false; if (nextToken(RequiredToken)) { if (m_currentArg == QLatin1String("all")) { - for (PluginSpec *spec : qAsConst(m_pmPrivate->pluginSpecs)) + for (PluginSpec *spec : std::as_const(m_pmPrivate->pluginSpecs)) spec->d->setForceDisabled(true); m_isDependencyRefreshNeeded = true; } else { @@ -287,7 +287,7 @@ void OptionsParser::forceDisableAllPluginsExceptTestedAndForceEnabled() { for (const PluginManagerPrivate::TestSpec &testSpec : m_pmPrivate->testSpecs) testSpec.pluginSpec->d->setForceEnabled(true); - for (PluginSpec *spec : qAsConst(m_pmPrivate->pluginSpecs)) { + for (PluginSpec *spec : std::as_const(m_pmPrivate->pluginSpecs)) { if (!spec->isForceEnabled() && !spec->isRequired()) spec->d->setForceDisabled(true); } diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index 4ff50a12c59..01811c33c54 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -579,7 +579,7 @@ QString PluginManager::serializedArguments() if (!rc.isEmpty()) rc += separator; rc += QLatin1String(argumentKeywordC); - for (const QString &argument : qAsConst(d->arguments)) + for (const QString &argument : std::as_const(d->arguments)) rc += separator + argument; } return rc; @@ -746,7 +746,7 @@ void PluginManager::formatOptions(QTextStream &str, int optionIndentation, int d void PluginManager::formatPluginOptions(QTextStream &str, int optionIndentation, int descriptionIndentation) { // Check plugins for options - for (PluginSpec *ps : qAsConst(d->pluginSpecs)) { + for (PluginSpec *ps : std::as_const(d->pluginSpecs)) { const PluginSpec::PluginArgumentDescriptions pargs = ps->argumentDescriptions(); if (!pargs.empty()) { str << "\nPlugin: " << ps->name() << '\n'; @@ -761,7 +761,7 @@ void PluginManager::formatPluginOptions(QTextStream &str, int optionIndentation, */ void PluginManager::formatPluginVersions(QTextStream &str) { - for (PluginSpec *ps : qAsConst(d->pluginSpecs)) + for (PluginSpec *ps : std::as_const(d->pluginSpecs)) str << " " << ps->name() << ' ' << ps->version() << ' ' << ps->description() << '\n'; } @@ -993,7 +993,7 @@ void PluginManagerPrivate::writeSettings() return; QStringList tempDisabledPlugins; QStringList tempForceEnabledPlugins; - for (PluginSpec *spec : qAsConst(pluginSpecs)) { + for (PluginSpec *spec : std::as_const(pluginSpecs)) { if (spec->isEnabledByDefault() && !spec->isEnabledBySettings()) tempDisabledPlugins.append(spec->name()); if (!spec->isEnabledByDefault() && spec->isEnabledBySettings()) @@ -1203,7 +1203,7 @@ static TestPlan generateCustomTestPlan(IPlugin *plugin, } else { // Add all matching test functions of all remaining test objects - for (QObject *testObject : qAsConst(remainingTestObjectsOfPlugin)) { + for (QObject *testObject : std::as_const(remainingTestObjectsOfPlugin)) { const QStringList allFunctions = testFunctions(testObject->metaObject()); const QStringList matchingFunctions = matchingTestFunctions(allFunctions, matchText); @@ -1250,7 +1250,7 @@ void PluginManagerPrivate::startTests() } int failedTests = 0; - for (const TestSpec &testSpec : qAsConst(testSpecs)) { + for (const TestSpec &testSpec : std::as_const(testSpecs)) { IPlugin *plugin = testSpec.pluginSpec->plugin(); if (!plugin) continue; // plugin not loaded @@ -1395,7 +1395,7 @@ void PluginManagerPrivate::shutdown() const QVector<PluginSpec *> PluginManagerPrivate::loadQueue() { QVector<PluginSpec *> queue; - for (PluginSpec *spec : qAsConst(pluginSpecs)) { + for (PluginSpec *spec : std::as_const(pluginSpecs)) { QVector<PluginSpec *> circularityCheckQueue; loadQueue(spec, queue, circularityCheckQueue); } @@ -1702,13 +1702,13 @@ void PluginManagerPrivate::readPluginPaths() void PluginManagerPrivate::resolveDependencies() { - for (PluginSpec *spec : qAsConst(pluginSpecs)) + for (PluginSpec *spec : std::as_const(pluginSpecs)) spec->d->resolveDependencies(pluginSpecs); } void PluginManagerPrivate::enableDependenciesIndirectly() { - for (PluginSpec *spec : qAsConst(pluginSpecs)) + for (PluginSpec *spec : std::as_const(pluginSpecs)) spec->d->enabledIndirectly = false; // cannot use reverse loadQueue here, because test dependencies can introduce circles QVector<PluginSpec *> queue = Utils::filtered(pluginSpecs, &PluginSpec::isEffectivelyEnabled); @@ -1723,7 +1723,7 @@ PluginSpec *PluginManagerPrivate::pluginForOption(const QString &option, bool *r { // Look in the plugins for an option *requiresArgument = false; - for (PluginSpec *spec : qAsConst(pluginSpecs)) { + for (PluginSpec *spec : std::as_const(pluginSpecs)) { PluginArgumentDescription match = Utils::findOrDefault(spec->argumentDescriptions(), [option](PluginArgumentDescription pad) { return pad.name == option; diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp index ad924bbb91b..6287c882dcc 100644 --- a/src/libs/extensionsystem/pluginspec.cpp +++ b/src/libs/extensionsystem/pluginspec.cpp @@ -998,7 +998,7 @@ bool PluginSpecPrivate::resolveDependencies(const QVector<PluginSpec *> &specs) return false; } QHash<PluginDependency, PluginSpec *> resolvedDependencies; - for (const PluginDependency &dependency : qAsConst(dependencies)) { + for (const PluginDependency &dependency : std::as_const(dependencies)) { PluginSpec * const found = Utils::findOrDefault(specs, [&dependency](PluginSpec *spec) { return spec->provides(dependency.name, dependency.version); }); diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp index 5fdc7528998..f75849d3592 100644 --- a/src/libs/extensionsystem/pluginview.cpp +++ b/src/libs/extensionsystem/pluginview.cpp @@ -358,7 +358,7 @@ void PluginView::updatePlugins() } Utils::sort(collections, &CollectionItem::m_name); - for (CollectionItem *collection : qAsConst(collections)) + for (CollectionItem *collection : std::as_const(collections)) m_model->rootItem()->appendChild(collection); emit m_model->layoutChanged(); diff --git a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp index da10a7ce44c..57c99db0c2f 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp +++ b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp @@ -535,7 +535,7 @@ void DiagramController::onBeginResetModel() void DiagramController::onEndResetModel() { updateAllDiagramsList(); - for (MDiagram *diagram : qAsConst(m_allDiagrams)) { + for (MDiagram *diagram : std::as_const(m_allDiagrams)) { const QList<DElement *> elements = diagram->diagramElements(); // remove all elements which are not longer part of the model for (int i = elements.size() - 1; i >= 0; --i) { diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp index 6093546f5a2..dbb363646c9 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp @@ -230,7 +230,7 @@ ObjectItem *DiagramSceneModel::findTopmostObjectItem(const QPointF &scenePos) co { // fetch affected items from scene in correct drawing order to find topmost element const QList<QGraphicsItem *> items = m_graphicsScene->items(scenePos); - for (QGraphicsItem *item : qAsConst(items)) { + for (QGraphicsItem *item : std::as_const(items)) { if (m_graphicsItems.contains(item)) { DObject *object = dynamic_cast<DObject *>(m_itemToElementMap.value(item)); if (object) @@ -807,7 +807,7 @@ void DiagramSceneModel::onEndRemoveElement(int row, const MDiagram *diagram) Q_UNUSED(diagram) QMT_CHECK(m_busyState == RemoveElement); // update elements from store (see above) - for (const Uid &end_uid : qAsConst(m_relationEndsUid)) { + for (const Uid &end_uid : std::as_const(m_relationEndsUid)) { DElement *dEnd = m_diagramController->findElement(end_uid, diagram); if (dEnd) updateGraphicsItem(graphicsItem(dEnd), dEnd); @@ -854,11 +854,11 @@ void DiagramSceneModel::onSelectionChanged() } // select more items secondarily - for (QGraphicsItem *selectedItem : qAsConst(m_selectedItems)) { + for (QGraphicsItem *selectedItem : std::as_const(m_selectedItems)) { if (auto selectable = dynamic_cast<ISelectable *>(selectedItem)) { QRectF boundary = selectable->getSecondarySelectionBoundary(); if (!boundary.isEmpty()) { - for (QGraphicsItem *item : qAsConst(m_graphicsItems)) { + for (QGraphicsItem *item : std::as_const(m_graphicsItems)) { if (auto secondarySelectable = dynamic_cast<ISelectable *>(item)) { if (!item->isSelected() && !secondarySelectable->isSecondarySelected()) { secondarySelectable->setBoundarySelected(boundary, true); @@ -1023,7 +1023,7 @@ void DiagramSceneModel::restoreSelectedStatusAfterExport(const DiagramSceneModel void DiagramSceneModel::recalcSceneRectSize() { QRectF sceneRect = m_originItem->mapRectToScene(m_originItem->boundingRect()); - for (QGraphicsItem *item : qAsConst(m_graphicsItems)) { + for (QGraphicsItem *item : std::as_const(m_graphicsItems)) { // TODO use an interface to update sceneRect by item if (!dynamic_cast<SwimlaneItem *>(item)) sceneRect |= item->mapRectToScene(item->boundingRect()); diff --git a/src/libs/qmljs/qmljsimportdependencies.cpp b/src/libs/qmljs/qmljsimportdependencies.cpp index 25b9959d004..db8e7905440 100644 --- a/src/libs/qmljs/qmljsimportdependencies.cpp +++ b/src/libs/qmljs/qmljsimportdependencies.cpp @@ -554,7 +554,7 @@ QByteArray DependencyInfo::calculateFingerprint(const ImportDependencies &deps) hash.addData("/", 1); QList<ImportKey> imports = Utils::toList(allImports); std::sort(imports.begin(), imports.end()); - for (const ImportKey &k : qAsConst(imports)) + for (const ImportKey &k : std::as_const(imports)) k.addToHash(hash); return hash.result(); } diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp index 0c8c5bb6f3a..91dbf8eae81 100644 --- a/src/libs/qmljs/qmljsinterpreter.cpp +++ b/src/libs/qmljs/qmljsinterpreter.cpp @@ -2565,7 +2565,7 @@ const ObjectValue *Imports::resolveAliasAndMarkUsed(const QString &name) const { if (const ObjectValue *value = m_aliased.value(name, nullptr)) { // mark all respective ImportInfo objects to avoid dropping imports (QmlDesigner) on rewrite - for (const Import &i : qAsConst(m_imports)) { + for (const Import &i : std::as_const(m_imports)) { const ImportInfo &info = i.info; if (info.as() == name) i.used = true; // FIXME: This evilly modifies a 'const' object diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index c09eedf7b1f..6c04966cedd 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -212,7 +212,7 @@ Context::ImportsPerDocument LinkPrivate::linkImports() importsPerDocument.insert(document.data(), QSharedPointer<Imports>(imports)); } - for (const Document::Ptr &doc : qAsConst(m_snapshot)) { + for (const Document::Ptr &doc : std::as_const(m_snapshot)) { if (doc == document) continue; @@ -413,7 +413,7 @@ Import LinkPrivate::importNonFile(const Document::Ptr &doc, const ImportInfo &im } if (!importFound) { - for (const Utils::FilePath &dir : qAsConst(m_applicationDirectories)) { + for (const Utils::FilePath &dir : std::as_const(m_applicationDirectories)) { auto qmltypes = dir.dirEntries( Utils::FileFilter(QStringList{"*.qmltypes"}, QDir::Files)); diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index bcf5fcb78ab..c39c48415dc 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -278,9 +278,9 @@ void ModelManagerInterface::loadQmlTypeDescriptionsInternal(const QString &resou for (auto it = objs.cbegin(); it != objs.cend(); ++it) CppQmlTypesLoader::defaultLibraryObjects.insert(it.key(), it.value()); - for (const QString &error : qAsConst(errors)) + for (const QString &error : std::as_const(errors)) writeMessageInternal(error); - for (const QString &warning : qAsConst(warnings)) + for (const QString &warning : std::as_const(warnings)) writeMessageInternal(warning); } @@ -462,7 +462,7 @@ void ModelManagerInterface::iterateQrcFiles( } QSet<Utils::FilePath> pathsChecked; - for (const ModelManagerInterface::ProjectInfo &pInfo : qAsConst(pInfos)) { + for (const ModelManagerInterface::ProjectInfo &pInfo : std::as_const(pInfos)) { QList<Utils::FilePath> qrcFilePaths; if (resources == ActiveQrcResources) qrcFilePaths = pInfo.activeResourceFiles; @@ -470,7 +470,7 @@ void ModelManagerInterface::iterateQrcFiles( qrcFilePaths = pInfo.allResourceFiles; for (const Utils::FilePath &p : generatedQrc(pInfo.applicationDirectories)) qrcFilePaths.append(p); - for (const Utils::FilePath &qrcFilePath : qAsConst(qrcFilePaths)) { + for (const Utils::FilePath &qrcFilePath : std::as_const(qrcFilePaths)) { if (pathsChecked.contains(qrcFilePath)) continue; pathsChecked.insert(qrcFilePath); @@ -566,19 +566,19 @@ void ModelManagerInterface::updateProjectInfo(const ProjectInfo &pinfo, ProjectE // remove files that are no longer in the project and have been deleted QList<Utils::FilePath> deletedFiles; - for (const Utils::FilePath &oldFile : qAsConst(oldInfo.sourceFiles)) { + for (const Utils::FilePath &oldFile : std::as_const(oldInfo.sourceFiles)) { if (snapshot.document(oldFile) && !pinfo.sourceFiles.contains(oldFile) && !oldFile.exists()) { deletedFiles += oldFile; } } removeFiles(deletedFiles); - for (const Utils::FilePath &oldFile : qAsConst(deletedFiles)) + for (const Utils::FilePath &oldFile : std::as_const(deletedFiles)) m_fileToProject.remove(oldFile, p); // parse any files not yet in the snapshot QList<Utils::FilePath> newFiles; - for (const Utils::FilePath &file : qAsConst(pinfo.sourceFiles)) { + for (const Utils::FilePath &file : std::as_const(pinfo.sourceFiles)) { if (!m_fileToProject.contains(file, p)) m_fileToProject.insert(file, p); if (!snapshot.document(file)) @@ -589,11 +589,11 @@ void ModelManagerInterface::updateProjectInfo(const ProjectInfo &pinfo, ProjectE // update qrc cache m_qrcContents = pinfo.resourceFileContents; - for (const Utils::FilePath &newQrc : qAsConst(pinfo.allResourceFiles)) + for (const Utils::FilePath &newQrc : std::as_const(pinfo.allResourceFiles)) m_qrcCache.addPath(newQrc.toString(), m_qrcContents.value(newQrc)); for (const Utils::FilePath &newQrc : generatedQrc(pinfo.applicationDirectories)) m_qrcCache.addPath(newQrc.toString(), m_qrcContents.value(newQrc)); - for (const Utils::FilePath &oldQrc : qAsConst(oldInfo.allResourceFiles)) + for (const Utils::FilePath &oldQrc : std::as_const(oldInfo.allResourceFiles)) m_qrcCache.removePath(oldQrc.toString()); m_pluginDumper->loadBuiltinTypes(pinfo); @@ -654,7 +654,7 @@ QList<ModelManagerInterface::ProjectInfo> ModelManagerInterface::allProjectInfos projects = m_fileToProject.values(path.canonicalPath()); } QList<ProjectInfo> infos; - for (ProjectExplorer::Project *project : qAsConst(projects)) { + for (ProjectExplorer::Project *project : std::as_const(projects)) { ProjectInfo info = projectInfo(project); if (!info.project.isNull()) infos.append(info); @@ -1011,7 +1011,7 @@ void ModelManagerInterface::parseLoop(QSet<Utils::FilePath> &scannedPaths, } // add new files to parse list - for (const Utils::FilePath &file : qAsConst(importedFiles)) { + for (const Utils::FilePath &file : std::as_const(importedFiles)) { if (!files.contains(file)) files.append(file); } @@ -1200,7 +1200,7 @@ static QList<Utils::FilePath> minimalPrefixPaths(const QList<Utils::FilePath> &p { QList<Utils::FilePath> sortedPaths; // find minimal prefix, ensure '/' at end - for (Utils::FilePath path : qAsConst(paths)) { + for (Utils::FilePath path : std::as_const(paths)) { if (!path.endsWith("/")) path = path.withNewPath(path.path() + "/"); if (path.path().length() > 1) @@ -1226,7 +1226,7 @@ void ModelManagerInterface::updateImportPaths() QList<Utils::FilePath> allApplicationDirectories; QmlLanguageBundles activeBundles; QmlLanguageBundles extendedBundles; - for (const ProjectInfo &pInfo : qAsConst(m_projects)) { + for (const ProjectInfo &pInfo : std::as_const(m_projects)) { for (const auto &importPath : pInfo.importPaths) { const FilePath canonicalPath = importPath.path().canonicalPath(); if (!canonicalPath.isEmpty()) @@ -1235,13 +1235,13 @@ void ModelManagerInterface::updateImportPaths() allApplicationDirectories.append(pInfo.applicationDirectories); } - for (const ViewerContext &vContext : qAsConst(m_defaultVContexts)) { + for (const ViewerContext &vContext : std::as_const(m_defaultVContexts)) { for (const Utils::FilePath &path : vContext.paths) allImportPaths.maybeInsert(path, vContext.language); allApplicationDirectories.append(vContext.applicationDirectories); } - for (const ProjectInfo &pInfo : qAsConst(m_projects)) { + for (const ProjectInfo &pInfo : std::as_const(m_projects)) { activeBundles.mergeLanguageBundles(pInfo.activeBundle); const auto languages = pInfo.activeBundle.languages(); for (Dialect l : languages) { @@ -1254,7 +1254,7 @@ void ModelManagerInterface::updateImportPaths() } } - for (const ProjectInfo &pInfo : qAsConst(m_projects)) { + for (const ProjectInfo &pInfo : std::as_const(m_projects)) { if (!pInfo.qtQmlPath.isEmpty()) allImportPaths.maybeInsert(pInfo.qtQmlPath, Dialect::QmlQtQuick2); } @@ -1269,7 +1269,7 @@ void ModelManagerInterface::updateImportPaths() allImportPaths.maybeInsert(importPath); } - for (const Utils::FilePath &path : qAsConst(m_defaultImportPaths)) + for (const Utils::FilePath &path : std::as_const(m_defaultImportPaths)) allImportPaths.maybeInsert(path, Dialect::Qml); allImportPaths.compact(); allApplicationDirectories = Utils::filteredUnique(allApplicationDirectories); @@ -1288,9 +1288,9 @@ void ModelManagerInterface::updateImportPaths() QList<Utils::FilePath> importedFiles; QSet<Utils::FilePath> scannedPaths; QSet<Utils::FilePath> newLibraries; - for (const Document::Ptr &doc : qAsConst(snapshot)) + for (const Document::Ptr &doc : std::as_const(snapshot)) findNewLibraryImports(doc, snapshot, this, &importedFiles, &scannedPaths, &newLibraries); - for (const Utils::FilePath &path : qAsConst(allApplicationDirectories)) { + for (const Utils::FilePath &path : std::as_const(allApplicationDirectories)) { allImportPaths.maybeInsert(path, Dialect::Qml); findNewQmlApplicationInPath(path, snapshot, this, &newLibraries); } @@ -1381,9 +1381,9 @@ bool rescanExports(const QString &fileName, FindExportedCppTypes &finder, } if (!hasNewInfo) { QHash<QString, QByteArray> newFingerprints; - for (const auto &newType : qAsConst(exported)) + for (const auto &newType : std::as_const(exported)) newFingerprints[newType->className()]=newType->fingerprint(); - for (const auto &oldType : qAsConst(data.exportedTypes)) { + for (const auto &oldType : std::as_const(data.exportedTypes)) { if (newFingerprints.value(oldType->className()) != oldType->fingerprint()) { hasNewInfo = true; break; @@ -1521,7 +1521,7 @@ ViewerContext ModelManagerInterface::getVContext(const ViewerContext &vCtx, Q_FALLTHROUGH(); case ViewerContext::AddAllPaths: { - for (const Utils::FilePath &path : qAsConst(defaultVCtx.paths)) + for (const Utils::FilePath &path : std::as_const(defaultVCtx.paths)) maybeAddPath(res, path); switch (res.language.dialect()) { case Dialect::AnyLanguage: @@ -1552,7 +1552,7 @@ ViewerContext ModelManagerInterface::getVContext(const ViewerContext &vCtx, allProjects = m_projects.values(); } std::sort(allProjects.begin(), allProjects.end(), &pInfoLessThanImports); - for (const ProjectInfo &pInfo : qAsConst(allProjects)) + for (const ProjectInfo &pInfo : std::as_const(allProjects)) addPathsOnLanguageMatch(pInfo.importPaths); } const auto environmentPaths = environmentImportPaths(); @@ -1574,7 +1574,7 @@ ViewerContext ModelManagerInterface::getVContext(const ViewerContext &vCtx, res.selectors.append(defaultVCtx.selectors); Q_FALLTHROUGH(); case ViewerContext::AddDefaultPaths: - for (const Utils::FilePath &path : qAsConst(defaultVCtx.paths)) + for (const Utils::FilePath &path : std::as_const(defaultVCtx.paths)) maybeAddPath(res, path); if (res.language == Dialect::AnyLanguage || res.language == Dialect::Qml) maybeAddPath(res, info.qtQmlPath); @@ -1692,7 +1692,7 @@ void ModelManagerInterface::resetCodeModel() QMutexLocker locker(&m_mutex); // find all documents currently in the code model - for (const Document::Ptr &doc : qAsConst(m_validSnapshot)) + for (const Document::Ptr &doc : std::as_const(m_validSnapshot)) documents.append(doc->fileName()); // reset the snapshot diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp index b00a2be83c9..882d3b8ef53 100644 --- a/src/libs/qmljs/qmljsplugindumper.cpp +++ b/src/libs/qmljs/qmljsplugindumper.cpp @@ -151,7 +151,7 @@ void PluginDumper::onLoadPluginTypes(const Utils::FilePath &libraryPath, // watch library qmltypes file if (!plugin.typeInfoPaths.isEmpty()) { - for (const FilePath &path : qAsConst(plugin.typeInfoPaths)) { + for (const FilePath &path : std::as_const(plugin.typeInfoPaths)) { if (!path.exists()) continue; if (!pluginWatcher()->watchesFile(path.toString())) diff --git a/src/libs/tracing/timelinetracemanager.cpp b/src/libs/tracing/timelinetracemanager.cpp index 293bcf3c9ae..97cadb8d963 100644 --- a/src/libs/tracing/timelinetracemanager.cpp +++ b/src/libs/tracing/timelinetracemanager.cpp @@ -198,7 +198,7 @@ void TimelineTraceManager::setAggregateTraces(bool aggregateTraces) void TimelineTraceManager::initialize() { - for (const Initializer &initializer : qAsConst(d->initializers)) + for (const Initializer &initializer : std::as_const(d->initializers)) initializer(); } @@ -209,7 +209,7 @@ void TimelineTraceManager::finalize() // Load notes after the timeline models have been initialized ... // which happens on stateChanged(Done). - for (const Finalizer &finalizer : qAsConst(d->finalizers)) + for (const Finalizer &finalizer : std::as_const(d->finalizers)) finalizer(); } @@ -398,7 +398,7 @@ void TimelineTraceManager::TimelineTraceManagerPrivate::reset() traceStart = -1; traceEnd = -1; - for (const Clearer &clearer : qAsConst(clearers)) + for (const Clearer &clearer : std::as_const(clearers)) clearer(); numEvents = 0; diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index 3914e1f5293..5ed7efd439d 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -180,7 +180,7 @@ bool BaseAspect::isVisible() const void BaseAspect::setVisible(bool visible) { d->m_visible = visible; - for (QWidget *w : qAsConst(d->m_subWidgets)) { + for (QWidget *w : std::as_const(d->m_subWidgets)) { QTC_ASSERT(w, continue); // This may happen during layout building. Explicit setting visibility here // may create a show a toplevel widget for a moment until it is parented @@ -274,7 +274,7 @@ QString BaseAspect::toolTip() const void BaseAspect::setToolTip(const QString &tooltip) { d->m_tooltip = tooltip; - for (QWidget *w : qAsConst(d->m_subWidgets)) { + for (QWidget *w : std::as_const(d->m_subWidgets)) { QTC_ASSERT(w, continue); w->setToolTip(tooltip); } @@ -288,7 +288,7 @@ bool BaseAspect::isEnabled() const void BaseAspect::setEnabled(bool enabled) { d->m_enabled = enabled; - for (QWidget *w : qAsConst(d->m_subWidgets)) { + for (QWidget *w : std::as_const(d->m_subWidgets)) { QTC_ASSERT(w, continue); w->setEnabled(enabled); } @@ -313,7 +313,7 @@ bool BaseAspect::isReadOnly() const void BaseAspect::setReadOnly(bool readOnly) { d->m_readOnly = readOnly; - for (QWidget *w : qAsConst(d->m_subWidgets)) { + for (QWidget *w : std::as_const(d->m_subWidgets)) { QTC_ASSERT(w, continue); if (auto lineEdit = qobject_cast<QLineEdit *>(w)) lineEdit->setReadOnly(readOnly); @@ -1661,7 +1661,7 @@ void MultiSelectionAspect::addToLayout(LayoutBuilder &builder) switch (d->m_displayStyle) { case DisplayStyle::ListView: d->m_listView = createSubWidget<QListWidget>(); - for (const QString &val : qAsConst(d->m_allValues)) { + for (const QString &val : std::as_const(d->m_allValues)) { auto item = new QListWidgetItem(val, d->m_listView); item->setFlags(item->flags() | Qt::ItemIsUserCheckable); item->setCheckState(value().contains(item->text()) ? Qt::Checked : Qt::Unchecked); @@ -2239,7 +2239,7 @@ void AspectContainer::registerAspect(BaseAspect *aspect) void AspectContainer::registerAspects(const AspectContainer &aspects) { - for (BaseAspect *aspect : qAsConst(aspects.d->m_items)) + for (BaseAspect *aspect : std::as_const(aspects.d->m_items)) registerAspect(aspect); } @@ -2270,7 +2270,7 @@ const QList<BaseAspect *> &AspectContainer::aspects() const void AspectContainer::fromMap(const QVariantMap &map) { - for (BaseAspect *aspect : qAsConst(d->m_items)) + for (BaseAspect *aspect : std::as_const(d->m_items)) aspect->fromMap(map); emit fromMapFinished(); @@ -2279,7 +2279,7 @@ void AspectContainer::fromMap(const QVariantMap &map) void AspectContainer::toMap(QVariantMap &map) const { - for (BaseAspect *aspect : qAsConst(d->m_items)) + for (BaseAspect *aspect : std::as_const(d->m_items)) aspect->toMap(map); } @@ -2288,7 +2288,7 @@ void AspectContainer::readSettings(QSettings *settings) for (const QString &group : d->m_settingsGroup) settings->beginGroup(group); - for (BaseAspect *aspect : qAsConst(d->m_items)) + for (BaseAspect *aspect : std::as_const(d->m_items)) aspect->readSettings(settings); for (int i = 0; i != d->m_settingsGroup.size(); ++i) @@ -2300,7 +2300,7 @@ void AspectContainer::writeSettings(QSettings *settings) const for (const QString &group : d->m_settingsGroup) settings->beginGroup(group); - for (BaseAspect *aspect : qAsConst(d->m_items)) + for (BaseAspect *aspect : std::as_const(d->m_items)) aspect->writeSettings(settings); for (int i = 0; i != d->m_settingsGroup.size(); ++i) @@ -2319,7 +2319,7 @@ void AspectContainer::setSettingsGroups(const QString &groupKey, const QString & void AspectContainer::apply() { - for (BaseAspect *aspect : qAsConst(d->m_items)) + for (BaseAspect *aspect : std::as_const(d->m_items)) aspect->apply(); emit applied(); @@ -2327,26 +2327,26 @@ void AspectContainer::apply() void AspectContainer::cancel() { - for (BaseAspect *aspect : qAsConst(d->m_items)) + for (BaseAspect *aspect : std::as_const(d->m_items)) aspect->cancel(); } void AspectContainer::finish() { - for (BaseAspect *aspect : qAsConst(d->m_items)) + for (BaseAspect *aspect : std::as_const(d->m_items)) aspect->finish(); } void AspectContainer::reset() { - for (BaseAspect *aspect : qAsConst(d->m_items)) + for (BaseAspect *aspect : std::as_const(d->m_items)) aspect->setValueQuietly(aspect->defaultValue()); } void AspectContainer::setAutoApply(bool on) { d->m_autoApply = on; - for (BaseAspect *aspect : qAsConst(d->m_items)) + for (BaseAspect *aspect : std::as_const(d->m_items)) aspect->setAutoApply(on); } @@ -2357,7 +2357,7 @@ void AspectContainer::setOwnsSubAspects(bool on) bool AspectContainer::isDirty() const { - for (BaseAspect *aspect : qAsConst(d->m_items)) { + for (BaseAspect *aspect : std::as_const(d->m_items)) { if (aspect->isDirty()) return true; } @@ -2382,7 +2382,7 @@ void AspectContainer::copyFrom(const AspectContainer &other) void AspectContainer::forEachAspect(const std::function<void(BaseAspect *)> &run) const { - for (BaseAspect *aspect : qAsConst(d->m_items)) { + for (BaseAspect *aspect : std::as_const(d->m_items)) { if (auto container = dynamic_cast<AspectContainer *>(aspect)) container->forEachAspect(run); else diff --git a/src/libs/utils/codegeneration.cpp b/src/libs/utils/codegeneration.cpp index 0dfaaac011e..e1d7dd6dcf4 100644 --- a/src/libs/utils/codegeneration.cpp +++ b/src/libs/utils/codegeneration.cpp @@ -64,7 +64,7 @@ static void qtSection(const QStringList &qtIncludes, QTextStream &str) { QStringList sorted = qtIncludes; sort(sorted); - for (const QString &inc : qAsConst(sorted)) { + for (const QString &inc : std::as_const(sorted)) { if (!inc.isEmpty()) str << QStringLiteral("#include <%1>\n").arg(inc); } diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp index f1f5f4d4787..299fc7fb299 100644 --- a/src/libs/utils/fancylineedit.cpp +++ b/src/libs/utils/fancylineedit.cpp @@ -509,7 +509,7 @@ void FancyLineEdit::validate() // Check buttons. if (d->m_oldText.isEmpty() || t.isEmpty()) { - for (auto &button : qAsConst(d->m_iconbutton)) { + for (auto &button : std::as_const(d->m_iconbutton)) { if (button->hasAutoHide()) button->animateShow(!t.isEmpty()); } diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp index 344b5531a49..92772bd085e 100644 --- a/src/libs/utils/fancymainwindow.cpp +++ b/src/libs/utils/fancymainwindow.cpp @@ -518,7 +518,7 @@ void FancyMainWindow::addDockActionsToMenu(QMenu *menu) QTC_ASSERT(action2, return false); return stripAccelerator(action1->text()).toLower() < stripAccelerator(action2->text()).toLower(); }); - for (QAction *action : qAsConst(actions)) + for (QAction *action : std::as_const(actions)) menu->addAction(action); menu->addAction(&d->m_showCentralWidget); menu->addAction(&d->m_menuSeparator1); diff --git a/src/libs/utils/filesystemmodel.cpp b/src/libs/utils/filesystemmodel.cpp index 645d979fc9c..b905da09945 100644 --- a/src/libs/utils/filesystemmodel.cpp +++ b/src/libs/utils/filesystemmodel.cpp @@ -416,9 +416,9 @@ void FileInfoGatherer::run() condition.wait(&mutex); if (abort.loadRelaxed()) return; - const QString thisPath = qAsConst(path).front(); + const QString thisPath = std::as_const(path).front(); path.pop_front(); - const QStringList thisList = qAsConst(files).front(); + const QStringList thisList = std::as_const(files).front(); files.pop_front(); locker.unlock(); @@ -659,7 +659,7 @@ public: void updateIcon(QFileIconProvider *iconProvider, const QString &path) { if (info) info->icon = iconProvider->icon(QFileInfo(path)); - for (FileSystemNode *child : qAsConst(children)) { + for (FileSystemNode *child : std::as_const(children)) { //On windows the root (My computer) has no path so we don't want to add a / for nothing (e.g. /C:/) if (!path.isEmpty()) { if (path.endsWith(QLatin1Char('/'))) @@ -674,7 +674,7 @@ public: void retranslateStrings(QFileIconProvider *iconProvider, const QString &path) { if (info) info->displayType = iconProvider->type(QFileInfo(path)); - for (FileSystemNode *child : qAsConst(children)) { + for (FileSystemNode *child : std::as_const(children)) { //On windows the root (My computer) has no path so we don't want to add a / for nothing (e.g. /C:/) if (!path.isEmpty()) { if (path.endsWith(QLatin1Char('/'))) @@ -2454,7 +2454,7 @@ void FileSystemModelPrivate::_q_fileSystemChanged(const QString &path, std::sort(rowsToUpdate.begin(), rowsToUpdate.end()); PathKey min; PathKey max; - for (const PathKey &value : qAsConst(rowsToUpdate)) { + for (const PathKey &value : std::as_const(rowsToUpdate)) { //##TODO is there a way to bundle signals with QString as the content of the list? /*if (min.isEmpty()) { min = value; diff --git a/src/libs/utils/filesystemwatcher.cpp b/src/libs/utils/filesystemwatcher.cpp index 602aaadf00a..7eb5db4692f 100644 --- a/src/libs/utils/filesystemwatcher.cpp +++ b/src/libs/utils/filesystemwatcher.cpp @@ -175,10 +175,10 @@ void FileSystemWatcherPrivate::autoReloadPostponed(bool postponed) return; m_postponed = postponed; if (!postponed) { - for (const QString &file : qAsConst(m_postponedFiles)) + for (const QString &file : std::as_const(m_postponedFiles)) emit q->fileChanged(file); m_postponedFiles.clear(); - for (const QString &directory : qAsConst(m_postponedDirectories)) + for (const QString &directory : std::as_const(m_postponedDirectories)) emit q->directoryChanged(directory); m_postponedDirectories.clear(); } @@ -450,7 +450,7 @@ void FileSystemWatcher::slotDirectoryChanged(const QString &path) toReadd.removeOne(rejected); // If we've successfully added the file, that means it was deleted and replaced. - for (const QString &reAdded : qAsConst(toReadd)) + for (const QString &reAdded : std::as_const(toReadd)) d->fileChanged(reAdded); } } diff --git a/src/libs/utils/futuresynchronizer.cpp b/src/libs/utils/futuresynchronizer.cpp index 92a4cd95af5..b3238373137 100644 --- a/src/libs/utils/futuresynchronizer.cpp +++ b/src/libs/utils/futuresynchronizer.cpp @@ -53,7 +53,7 @@ bool FutureSynchronizer::isCancelOnWait() const void FutureSynchronizer::flushFinishedFutures() { QList<QFuture<void>> newFutures; - for (const QFuture<void> &future : qAsConst(m_futures)) { + for (const QFuture<void> &future : std::as_const(m_futures)) { if (!future.isFinished()) newFutures.append(future); } diff --git a/src/libs/utils/infobar.cpp b/src/libs/utils/infobar.cpp index b44ac0d6294..13fca918f53 100644 --- a/src/libs/utils/infobar.cpp +++ b/src/libs/utils/infobar.cpp @@ -266,7 +266,7 @@ void InfoBarDisplay::infoBarDestroyed() void InfoBarDisplay::update() { - for (QWidget *widget : qAsConst(m_infoWidgets)) { + for (QWidget *widget : std::as_const(m_infoWidgets)) { widget->disconnect(this); // We want no destroyed() signal now delete widget; } @@ -275,7 +275,7 @@ void InfoBarDisplay::update() if (!m_infoBar) return; - for (const InfoBarEntry &info : qAsConst(m_infoBar->m_infoBarEntries)) { + for (const InfoBarEntry &info : std::as_const(m_infoBar->m_infoBarEntries)) { auto infoWidget = new InfoBarWidget(m_edge); auto hbox = new QHBoxLayout; @@ -319,7 +319,7 @@ void InfoBarDisplay::update() if (!info.m_combo.entries.isEmpty()) { auto cb = new QComboBox(); cb->setToolTip(info.m_combo.tooltip); - for (const InfoBarEntry::ComboInfo &comboInfo : qAsConst(info.m_combo.entries)) + for (const InfoBarEntry::ComboInfo &comboInfo : std::as_const(info.m_combo.entries)) cb->addItem(comboInfo.displayText, comboInfo.data); if (info.m_combo.currentIndex >= 0 && info.m_combo.currentIndex < cb->count()) cb->setCurrentIndex(info.m_combo.currentIndex); @@ -330,7 +330,7 @@ void InfoBarDisplay::update() hbox->addWidget(cb); } - for (const InfoBarEntry::Button &button : qAsConst(info.m_buttons)) { + for (const InfoBarEntry::Button &button : std::as_const(info.m_buttons)) { auto infoWidgetButton = new QToolButton; infoWidgetButton->setText(button.text); infoWidgetButton->setToolTip(button.tooltip); diff --git a/src/libs/utils/json.cpp b/src/libs/utils/json.cpp index 195b50f2949..c55a4d30cac 100644 --- a/src/libs/utils/json.cpp +++ b/src/libs/utils/json.cpp @@ -13,7 +13,7 @@ using namespace Utils; JsonMemoryPool::~JsonMemoryPool() { - for (char *obj : qAsConst(_objs)) { + for (char *obj : std::as_const(_objs)) { reinterpret_cast<JsonValue *>(obj)->~JsonValue(); delete[] obj; } @@ -657,7 +657,7 @@ JsonSchemaManager::JsonSchemaManager(const QStringList &searchPaths) JsonSchemaManager::~JsonSchemaManager() { - for (const JsonSchemaData &schemaData : qAsConst(m_schemas)) + for (const JsonSchemaData &schemaData : std::as_const(m_schemas)) delete schemaData.m_schema; } diff --git a/src/libs/utils/launchersocket.cpp b/src/libs/utils/launchersocket.cpp index e375d36dab3..07d0b917d21 100644 --- a/src/libs/utils/launchersocket.cpp +++ b/src/libs/utils/launchersocket.cpp @@ -79,7 +79,7 @@ bool CallerHandle::flushFor(SignalType signalType) { QMutexLocker locker(&m_mutex); const QList<SignalType> storedSignals = - Utils::transform(qAsConst(m_signals), [](const LauncherSignal *launcherSignal) { + Utils::transform(std::as_const(m_signals), [](const LauncherSignal *launcherSignal) { return launcherSignal->signalType(); }); @@ -102,7 +102,7 @@ bool CallerHandle::flushFor(SignalType signalType) } } bool signalMatched = false; - for (const LauncherSignal *storedSignal : qAsConst(oldSignals)) { + for (const LauncherSignal *storedSignal : std::as_const(oldSignals)) { const SignalType storedSignalType = storedSignal->signalType(); if (storedSignalType == signalType) signalMatched = true; @@ -653,7 +653,7 @@ void LauncherSocket::handleRequests() m_requests.clear(); } - for (const QByteArray &request : qAsConst(requests)) + for (const QByteArray &request : std::as_const(requests)) socket->write(request); } diff --git a/src/libs/utils/mapreduce.h b/src/libs/utils/mapreduce.h index eb903863205..57d1a578902 100644 --- a/src/libs/utils/mapreduce.h +++ b/src/libs/utils/mapreduce.h @@ -128,7 +128,7 @@ protected: return; const double progressPerMap = MAX_PROGRESS / double(m_size); double progress = m_successfullyFinishedMapCount * progressPerMap; - for (const QFutureWatcher<MapResult> *watcher : qAsConst(m_mapWatcher)) { + for (const QFutureWatcher<MapResult> *watcher : std::as_const(m_mapWatcher)) { if (watcher->progressMinimum() != watcher->progressMaximum()) { const double range = watcher->progressMaximum() - watcher->progressMinimum(); progress += (watcher->progressValue() - watcher->progressMinimum()) / range * progressPerMap; @@ -139,7 +139,7 @@ protected: void cancelAll() { - for (QFutureWatcher<MapResult> *watcher : qAsConst(m_mapWatcher)) + for (QFutureWatcher<MapResult> *watcher : std::as_const(m_mapWatcher)) watcher->cancel(); } diff --git a/src/libs/utils/mimetypes/mimedatabase.cpp b/src/libs/utils/mimetypes/mimedatabase.cpp index 27aae693417..6ffe81d96d8 100644 --- a/src/libs/utils/mimetypes/mimedatabase.cpp +++ b/src/libs/utils/mimetypes/mimedatabase.cpp @@ -167,7 +167,7 @@ MimeType MimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileName return candidateByData; } // If there is a glob match that is a sub class of sniffedMime, use it - for (const QString &m : qAsConst(candidatesByName)) { + for (const QString &m : std::as_const(candidatesByName)) { if (inherits(m, sniffedMime)) { // We have magic + pattern pointing to this, so it's a pretty good match *accuracyPtr = 100; @@ -425,7 +425,7 @@ QList<MimeType> MimeDatabase::mimeTypesForFileName(const QString &fileName) cons QStringList matches = d->mimeTypeForFileName(fileName); QList<MimeType> mimes; matches.sort(); // Make it deterministic - for (const QString &mime : qAsConst(matches)) + for (const QString &mime : std::as_const(matches)) mimes.append(d->mimeTypeForName(mime)); return mimes; } diff --git a/src/libs/utils/mimetypes/mimeprovider.cpp b/src/libs/utils/mimetypes/mimeprovider.cpp index f516f13c926..03574a157f4 100644 --- a/src/libs/utils/mimetypes/mimeprovider.cpp +++ b/src/libs/utils/mimetypes/mimeprovider.cpp @@ -252,7 +252,7 @@ bool MimeProviderBase::shouldCheck() // const QString lowerFileName = fileName.toLower(); // MimeGlobMatchResult result; // // TODO this parses in the order (local, global). Check that it handles "NOGLOBS" correctly. -// for (CacheFile *cacheFile : qAsConst(m_cacheFiles)) { +// for (CacheFile *cacheFile : std::as_const(m_cacheFiles)) { // matchGlobList(result, cacheFile, cacheFile->getUint32(PosLiteralListOffset), fileName); // matchGlobList(result, cacheFile, cacheFile->getUint32(PosGlobListOffset), fileName); // const int reverseSuffixTreeOffset = cacheFile->getUint32(PosReverseSuffixTreeOffset); @@ -364,7 +364,7 @@ bool MimeProviderBase::shouldCheck() //MimeType MimeBinaryProvider::findByMagic(const QByteArray &data, int *accuracyPtr) //{ // checkCache(); -// for (CacheFile *cacheFile : qAsConst(m_cacheFiles)) { +// for (CacheFile *cacheFile : std::as_const(m_cacheFiles)) { // const int magicListOffset = cacheFile->getUint32(PosMagicListOffset); // const int numMatches = cacheFile->getUint32(magicListOffset); // //const int maxExtent = cacheFile->getUint32(magicListOffset + 4); @@ -392,7 +392,7 @@ bool MimeProviderBase::shouldCheck() // checkCache(); // const QByteArray mimeStr = mime.toLatin1(); // QStringList result; -// for (CacheFile *cacheFile : qAsConst(m_cacheFiles)) { +// for (CacheFile *cacheFile : std::as_const(m_cacheFiles)) { // const int parentListOffset = cacheFile->getUint32(PosParentListOffset); // const int numEntries = cacheFile->getUint32(parentListOffset); @@ -432,7 +432,7 @@ bool MimeProviderBase::shouldCheck() //{ // checkCache(); // const QByteArray input = name.toLatin1(); -// for (CacheFile *cacheFile : qAsConst(m_cacheFiles)) { +// for (CacheFile *cacheFile : std::as_const(m_cacheFiles)) { // const int aliasListOffset = cacheFile->getUint32(PosAliasListOffset); // const int numEntries = cacheFile->getUint32(aliasListOffset); // int begin = 0; @@ -463,7 +463,7 @@ bool MimeProviderBase::shouldCheck() // checkCache(); // QStringList result; // const QByteArray input = name.toLatin1(); -// for (CacheFile *cacheFile : qAsConst(m_cacheFiles)) { +// for (CacheFile *cacheFile : std::as_const(m_cacheFiles)) { // const int aliasListOffset = cacheFile->getUint32(PosAliasListOffset); // const int numEntries = cacheFile->getUint32(aliasListOffset); // for (int pos = 0; pos < numEntries; ++pos) { @@ -641,7 +641,7 @@ bool MimeProviderBase::shouldCheck() //{ // checkCache(); // const QByteArray inputMime = data.name.toLatin1(); -// for (CacheFile *cacheFile : qAsConst(m_cacheFiles)) { +// for (CacheFile *cacheFile : std::as_const(m_cacheFiles)) { // const QString icon = iconForMime(cacheFile, PosIconsListOffset, inputMime); // if (!icon.isEmpty()) { // data.iconName = icon; @@ -654,7 +654,7 @@ bool MimeProviderBase::shouldCheck() //{ // checkCache(); // const QByteArray inputMime = data.name.toLatin1(); -// for (CacheFile *cacheFile : qAsConst(m_cacheFiles)) { +// for (CacheFile *cacheFile : std::as_const(m_cacheFiles)) { // const QString icon = iconForMime(cacheFile, PosGenericIconsListOffset, inputMime); // if (!icon.isEmpty()) { // data.genericIconName = icon; @@ -696,7 +696,7 @@ MimeType MimeXMLProvider::findByMagic(const QByteArray &data, int *accuracyPtr) QString candidate; - for (const MimeMagicRuleMatcher &matcher : qAsConst(m_magicMatchers)) { + for (const MimeMagicRuleMatcher &matcher : std::as_const(m_magicMatchers)) { if (matcher.matches(data)) { const int priority = matcher.priority(); if (priority > *accuracyPtr) { @@ -711,7 +711,7 @@ MimeType MimeXMLProvider::findByMagic(const QByteArray &data, int *accuracyPtr) QMap<int, QList<MimeMagicRule> > MimeXMLProvider::magicRulesForMimeType(const MimeType &mimeType) { QMap<int, QList<MimeMagicRule> > result; - for (const MimeMagicRuleMatcher &matcher : qAsConst(m_magicMatchers)) { + for (const MimeMagicRuleMatcher &matcher : std::as_const(m_magicMatchers)) { if (mimeType.matchesName(matcher.mimetype())) result[matcher.priority()].append(matcher.magicRules()); } @@ -775,7 +775,7 @@ void MimeXMLProvider::ensureLoaded() } } - for (const QString &file : qAsConst(allFiles)) + for (const QString &file : std::as_const(allFiles)) load(file); } } diff --git a/src/libs/utils/mimetypes/mimetype.cpp b/src/libs/utils/mimetypes/mimetype.cpp index 9c94f53749f..e749a569c65 100644 --- a/src/libs/utils/mimetypes/mimetype.cpp +++ b/src/libs/utils/mimetypes/mimetype.cpp @@ -327,7 +327,7 @@ QStringList MimeType::suffixes() const MimeDatabasePrivate::instance()->provider()->loadMimeTypePrivate(*d); QStringList result; - for (const QString &pattern : qAsConst(d->globPatterns)) { + for (const QString &pattern : std::as_const(d->globPatterns)) { const QString suffix = suffixFromPattern(pattern); if (!suffix.isEmpty()) result.append(suffix); diff --git a/src/libs/utils/mimetypes2/mimedatabase.cpp b/src/libs/utils/mimetypes2/mimedatabase.cpp index 35cef228b93..d055d10ce73 100644 --- a/src/libs/utils/mimetypes2/mimedatabase.cpp +++ b/src/libs/utils/mimetypes2/mimedatabase.cpp @@ -431,7 +431,7 @@ MimeType MimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileName *accuracyPtr = 100; return candidateByData; } - for (const QString &m : qAsConst(candidatesByName.m_allMatchingMimeTypes)) { + for (const QString &m : std::as_const(candidatesByName.m_allMatchingMimeTypes)) { if (inherits(m, sniffedMime)) { // We have magic + pattern pointing to this, so it's a pretty good match *accuracyPtr = 100; diff --git a/src/libs/utils/mimetypes2/mimeprovider.cpp b/src/libs/utils/mimetypes2/mimeprovider.cpp index a4cee429218..99adb48c7a7 100644 --- a/src/libs/utils/mimetypes2/mimeprovider.cpp +++ b/src/libs/utils/mimetypes2/mimeprovider.cpp @@ -479,10 +479,10 @@ void MimeBinaryProvider::addAllMimeTypes(QList<MimeType> &result) loadMimeTypeList(); if (result.isEmpty()) { result.reserve(m_mimetypeNames.count()); - for (const QString &name : qAsConst(m_mimetypeNames)) + for (const QString &name : std::as_const(m_mimetypeNames)) result.append(mimeTypeForNameUnchecked(name)); } else { - for (const QString &name : qAsConst(m_mimetypeNames)) + for (const QString &name : std::as_const(m_mimetypeNames)) if (std::find_if(result.constBegin(), result.constEnd(), [name](const MimeType &mime) -> bool { return mime.name() == name; }) == result.constEnd()) result.append(mimeTypeForNameUnchecked(name)); @@ -720,7 +720,7 @@ void MimeXMLProvider::findByMagic(const QByteArray &data, int *accuracyPtr, Mime { QString candidateName; bool foundOne = false; - for (const MimeMagicRuleMatcher &matcher : qAsConst(m_magicMatchers)) { + for (const MimeMagicRuleMatcher &matcher : std::as_const(m_magicMatchers)) { if (m_overriddenMimeTypes.contains(matcher.mimetype())) continue; if (matcher.matches(data)) { @@ -758,7 +758,7 @@ void MimeXMLProvider::ensureLoaded() //qDebug() << "Loading" << m_allFiles; - for (const QString &file : qAsConst(allFiles)) + for (const QString &file : std::as_const(allFiles)) load(file); } diff --git a/src/libs/utils/mimetypes2/mimetype.cpp b/src/libs/utils/mimetypes2/mimetype.cpp index 735e529cff8..34177b13879 100644 --- a/src/libs/utils/mimetypes2/mimetype.cpp +++ b/src/libs/utils/mimetypes2/mimetype.cpp @@ -234,7 +234,7 @@ QString MimeType::comment() const languageList << QLocale().name(); languageList << QLocale().uiLanguages(); languageList << QLatin1String("default"); // use the default locale if possible. - for (const QString &language : qAsConst(languageList)) { + for (const QString &language : std::as_const(languageList)) { const QString lang = language == QLatin1String("C") ? QLatin1String("en_US") : language; const QString comm = d->localeComments.value(lang); if (!comm.isEmpty()) @@ -419,7 +419,7 @@ QStringList MimeType::suffixes() const MimeDatabasePrivate::instance()->loadMimeTypePrivate(const_cast<MimeTypePrivate&>(*d)); QStringList result; - for (const QString &pattern : qAsConst(d->globPatterns)) { + for (const QString &pattern : std::as_const(d->globPatterns)) { const QString suffix = suffixFromPattern(pattern); if (!suffix.isEmpty()) result.append(suffix); diff --git a/src/libs/utils/minimizableinfobars.cpp b/src/libs/utils/minimizableinfobars.cpp index c59a023cc96..6ca39a4af2a 100644 --- a/src/libs/utils/minimizableinfobars.cpp +++ b/src/libs/utils/minimizableinfobars.cpp @@ -40,7 +40,7 @@ void MinimizableInfoBars::setSettingsGroup(const QString &settingsGroup) void MinimizableInfoBars::createActions() { QTC_CHECK(m_actions.isEmpty()); - for (const Utils::InfoBarEntry &entry : qAsConst(m_infoEntries)) { + for (const Utils::InfoBarEntry &entry : std::as_const(m_infoEntries)) { const Id id = entry.id(); auto action = new QAction(this); action->setToolTip(entry.text()); diff --git a/src/libs/utils/namevaluemodel.cpp b/src/libs/utils/namevaluemodel.cpp index dba0f8dc898..c0fcaa83b24 100644 --- a/src/libs/utils/namevaluemodel.cpp +++ b/src/libs/utils/namevaluemodel.cpp @@ -28,7 +28,7 @@ public: m_resultNameValueDictionary.modify(m_items); // Add removed variables again and mark them as "<UNSET>" so // that the user can actually see those removals: - for (const NameValueItem &item : qAsConst(m_items)) { + for (const NameValueItem &item : std::as_const(m_items)) { if (item.operation == NameValueItem::Unset) m_resultNameValueDictionary.set(item.name, NameValueModel::tr("<UNSET>")); } diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp index 2d65f8919c6..e0085b26ef2 100644 --- a/src/libs/utils/outputformatter.cpp +++ b/src/libs/utils/outputformatter.cpp @@ -240,7 +240,7 @@ void OutputFormatter::setLineParsers(const QList<OutputLineParser *> &parsers) void OutputFormatter::addLineParsers(const QList<OutputLineParser *> &parsers) { - for (OutputLineParser * const p : qAsConst(parsers)) + for (OutputLineParser * const p : std::as_const(parsers)) addLineParser(p); } @@ -264,7 +264,7 @@ void OutputFormatter::setFileFinder(const FileInProjectFinder &finder) void OutputFormatter::setDemoteErrorsToWarnings(bool demote) { - for (OutputLineParser * const p : qAsConst(d->lineParsers)) + for (OutputLineParser * const p : std::as_const(d->lineParsers)) p->setDemoteErrorsToWarnings(demote); } @@ -307,7 +307,7 @@ void OutputFormatter::doAppendMessage(const QString &text, OutputFormat format) if (linkified.isEmpty()) append({}, charFmt); // This might cause insertion of a newline character. - for (OutputLineParser * const p : qAsConst(involvedParsers)) { + for (OutputLineParser * const p : std::as_const(involvedParsers)) { if (d->postPrintAction) d->postPrintAction(p); else @@ -340,7 +340,7 @@ OutputLineParser::Result OutputFormatter::handleMessage(const QString &text, Out } } QTC_CHECK(!d->nextParser); - for (OutputLineParser * const parser : qAsConst(d->lineParsers)) { + for (OutputLineParser * const parser : std::as_const(d->lineParsers)) { if (parser == oldNextParser) // We tried that one already. continue; const OutputLineParser::Result res @@ -532,7 +532,7 @@ void OutputFormatter::handleLink(const QString &href) // to the line parsers. if (handleFileLink(href)) return; - for (OutputLineParser * const f : qAsConst(d->lineParsers)) { + for (OutputLineParser * const f : std::as_const(d->lineParsers)) { if (f->handleLink(href)) return; } @@ -575,7 +575,7 @@ void OutputFormatter::flush() flushIncompleteLine(); flushTrailingNewline(); d->escapeCodeHandler.endFormatScope(); - for (OutputLineParser * const p : qAsConst(d->lineParsers)) + for (OutputLineParser * const p : std::as_const(d->lineParsers)) p->flush(); if (d->nextParser) d->nextParser->runPostPrintActions(plainTextEdit()); @@ -590,13 +590,13 @@ bool OutputFormatter::hasFatalErrors() const void OutputFormatter::addSearchDir(const FilePath &dir) { - for (OutputLineParser * const p : qAsConst(d->lineParsers)) + for (OutputLineParser * const p : std::as_const(d->lineParsers)) p->addSearchDir(dir); } void OutputFormatter::dropSearchDir(const FilePath &dir) { - for (OutputLineParser * const p : qAsConst(d->lineParsers)) + for (OutputLineParser * const p : std::as_const(d->lineParsers)) p->dropSearchDir(dir); } diff --git a/src/libs/utils/portlist.cpp b/src/libs/utils/portlist.cpp index 2073a7f69ad..5456c90f8c3 100644 --- a/src/libs/utils/portlist.cpp +++ b/src/libs/utils/portlist.cpp @@ -141,7 +141,7 @@ bool PortList::hasMore() const { return !d->ranges.isEmpty(); } bool PortList::contains(Port port) const { - for (const Internal::Range &r : qAsConst(d->ranges)) { + for (const Internal::Range &r : std::as_const(d->ranges)) { if (port >= r.first && port <= r.second) return true; } @@ -151,7 +151,7 @@ bool PortList::contains(Port port) const int PortList::count() const { int n = 0; - for (const Internal::Range &r : qAsConst(d->ranges)) + for (const Internal::Range &r : std::as_const(d->ranges)) n += r.second.number() - r.first.number() + 1; return n; } @@ -171,7 +171,7 @@ Port PortList::getNext() QString PortList::toString() const { QString stringRep; - for (const Internal::Range &range : qAsConst(d->ranges)) { + for (const Internal::Range &range : std::as_const(d->ranges)) { stringRep += QString::number(range.first.number()); if (range.second != range.first) stringRep += QLatin1Char('-') + QString::number(range.second.number()); diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index ac46cae9461..18abb0de20f 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -839,7 +839,7 @@ QList<ProcessInterfaceSignal *> GeneralProcessBlockingImpl::takeSignalsFor(Proce return takeAllSignals(); QMutexLocker locker(&m_mutex); - const QList<ProcessSignalType> storedSignals = transform(qAsConst(m_signals), + const QList<ProcessSignalType> storedSignals = transform(std::as_const(m_signals), [](const ProcessInterfaceSignal *aSignal) { return aSignal->signalType(); }); @@ -866,7 +866,7 @@ bool GeneralProcessBlockingImpl::flushSignals(const QList<ProcessInterfaceSignal ProcessSignalType *signalType) { bool signalMatched = false; - for (const ProcessInterfaceSignal *storedSignal : qAsConst(signalList)) { + for (const ProcessInterfaceSignal *storedSignal : std::as_const(signalList)) { const ProcessSignalType storedSignalType = storedSignal->signalType(); if (signalType && storedSignalType == *signalType) signalMatched = true; diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp index 31ef7dce28e..c9362f17fef 100644 --- a/src/libs/utils/wizard.cpp +++ b/src/libs/utils/wizard.cpp @@ -388,7 +388,7 @@ void Wizard::showVariables() QHash<QString, QVariant> vars = variables(); QList<QString> keys = vars.keys(); sort(keys); - for (const QString &key : qAsConst(keys)) { + for (const QString &key : std::as_const(keys)) { const QVariant &v = vars.value(key); result += QLatin1String(" <tr><td>") + key + QLatin1String("</td><td>") diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index 7fdc9960c6d..2234a6e2b45 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/src/plugins/android/androidavdmanager.cpp @@ -212,11 +212,11 @@ static AndroidDeviceInfoList listVirtualDevices(const AndroidConfig &config) avdErrorPaths.clear(); avdList = parseAvdList(output, &avdErrorPaths); allAvdErrorPaths << avdErrorPaths; - for (const QString &avdPathStr : qAsConst(avdErrorPaths)) + for (const QString &avdPathStr : std::as_const(avdErrorPaths)) avdConfigEditManufacturerTag(avdPathStr); // comment out manufacturer tag } while (!avdErrorPaths.isEmpty()); // try again - for (const QString &avdPathStr : qAsConst(allAvdErrorPaths)) + for (const QString &avdPathStr : std::as_const(allAvdErrorPaths)) avdConfigEditManufacturerTag(avdPathStr, true); // re-add manufacturer tag return avdList; diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index dd55ccefa07..72286ef819b 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -673,7 +673,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const // workaround for '????????????' serial numbers: // can use "adb -d" when only one usb device attached - for (const QString &device : qAsConst(adbDevs)) { + for (const QString &device : std::as_const(adbDevs)) { const QString serialNo = device.left(device.indexOf('\t')).trimmed(); const QString deviceType = device.mid(device.indexOf('\t')).trimmed(); AndroidDeviceInfo dev; @@ -1538,7 +1538,7 @@ FilePath AndroidConfig::getJdkPath() // Look for the highest existing JDK allVersions.sort(); std::reverse(allVersions.begin(), allVersions.end()); // Order descending - for (const QString &version : qAsConst(allVersions)) { + for (const QString &version : std::as_const(allVersions)) { settings.beginGroup(version); jdkHome = FilePath::fromUserInput(settings.value("JavaHome").toString()); settings.endGroup(); diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp index 83095383917..f0d5ce61dcf 100644 --- a/src/plugins/android/androidmanifesteditorwidget.cpp +++ b/src/plugins/android/androidmanifesteditorwidget.cpp @@ -1052,7 +1052,7 @@ void AndroidManifestEditorWidget::parseManifest(QXmlStreamReader &reader, QXmlSt writer.writeComment(QLatin1String(" %%INSERT_FEATURES ")); if (!permissions.isEmpty()) { - for (const QString &permission : qAsConst(permissions)) { + for (const QString &permission : std::as_const(permissions)) { writer.writeEmptyElement(QLatin1String("uses-permission")); writer.writeAttribute(QLatin1String("android:name"), permission); } diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp index 0cc5dc5539c..72b80747737 100644 --- a/src/plugins/android/androidpackageinstallationstep.cpp +++ b/src/plugins/android/androidpackageinstallationstep.cpp @@ -123,7 +123,7 @@ void AndroidPackageInstallationStep::setupOutputFormatter(OutputFormatter *forma void AndroidPackageInstallationStep::doRun() { QString error; - for (const QString &dir : qAsConst(m_androidDirsToClean)) { + for (const QString &dir : std::as_const(m_androidDirsToClean)) { FilePath androidDir = FilePath::fromString(dir); if (!dir.isEmpty() && androidDir.exists()) { emit addOutput(Tr::tr("Removing directory %1").arg(dir), OutputFormat::NormalMessage); diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index abbddb843ce..36a36a486e1 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -416,7 +416,7 @@ void AndroidRunnerWorker::logcatProcess(const QByteArray &text, QByteArray &buff } QString pidString = QString::number(m_processPID); - for (const QByteArray &msg : qAsConst(lines)) { + for (const QByteArray &msg : std::as_const(lines)) { const QString line = QString::fromUtf8(msg).trimmed() + QLatin1Char('\n'); if (!line.contains(pidString)) continue; @@ -526,7 +526,7 @@ void AndroidRunnerWorker::asyncStartHelper() forceStop(); asyncStartLogcat(); - for (const QString &entry : qAsConst(m_beforeStartAdbCommands)) + for (const QString &entry : std::as_const(m_beforeStartAdbCommands)) runAdb(entry.split(' ', Qt::SkipEmptyParts)); QStringList args({"shell", "am", "start"}); @@ -823,7 +823,7 @@ void AndroidRunnerWorker::onProcessIdChanged(qint64 pid) m_debugServerProcess.reset(); // Run adb commands after application quit. - for (const QString &entry: qAsConst(m_afterFinishAdbCommands)) + for (const QString &entry: std::as_const(m_afterFinishAdbCommands)) runAdb(entry.split(' ', Qt::SkipEmptyParts)); } else { // In debugging cases this will be funneled to the engine to actually start diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index b82791db07b..af5b789f026 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -536,7 +536,7 @@ void SdkManagerOutputParser::compilePackageAssociations() deleteAlreadyInstalled(images); // Associate the system images with sdk platforms. - for (AndroidSdkPackage *image : qAsConst(images)) { + for (AndroidSdkPackage *image : std::as_const(images)) { int imageApi = m_systemImages[image]; auto itr = std::find_if(m_packages.begin(), m_packages.end(), [imageApi](const AndroidSdkPackage *p) { @@ -651,7 +651,7 @@ bool SdkManagerOutputParser::parseAbstractData(SdkManagerOutputParser::GenericPa keys << installLocationKey << revisionKey << descriptionKey; for (const QString &line : input) { QString value; - for (const auto &key: qAsConst(keys)) { + for (const auto &key: std::as_const(keys)) { if (valueForKey(key, line, &value)) { if (key == installLocationKey) output.installedLocation = Utils::FilePath::fromUserInput(value); @@ -1123,7 +1123,7 @@ void AndroidSdkManagerPrivate::parseCommonArguments(QFutureInterface<QString> &f void AndroidSdkManagerPrivate::clearPackages() { - for (AndroidSdkPackage *p : qAsConst(m_allPackages)) + for (AndroidSdkPackage *p : std::as_const(m_allPackages)) delete p; m_allPackages.clear(); } diff --git a/src/plugins/android/androidsdkmodel.cpp b/src/plugins/android/androidsdkmodel.cpp index 74e172d0118..30701c893a0 100644 --- a/src/plugins/android/androidsdkmodel.cpp +++ b/src/plugins/android/androidsdkmodel.cpp @@ -281,7 +281,7 @@ void AndroidSdkModel::selectMissingEssentials() } // Select SDK platform - for (const SdkPlatform *platform : qAsConst(m_sdkPlatforms)) { + for (const SdkPlatform *platform : std::as_const(m_sdkPlatforms)) { if (!platform->installedLocation().isEmpty()) { pendingPkgs.removeOne(platform->sdkStylePath()); } else if (pendingPkgs.contains(platform->sdkStylePath()) && diff --git a/src/plugins/android/androidsdkpackage.cpp b/src/plugins/android/androidsdkpackage.cpp index 6566c14e494..16e3cc8b725 100644 --- a/src/plugins/android/androidsdkpackage.cpp +++ b/src/plugins/android/androidsdkpackage.cpp @@ -133,7 +133,7 @@ SdkPlatform::SdkPlatform(const QVersionNumber &version, const QString &sdkStyleP SdkPlatform::~SdkPlatform() { - for (SystemImage *image : qAsConst(m_systemImages)) + for (SystemImage *image : std::as_const(m_systemImages)) delete image; m_systemImages.clear(); } diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp index 4ea5748f594..64a7f68ba1f 100644 --- a/src/plugins/android/avddialog.cpp +++ b/src/plugins/android/avddialog.cpp @@ -235,7 +235,7 @@ void AvdDialog::updateDeviceDefinitionComboBox() m_deviceDefinitionTypeComboBox->currentText()); m_deviceDefinitionComboBox->clear(); - for (const DeviceDefinitionStruct &item : qAsConst(m_deviceDefinitionsList)) { + for (const DeviceDefinitionStruct &item : std::as_const(m_deviceDefinitionsList)) { if (item.deviceType == curDeviceType) m_deviceDefinitionComboBox->addItem(item.name_id); } @@ -289,7 +289,7 @@ void AvdDialog::updateApiLevelComboBox() }); m_targetApiComboBox->clear(); - for (SystemImage *image : qAsConst(filteredList)) { + for (SystemImage *image : std::as_const(filteredList)) { QString imageString = "android-" % QString::number(image->apiLevel()); const QStringList imageSplits = image->sdkStylePath().split(';'); if (imageSplits.size() == 4) diff --git a/src/plugins/autotest/boost/boosttesttreeitem.cpp b/src/plugins/autotest/boost/boosttesttreeitem.cpp index ce3215aeeb3..ef4751c2982 100644 --- a/src/plugins/autotest/boost/boosttesttreeitem.cpp +++ b/src/plugins/autotest/boost/boosttesttreeitem.cpp @@ -182,7 +182,7 @@ QList<ITestConfiguration *> BoostTestTreeItem::getAllTestConfigurations() const }); for (auto it = testsPerProjectfile.begin(), end = testsPerProjectfile.end(); it != end; ++it) { - for (const QString &target : qAsConst(it.value().internalTargets)) { + for (const QString &target : std::as_const(it.value().internalTargets)) { BoostTestConfiguration *config = new BoostTestConfiguration(framework()); config->setProject(project); config->setProjectFile(it.key()); diff --git a/src/plugins/autotest/catch/catchtreeitem.cpp b/src/plugins/autotest/catch/catchtreeitem.cpp index 3ba23c4d8f4..1cc79c888b8 100644 --- a/src/plugins/autotest/catch/catchtreeitem.cpp +++ b/src/plugins/autotest/catch/catchtreeitem.cpp @@ -250,7 +250,7 @@ QList<ITestConfiguration *> CatchTreeItem::getFailedTestConfigurations() const collectFailedTestInfo(this, testCasesForProFile); for (auto it = testCasesForProFile.begin(), end = testCasesForProFile.end(); it != end; ++it) { - for (const QString &target : qAsConst(it.value().internalTargets)) { + for (const QString &target : std::as_const(it.value().internalTargets)) { CatchConfiguration *tc = new CatchConfiguration(framework()); tc->setTestCases(it.value().names); tc->setProjectFile(it.key()); @@ -321,7 +321,7 @@ QList<ITestConfiguration *> CatchTreeItem::getTestConfigurations(bool ignoreChec collectTestInfo(childItem(row), testCasesForProfile, ignoreCheckState); for (auto it = testCasesForProfile.begin(), end = testCasesForProfile.end(); it != end; ++it) { - for (const QString &target : qAsConst(it.value().internalTargets)) { + for (const QString &target : std::as_const(it.value().internalTargets)) { CatchConfiguration *tc = new CatchConfiguration(framework()); tc->setTestCases(it.value().names); if (ignoreCheckState) diff --git a/src/plugins/autotest/gtest/gtesttreeitem.cpp b/src/plugins/autotest/gtest/gtesttreeitem.cpp index 736f1b6fcaf..799ae33a15b 100644 --- a/src/plugins/autotest/gtest/gtesttreeitem.cpp +++ b/src/plugins/autotest/gtest/gtesttreeitem.cpp @@ -261,7 +261,7 @@ QList<ITestConfiguration *> GTestTreeItem::getTestConfigurations(bool ignoreChec } for (auto it = testCasesForProFile.begin(), end = testCasesForProFile.end(); it != end; ++it) { - for (const QString &target : qAsConst(it.value().internalTargets)) { + for (const QString &target : std::as_const(it.value().internalTargets)) { GTestConfiguration *tc = new GTestConfiguration(framework()); if (!ignoreCheckState) tc->setTestCases(it.value().filters); @@ -297,7 +297,7 @@ QList<ITestConfiguration *> GTestTreeItem::getFailedTestConfigurations() const collectFailedTestInfo(this, testCasesForProFile); for (auto it = testCasesForProFile.begin(), end = testCasesForProFile.end(); it != end; ++it) { - for (const QString &target : qAsConst(it.value().internalTargets)) { + for (const QString &target : std::as_const(it.value().internalTargets)) { GTestConfiguration *tc = new GTestConfiguration(framework()); tc->setTestCases(it.value().filters); tc->setTestCaseCount(tc->testCaseCount() + it.value().testSetCount); @@ -331,7 +331,7 @@ QList<ITestConfiguration *> GTestTreeItem::getTestConfigurationsForFile(const Ut } }); for (auto it = testCases.begin(), end = testCases.end(); it != end; ++it) { - for (const QString &target : qAsConst(it.value().internalTargets)) { + for (const QString &target : std::as_const(it.value().internalTargets)) { GTestConfiguration *tc = new GTestConfiguration(framework()); tc->setTestCases(it.value().filters); tc->setProjectFile(it.key()); diff --git a/src/plugins/autotest/projectsettingswidget.cpp b/src/plugins/autotest/projectsettingswidget.cpp index d425699eb65..0d507105230 100644 --- a/src/plugins/autotest/projectsettingswidget.cpp +++ b/src/plugins/autotest/projectsettingswidget.cpp @@ -111,7 +111,7 @@ void ProjectTestSettingsWidget::populateFrameworks(const QHash<ITestFramework *, item->setData(0, BaseTypeRole, frameworkOrTestTool->type()); }; - for (ITestFramework *framework : qAsConst(sortedFrameworks)) + for (ITestFramework *framework : std::as_const(sortedFrameworks)) generateItem(framework, frameworks.value(framework)); // FIXME: testTools aren't sorted and we cannot use priority here diff --git a/src/plugins/autotest/qtest/qttestparser.cpp b/src/plugins/autotest/qtest/qttestparser.cpp index 492e5843593..e5753a36a84 100644 --- a/src/plugins/autotest/qtest/qttestparser.cpp +++ b/src/plugins/autotest/qtest/qttestparser.cpp @@ -163,7 +163,7 @@ static CPlusPlus::Document::Ptr declaringDocument(CPlusPlus::Document::Ptr doc, } } - for (const CPlusPlus::LookupItem &item : qAsConst(lookupItems)) { + for (const CPlusPlus::LookupItem &item : std::as_const(lookupItems)) { if (CPlusPlus::Symbol *symbol = item.declaration()) { if (CPlusPlus::Class *toeClass = symbol->asClass()) { const QString declFileName = QLatin1String(toeClass->fileId()->chars(), diff --git a/src/plugins/autotest/quick/quicktestparser.cpp b/src/plugins/autotest/quick/quicktestparser.cpp index 916434477ca..b133938abc2 100644 --- a/src/plugins/autotest/quick/quicktestparser.cpp +++ b/src/plugins/autotest/quick/quicktestparser.cpp @@ -180,7 +180,7 @@ QList<Document::Ptr> QuickTestParser::scanDirectoryForQuickTestQmlFiles(const Ut QList<Document::Ptr> foundDocs; - for (const Utils::FilePath &path : qAsConst(dirs)) { + for (const Utils::FilePath &path : std::as_const(dirs)) { const QList<Document::Ptr> docs = snapshot.documentsInDirectory(path); for (const Document::Ptr &doc : docs) { Utils::FilePath fi = doc->fileName(); diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp index 4a48a579028..27175552414 100644 --- a/src/plugins/autotest/testcodeparser.cpp +++ b/src/plugins/autotest/testcodeparser.cpp @@ -318,11 +318,11 @@ void TestCodeParser::scanForTests(const Utils::FilePaths &fileList, } } else if (!parsers.isEmpty()) { for (ITestParser *parser: parsers) { - for (const Utils::FilePath &filePath : qAsConst(list)) + for (const Utils::FilePath &filePath : std::as_const(list)) parser->framework()->rootNode()->markForRemovalRecursively(filePath); } } else { - for (const Utils::FilePath &filePath : qAsConst(list)) + for (const Utils::FilePath &filePath : std::as_const(list)) emit requestRemoval(filePath); } @@ -453,7 +453,7 @@ void TestCodeParser::parsePostponedFiles() void TestCodeParser::releaseParserInternals() { - for (ITestParser *parser : qAsConst(m_testCodeParsers)) + for (ITestParser *parser : std::as_const(m_testCodeParsers)) parser->release(); } diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp index 0ad73489784..c97bc22e93f 100644 --- a/src/plugins/autotest/testconfiguration.cpp +++ b/src/plugins/autotest/testconfiguration.cpp @@ -210,7 +210,7 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode) QList<RunConfiguration *> runConfigurations = target->runConfigurations(); runConfigurations.removeOne(target->activeRunConfiguration()); runConfigurations.prepend(target->activeRunConfiguration()); - for (RunConfiguration *runConfig : qAsConst(runConfigurations)) { + for (RunConfiguration *runConfig : std::as_const(runConfigurations)) { qCDebug(LOG) << "RunConfiguration" << runConfig->id(); if (!isLocal(target)) { // TODO add device support qCDebug(LOG) << " Skipped as not being local"; diff --git a/src/plugins/autotest/testframeworkmanager.cpp b/src/plugins/autotest/testframeworkmanager.cpp index f59c46d1333..d712c3d13de 100644 --- a/src/plugins/autotest/testframeworkmanager.cpp +++ b/src/plugins/autotest/testframeworkmanager.cpp @@ -51,11 +51,11 @@ bool TestFrameworkManager::registerTestTool(ITestTool *testTool) void TestFrameworkManager::activateFrameworksAndToolsFromSettings( const Internal::TestSettings *settings) { - for (ITestFramework *framework : qAsConst(s_instance->m_registeredFrameworks)) { + for (ITestFramework *framework : std::as_const(s_instance->m_registeredFrameworks)) { framework->setActive(settings->frameworks.value(framework->id(), false)); framework->setGrouping(settings->frameworksGrouping.value(framework->id(), false)); } - for (ITestTool *testTool : qAsConst(s_instance->m_registeredTestTools)) + for (ITestTool *testTool : std::as_const(s_instance->m_registeredTestTools)) testTool->setActive(settings->tools.value(testTool->id(), false)); } @@ -99,11 +99,11 @@ ITestTool *TestFrameworkManager::testToolForBuildSystemId(Id buildSystemId) void TestFrameworkManager::synchronizeSettings(QSettings *s) { Internal::AutotestPlugin::settings()->fromSettings(s); - for (ITestFramework *framework : qAsConst(m_registeredFrameworks)) { + for (ITestFramework *framework : std::as_const(m_registeredFrameworks)) { if (ITestSettings *fSettings = framework->testSettings()) fSettings->readSettings(s); } - for (ITestTool *testTool : qAsConst(m_registeredTestTools)) { + for (ITestTool *testTool : std::as_const(m_registeredTestTools)) { if (ITestSettings *tSettings = testTool->testSettings()) tSettings->readSettings(s); } diff --git a/src/plugins/autotest/testresultmodel.cpp b/src/plugins/autotest/testresultmodel.cpp index b76a5b3f036..d410ec8dd32 100644 --- a/src/plugins/autotest/testresultmodel.cpp +++ b/src/plugins/autotest/testresultmodel.cpp @@ -338,7 +338,7 @@ void TestResultModel::recalculateMaxWidthOfFileName(const QFont &font) { const QFontMetrics fm(font); m_maxWidthOfFileName = 0; - for (const QString &fileName : qAsConst(m_fileNames)) { + for (const QString &fileName : std::as_const(m_fileNames)) { m_maxWidthOfFileName = qMax(m_maxWidthOfFileName, fm.horizontalAdvance(fileName)); } } diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index d377e87c3d0..0eeba0f6d7d 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -462,7 +462,7 @@ int TestRunner::precheckTestConfigurations() { const bool omitWarnings = AutotestPlugin::settings()->omitRunConfigWarn; int testCaseCount = 0; - for (ITestConfiguration *itc : qAsConst(m_selectedTests)) { + for (ITestConfiguration *itc : std::as_const(m_selectedTests)) { if (itc->testBase()->type() == ITestBase::Tool) { if (itc->project()) { testCaseCount += itc->testCaseCount(); @@ -509,7 +509,7 @@ void TestRunner::runTests() { QList<ITestConfiguration *> toBeRemoved; bool projectChanged = false; - for (ITestConfiguration *itc : qAsConst(m_selectedTests)) { + for (ITestConfiguration *itc : std::as_const(m_selectedTests)) { if (itc->testBase()->type() == ITestBase::Tool) { if (itc->project() != SessionManager::startupProject()) { projectChanged = true; diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp index d50d8018588..cdb090461c5 100644 --- a/src/plugins/autotest/testtreemodel.cpp +++ b/src/plugins/autotest/testtreemodel.cpp @@ -374,7 +374,7 @@ void TestTreeModel::synchronizeTestTools() for (ITestTreeItem *oldFrameworkRoot : oldFrameworkRoots) takeItem(oldFrameworkRoot); // do NOT delete the ptr is still held by TestFrameworkManager - for (ITestTool *testTool : qAsConst(tools)) { + for (ITestTool *testTool : std::as_const(tools)) { ITestTreeItem *testToolRootNode = testTool->rootNode(); invisibleRoot->appendChild(testToolRootNode); if (!oldFrameworkRoots.removeOne(testToolRootNode)) diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp index 4d38b63fe47..015d0e739bb 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp @@ -93,7 +93,7 @@ void AutotoolsBuildSystem::makefileParsingFinished() } auto newRoot = std::make_unique<ProjectNode>(project()->projectDirectory()); - for (const QString &f : qAsConst(m_files)) { + for (const QString &f : std::as_const(m_files)) { const Utils::FilePath path = Utils::FilePath::fromString(f); newRoot->addNestedNode(std::make_unique<FileNode>(path, FileNode::fileTypeForFileName(path))); diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.cpp b/src/plugins/autotoolsprojectmanager/makefileparser.cpp index 91169bb8f2e..dfc5b244aa3 100644 --- a/src/plugins/autotoolsprojectmanager/makefileparser.cpp +++ b/src/plugins/autotoolsprojectmanager/makefileparser.cpp @@ -239,7 +239,7 @@ void MakefileParser::parseSubDirs() // Delegate the parsing of all sub directories to a local // makefile parser and merge the results - for (const QString &subDir : qAsConst(subDirs)) { + for (const QString &subDir : std::as_const(subDirs)) { const QChar slash = QLatin1Char('/'); const QString subDirMakefile = path + slash + subDir + slash + makefileName; diff --git a/src/plugins/baremetal/debugserverprovidermanager.cpp b/src/plugins/baremetal/debugserverprovidermanager.cpp index 2508486320c..2ed256e47ae 100644 --- a/src/plugins/baremetal/debugserverprovidermanager.cpp +++ b/src/plugins/baremetal/debugserverprovidermanager.cpp @@ -103,7 +103,7 @@ void DebugServerProviderManager::restoreProviders() map[key.mid(lastDot + 1)] = map[key]; } bool restored = false; - for (IDebugServerProviderFactory *f : qAsConst(m_factories)) { + for (IDebugServerProviderFactory *f : std::as_const(m_factories)) { if (f->canRestore(map)) { if (IDebugServerProvider *p = f->restore(map)) { registerProvider(p); @@ -127,7 +127,7 @@ void DebugServerProviderManager::saveProviders() data.insert(fileVersionKeyC, 1); int count = 0; - for (const IDebugServerProvider *p : qAsConst(m_providers)) { + for (const IDebugServerProvider *p : std::as_const(m_providers)) { if (p->isValid()) { const QVariantMap tmp = p->toMap(); if (tmp.isEmpty()) @@ -179,7 +179,7 @@ bool DebugServerProviderManager::registerProvider(IDebugServerProvider *provider { if (!provider || m_instance->m_providers.contains(provider)) return true; - for (const IDebugServerProvider *current : qAsConst(m_instance->m_providers)) { + for (const IDebugServerProvider *current : std::as_const(m_instance->m_providers)) { if (*provider == *current) return false; QTC_ASSERT(current->id() != provider->id(), return false); diff --git a/src/plugins/baremetal/debugserverproviderssettingspage.cpp b/src/plugins/baremetal/debugserverproviderssettingspage.cpp index ba34d4e5912..47ce9549edf 100644 --- a/src/plugins/baremetal/debugserverproviderssettingspage.cpp +++ b/src/plugins/baremetal/debugserverproviderssettingspage.cpp @@ -146,7 +146,7 @@ DebugServerProviderNode *DebugServerProviderModel::nodeForIndex(const QModelInde void DebugServerProviderModel::apply() { // Remove unused providers - for (IDebugServerProvider *provider : qAsConst(m_providersToRemove)) + for (IDebugServerProvider *provider : std::as_const(m_providersToRemove)) DebugServerProviderManager::deregisterProvider(provider); QTC_ASSERT(m_providersToRemove.isEmpty(), m_providersToRemove.clear()); @@ -166,7 +166,7 @@ void DebugServerProviderModel::apply() // Add new (and already updated) providers QStringList skippedProviders; - for (IDebugServerProvider *provider: qAsConst(m_providersToAdd)) { + for (IDebugServerProvider *provider: std::as_const(m_providersToAdd)) { if (!DebugServerProviderManager::registerProvider(provider)) skippedProviders << provider->displayName(); } diff --git a/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp b/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp index d393641251a..8f09294ec3c 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp @@ -73,7 +73,7 @@ static void extractAllFiles(const DebuggerRunTool *runTool, QStringList &include return; const QVector<ProjectPart::ConstPtr> parts = info->projectParts(); for (const ProjectPart::ConstPtr &part : parts) { - for (const ProjectFile &file : qAsConst(part->files)) { + for (const ProjectFile &file : std::as_const(part->files)) { if (!file.active) continue; const auto path = FilePath::fromString(file.path); @@ -84,7 +84,7 @@ static void extractAllFiles(const DebuggerRunTool *runTool, QStringList &include else if (file.path.endsWith(".s") && !assemblers.contains(path)) assemblers.push_back(path); } - for (const HeaderPath &include : qAsConst(part->headerPaths)) { + for (const HeaderPath &include : std::as_const(part->headerPaths)) { if (!includes.contains(include.path)) includes.push_back(include.path); } diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp index 80571724e11..32b1d3fad66 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp @@ -215,7 +215,7 @@ void DeviceSelectionModel::fillAllPacks(const FilePath &toolsIniFile) if (allPackFiles.isEmpty()) return; - for (const QString &packFile : qAsConst(allPackFiles)) + for (const QString &packFile : std::as_const(allPackFiles)) parsePackage(packFile); } diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp index ea38204a87e..66cc3aaafcb 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp @@ -78,7 +78,7 @@ QVariantMap DeviceSelection::toMap() const map.insert(deviceMpuKeyC, cpu.mpu); // Device MEMORY. QVariantList memoryList; - for (const DeviceSelection::Memory &memory : qAsConst(memories)) { + for (const DeviceSelection::Memory &memory : std::as_const(memories)) { QVariantMap m; m.insert(deviceMemoryIdKeyC, memory.id); m.insert(deviceMemoryStartKeyC, memory.start); @@ -88,7 +88,7 @@ QVariantMap DeviceSelection::toMap() const map.insert(deviceMemoryKeyC, memoryList); // Device ALGORITHM. QVariantList algorithmList; - for (const DeviceSelection::Algorithm &algorithm : qAsConst(algorithms)) { + for (const DeviceSelection::Algorithm &algorithm : std::as_const(algorithms)) { QVariantMap m; m.insert(deviceAlgorithmPathKeyC, algorithm.path); m.insert(deviceAlgorithmFlashStartKeyC, algorithm.flashStart); diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdrivermodel.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdrivermodel.cpp index a2abc5f3a79..50cbf216d6f 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdrivermodel.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdrivermodel.cpp @@ -123,13 +123,13 @@ void DriverSelectionModel::fillDrivers(const FilePath &toolsIniFile, if (!collectCpuDllsAndDrivers(&f, allCpuDlls, allDrivers)) return; - for (const Dll &dll : qAsConst(allDrivers)) { + for (const Dll &dll : std::as_const(allDrivers)) { if (!supportedDrivers.contains(dll.path)) continue; const auto item = new DriverSelectionItem(dll.index); item->m_dll = dll.path; item->m_name = dll.content; - for (const Dll &cpu : qAsConst(allCpuDlls)) { + for (const Dll &cpu : std::as_const(allCpuDlls)) { const QStringList mnemonics = cpu.content.split(','); if (mnemonics.contains(dll.mnemonic)) item->m_cpuDlls.push_back(cpu.path); diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp index d987a80c5ed..7337fafd5c8 100644 --- a/src/plugins/baremetal/iarewtoolchain.cpp +++ b/src/plugins/baremetal/iarewtoolchain.cpp @@ -490,7 +490,7 @@ Toolchains IarToolChainFactory::autoDetectToolchains( { Toolchains result; - for (const Candidate &candidate : qAsConst(candidates)) { + for (const Candidate &candidate : std::as_const(candidates)) { const Toolchains filtered = Utils::filtered(alreadyKnown, [candidate](ToolChain *tc) { return tc->typeId() == Constants::IAREW_TOOLCHAIN_TYPEID && tc->compilerCommand() == candidate.compilerPath diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index b08ae4d2ee8..387049f29a4 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -635,7 +635,7 @@ Toolchains KeilToolChainFactory::autoDetectToolchains( { Toolchains result; - for (const Candidate &candidate : qAsConst(candidates)) { + for (const Candidate &candidate : std::as_const(candidates)) { const Toolchains filtered = Utils::filtered( alreadyKnown, [candidate](ToolChain *tc) { return tc->typeId() == Constants::IAREW_TOOLCHAIN_TYPEID diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp index 38f56bb31b8..0fc7eb0f925 100644 --- a/src/plugins/baremetal/sdcctoolchain.cpp +++ b/src/plugins/baremetal/sdcctoolchain.cpp @@ -346,7 +346,7 @@ Toolchains SdccToolChainFactory::autoDetectToolchains( { Toolchains result; - for (const Candidate &candidate : qAsConst(candidates)) { + for (const Candidate &candidate : std::as_const(candidates)) { const Toolchains filtered = Utils::filtered(alreadyKnown, [candidate](ToolChain *tc) { return tc->typeId() == Constants::SDCC_TOOLCHAIN_TYPEID && tc->compilerCommand() == candidate.compilerPath diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index b0bdef80d50..cbef03141ad 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -865,7 +865,7 @@ void BazaarPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as) m_revertFile->setParameter(filename); m_statusFile->setParameter(filename); - for (QAction *repoAction : qAsConst(m_repositoryActionList)) + for (QAction *repoAction : std::as_const(m_repositoryActionList)) repoAction->setEnabled(repoEnabled); } diff --git a/src/plugins/beautifier/abstractsettings.cpp b/src/plugins/beautifier/abstractsettings.cpp index 42371aec0bc..4875e13ec50 100644 --- a/src/plugins/beautifier/abstractsettings.cpp +++ b/src/plugins/beautifier/abstractsettings.cpp @@ -379,7 +379,7 @@ void AbstractSettings::readDocumentation() if (xml.readNext() == QXmlStreamReader::Characters) { m_docu << xml.text().toString(); const int index = m_docu.size() - 1; - for (const QString &key : qAsConst(keys)) + for (const QString &key : std::as_const(keys)) m_options.insert(key, index); } } diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp index 7522f1f647c..cbe47956d2b 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp @@ -158,7 +158,7 @@ void ArtisticStyleSettings::createDocumentationFile() const // Write entry stream.writeStartElement(Constants::DOCUMENTATION_XMLENTRY); stream.writeStartElement(Constants::DOCUMENTATION_XMLKEYS); - for (const QString &key : qAsConst(keys)) + for (const QString &key : std::as_const(keys)) stream.writeTextElement(Constants::DOCUMENTATION_XMLKEY, key); stream.writeEndElement(); const QString text = "<p><span class=\"option\">" diff --git a/src/plugins/bineditor/bineditorwidget.cpp b/src/plugins/bineditor/bineditorwidget.cpp index 5a3e47229ce..ad0f631d092 100644 --- a/src/plugins/bineditor/bineditorwidget.cpp +++ b/src/plugins/bineditor/bineditorwidget.cpp @@ -890,7 +890,7 @@ void BinEditorWidget::paintEvent(QPaintEvent *e) int item_x = -xoffset + m_margin + c * m_columnWidth + m_labelWidth; QColor color; - for (const Markup &m : qAsConst(m_markup)) { + for (const Markup &m : std::as_const(m_markup)) { if (m.covers(lineAddress + c)) { color = m.color; break; @@ -1221,7 +1221,7 @@ QString BinEditorWidget::toolTip(const QHelpEvent *helpEvent) const str << "<html><head/><body><p align=\"center\"><b>" << Tr::tr("Memory at 0x%1").arg(address, 0, 16) << "</b></p>"; - for (const Markup &m : qAsConst(m_markup)) { + for (const Markup &m : std::as_const(m_markup)) { if (m.covers(address) && !m.toolTip.isEmpty()) { str << "<p>" << m.toolTip << "</p><br>"; break; diff --git a/src/plugins/clangcodemodel/clangdast.cpp b/src/plugins/clangcodemodel/clangdast.cpp index 4e1ce3f7802..9aebc8759b4 100644 --- a/src/plugins/clangcodemodel/clangdast.cpp +++ b/src/plugins/clangcodemodel/clangdast.cpp @@ -319,7 +319,7 @@ private: } const bool wasDone = m_done; - for (const ClangdAstNode &child : qAsConst(childrenToCheck)) { + for (const ClangdAstNode &child : std::as_const(childrenToCheck)) { visitNode(child); if (m_done && !wasDone) break; diff --git a/src/plugins/clangcodemodel/clangdcompletion.cpp b/src/plugins/clangcodemodel/clangdcompletion.cpp index 442a3fb2401..0263380ab87 100644 --- a/src/plugins/clangcodemodel/clangdcompletion.cpp +++ b/src/plugins/clangcodemodel/clangdcompletion.cpp @@ -478,7 +478,7 @@ QList<AssistProposalItemInterface *> CustomAssistProcessor::completeInclude( const QStringList suffixes = mimeType.suffixes(); QList<AssistProposalItemInterface *> completions; - for (const HeaderPath &headerPath : qAsConst(allHeaderPaths)) { + for (const HeaderPath &headerPath : std::as_const(allHeaderPaths)) { QString realPath = headerPath.path; if (!directoryPrefix.isEmpty()) { realPath += QLatin1Char('/'); @@ -490,7 +490,7 @@ QList<AssistProposalItemInterface *> CustomAssistProcessor::completeInclude( } QList<QPair<AssistProposalItemInterface *, QString>> completionsForSorting; - for (AssistProposalItemInterface * const item : qAsConst(completions)) { + for (AssistProposalItemInterface * const item : std::as_const(completions)) { QString s = item->text(); s.replace('/', QChar(0)); // The dir separator should compare less than anything else. completionsForSorting.push_back({item, s}); diff --git a/src/plugins/clangcodemodel/clangdfindreferences.cpp b/src/plugins/clangcodemodel/clangdfindreferences.cpp index fde197f277e..ce0abac572e 100644 --- a/src/plugins/clangcodemodel/clangdfindreferences.cpp +++ b/src/plugins/clangcodemodel/clangdfindreferences.cpp @@ -129,7 +129,7 @@ void ClangdFindReferences::Private::handleFindUsagesResult(const QList<Location> QObject::connect(search, &SearchResult::canceled, q, [this] { canceled = true; search->disconnect(q); - for (const MessageId &id : qAsConst(pendingAstRequests)) + for (const MessageId &id : std::as_const(pendingAstRequests)) client()->cancelRequest(id); pendingAstRequests.clear(); finishSearch(); diff --git a/src/plugins/clangcodemodel/clangdfollowsymbol.cpp b/src/plugins/clangcodemodel/clangdfollowsymbol.cpp index 2e138bc96d5..8c249d30727 100644 --- a/src/plugins/clangcodemodel/clangdfollowsymbol.cpp +++ b/src/plugins/clangcodemodel/clangdfollowsymbol.cpp @@ -173,11 +173,11 @@ ClangdFollowSymbol::~ClangdFollowSymbol() d->closeTempDocuments(); if (d->virtualFuncAssistProcessor) d->virtualFuncAssistProcessor->resetData(false); - for (const MessageId &id : qAsConst(d->pendingSymbolInfoRequests)) + for (const MessageId &id : std::as_const(d->pendingSymbolInfoRequests)) d->client->cancelRequest(id); - for (const MessageId &id : qAsConst(d->pendingGotoImplRequests)) + for (const MessageId &id : std::as_const(d->pendingGotoImplRequests)) d->client->cancelRequest(id); - for (const MessageId &id : qAsConst(d->pendingGotoDefRequests)) + for (const MessageId &id : std::as_const(d->pendingGotoDefRequests)) d->client->cancelRequest(id); delete d; } @@ -307,7 +307,7 @@ ClangdFollowSymbol::VirtualFunctionAssistProcessor::createProposal(bool final) c QList<AssistProposalItemInterface *> items; bool needsBaseDeclEntry = !m_followSymbol->d->defLinkNode.range() .contains(Position(m_followSymbol->d->cursor)); - for (const SymbolData &symbol : qAsConst(m_followSymbol->d->symbolsToDisplay)) { + for (const SymbolData &symbol : std::as_const(m_followSymbol->d->symbolsToDisplay)) { Link link = symbol.second; if (m_followSymbol->d->defLink == link) { if (!needsBaseDeclEntry) @@ -411,7 +411,7 @@ void ClangdFollowSymbol::Private::handleGotoImplementationResult( newLinks = {ploc->toLink()}; if (const auto plloc = std::get_if<QList<Location>>(&*result)) newLinks = transform(*plloc, &Location::toLink); - for (const Link &link : qAsConst(newLinks)) { + for (const Link &link : std::as_const(newLinks)) { if (!allLinks.contains(link)) { allLinks << link; @@ -444,7 +444,7 @@ void ClangdFollowSymbol::Private::handleGotoImplementationResult( // pure virtual and mark it accordingly. // In addition, we need to follow all override links, because for these, clangd // gives us the declaration instead of the definition. - for (const Link &link : qAsConst(allLinks)) { + for (const Link &link : std::as_const(allLinks)) { if (!client->documentForFilePath(link.targetFilePath) && addOpenFile(link.targetFilePath)) client->openExtraFile(link.targetFilePath); const auto symbolInfoHandler = [sentinel = QPointer(q), this, link]( @@ -525,7 +525,7 @@ void ClangdFollowSymbol::Private::handleGotoImplementationResult( void ClangdFollowSymbol::Private::closeTempDocuments() { - for (const FilePath &fp : qAsConst(openedFiles)) { + for (const FilePath &fp : std::as_const(openedFiles)) { if (!client->documentForFilePath(fp)) client->closeExtraFile(fp); } diff --git a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp index e10a62b66f8..9644f6b25c2 100644 --- a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp +++ b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp @@ -154,7 +154,7 @@ QList<Core::LocatorFilterEntry> ClangGlobalSymbolFilter::matchesFor( const QList<Core::LocatorFilterEntry> lspMatches = m_lspFilter->matchesFor(future, entry); if (!lspMatches.isEmpty()) { std::set<std::tuple<Utils::FilePath, int, int>> locations; - for (const auto &entry : qAsConst(matches)) { + for (const auto &entry : std::as_const(matches)) { const CppEditor::IndexItem::Ptr item = qvariant_cast<CppEditor::IndexItem::Ptr>(entry.internalData); locations.insert(std::make_tuple(Utils::FilePath::fromString(item->fileName()), diff --git a/src/plugins/clangcodemodel/clangdsemantichighlighting.cpp b/src/plugins/clangcodemodel/clangdsemantichighlighting.cpp index 3d989901349..dcf6a898993 100644 --- a/src/plugins/clangcodemodel/clangdsemantichighlighting.cpp +++ b/src/plugins/clangcodemodel/clangdsemantichighlighting.cpp @@ -102,7 +102,7 @@ static QList<BlockRange> cleanupDisabledCode(HighlightingResults &results, const qCDebug(clangdLogHighlight) << "found" << ifdefedOutRanges.size() << "ifdefed-out ranges"; if (clangdLogHighlight().isDebugEnabled()) { - for (const BlockRange &r : qAsConst(ifdefedOutRanges)) + for (const BlockRange &r : std::as_const(ifdefedOutRanges)) qCDebug(clangdLogHighlight) << r.first() << r.last(); } diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp index 9a37e805304..47718511881 100644 --- a/src/plugins/clangcodemodel/clangutils.cpp +++ b/src/plugins/clangcodemodel/clangutils.cpp @@ -166,7 +166,7 @@ GenerateCompilationDbResult generateCompilationDB(QList<ProjectInfo::ConstPtr> p const UsePrecompiledHeaders usePch = getPchUsage(); const QJsonArray jsonProjectOptions = QJsonArray::fromStringList(projectOptions); - for (const ProjectInfo::ConstPtr &projectInfo : qAsConst(projectInfoList)) { + for (const ProjectInfo::ConstPtr &projectInfo : std::as_const(projectInfoList)) { for (ProjectPart::ConstPtr projectPart : projectInfo->projectParts()) { QTC_ASSERT(projectInfo, continue); QStringList args; diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp index 15e2dfb0be9..f00e675651b 100644 --- a/src/plugins/clangcodemodel/test/clangdtests.cpp +++ b/src/plugins/clangcodemodel/test/clangdtests.cpp @@ -144,7 +144,7 @@ void ClangdTest::initTestCase() QVERIFY(m_client); // Open cpp documents. - for (const QString &sourceFileName : qAsConst(m_sourceFileNames)) { + for (const QString &sourceFileName : std::as_const(m_sourceFileNames)) { const auto sourceFilePath = Utils::FilePath::fromString( m_projectDir->absolutePath(sourceFileName.toLocal8Bit())); QVERIFY2(sourceFilePath.exists(), qPrintable(sourceFilePath.toUserOutput())); @@ -1854,7 +1854,7 @@ void ClangdTestCompletion::testSignalCompletion() QVERIFY(proposal); QCOMPARE(proposal->size(), expectedSuggestions.size()); - for (const QString &expectedSuggestion : qAsConst(expectedSuggestions)) + for (const QString &expectedSuggestion : std::as_const(expectedSuggestions)) QVERIFY2(hasItem(proposal, ' ' + expectedSuggestion), qPrintable(expectedSuggestion)); } diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp index 73fbef3b465..4a4a12fada7 100644 --- a/src/plugins/clangtools/clangtool.cpp +++ b/src/plugins/clangtools/clangtool.cpp @@ -250,7 +250,7 @@ public: QVector<DiagnosticItem *> itemsSchedulable; // Construct refactoring operations - for (DiagnosticItem *diagnosticItem : qAsConst(fileInfo.diagnosticItems)) { + for (DiagnosticItem *diagnosticItem : std::as_const(fileInfo.diagnosticItems)) { const FixitStatus fixItStatus = diagnosticItem->fixItStatus(); const bool isScheduled = fixItStatus == FixitStatus::Scheduled; @@ -269,7 +269,7 @@ public: // Collect replacements ReplacementOperations ops; - for (DiagnosticItem *item : qAsConst(itemsScheduledOrSchedulable)) + for (DiagnosticItem *item : std::as_const(itemsScheduledOrSchedulable)) ops += item->fixitOperations(); if (ops.empty()) @@ -291,11 +291,11 @@ public: model->addWatchedPath(ops.first()->fileName); // Update DiagnosticItem state - for (DiagnosticItem *diagnosticItem : qAsConst(itemsScheduled)) + for (DiagnosticItem *diagnosticItem : std::as_const(itemsScheduled)) diagnosticItem->setFixItStatus(FixitStatus::Applied); - for (DiagnosticItem *diagnosticItem : qAsConst(itemsFailedToApply)) + for (DiagnosticItem *diagnosticItem : std::as_const(itemsFailedToApply)) diagnosticItem->setFixItStatus(FixitStatus::FailedToApply); - for (DiagnosticItem *diagnosticItem : qAsConst(itemsInvalidated)) + for (DiagnosticItem *diagnosticItem : std::as_const(itemsInvalidated)) diagnosticItem->setFixItStatus(FixitStatus::Invalidated); } } @@ -313,7 +313,7 @@ static FileInfos sortedFileInfos(const QVector<CppEditor::ProjectPart::ConstPtr> if (!projectPart->selectedForBuilding) continue; - for (const CppEditor::ProjectFile &file : qAsConst(projectPart->files)) { + for (const CppEditor::ProjectFile &file : std::as_const(projectPart->files)) { QTC_ASSERT(file.kind != CppEditor::ProjectFile::Unclassified, continue); QTC_ASSERT(file.kind != CppEditor::ProjectFile::Unsupported, continue); if (file.path == CppEditor::CppModelManager::configurationFileName()) diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index 0e5519df04e..b9917fc1dfb 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -281,7 +281,7 @@ void ClangToolRunWorker::start() void ClangToolRunWorker::stop() { - for (ClangToolRunner *runner : qAsConst(m_runners)) { + for (ClangToolRunner *runner : std::as_const(m_runners)) { QObject::disconnect(runner, nullptr, this, nullptr); delete runner; } diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp index a395de05bc2..8e3b25429dd 100644 --- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp +++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp @@ -139,7 +139,7 @@ void ClangToolsDiagnosticModel::clear() void ClangToolsDiagnosticModel::updateItems(const DiagnosticItem *changedItem) { - for (auto item : qAsConst(stepsToItemsCache[changedItem->diagnostic().explainingSteps])) { + for (auto item : std::as_const(stepsToItemsCache[changedItem->diagnostic().explainingSteps])) { if (item != changedItem) item->setFixItStatus(changedItem->fixItStatus()); } @@ -202,7 +202,7 @@ static QString createExplainingStepToolTipString(const ExplainingStep &step) "<style>dt { font-weight:bold; } dd { font-family: monospace; }</style>\n" "<body><dl>"); - for (const StringPair &pair : qAsConst(lines)) { + for (const StringPair &pair : std::as_const(lines)) { html += QLatin1String("<dt>"); html += pair.first; html += QLatin1String("</dt><dd>"); @@ -250,7 +250,7 @@ static QString fullText(const Diagnostic &diagnostic) // Explaining steps. int explainingStepNumber = 1; - for (const ExplainingStep &explainingStep : qAsConst(diagnostic.explainingSteps)) { + for (const ExplainingStep &explainingStep : std::as_const(diagnostic.explainingSteps)) { text += createExplainingStepString(explainingStep, explainingStepNumber++) + QLatin1Char('\n'); } @@ -622,7 +622,7 @@ bool DiagnosticFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &s } // Explicitly suppressed? - for (const SuppressedDiagnostic &d : qAsConst(m_suppressedDiagnostics)) { + for (const SuppressedDiagnostic &d : std::as_const(m_suppressedDiagnostics)) { if (d.description != diag.description) continue; Utils::FilePath filePath = d.filePath; diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp index 67a961d9bba..c2edeefa1a7 100644 --- a/src/plugins/clangtools/clangtoolsplugin.cpp +++ b/src/plugins/clangtools/clangtoolsplugin.cpp @@ -68,7 +68,7 @@ public: DocumentClangToolRunner *runnerForFilePath(const Utils::FilePath &filePath) { - for (DocumentClangToolRunner *runner : qAsConst(documentRunners)) { + for (DocumentClangToolRunner *runner : std::as_const(documentRunners)) { if (runner->filePath() == filePath) return runner; } diff --git a/src/plugins/clangtools/clangtoolsprojectsettings.cpp b/src/plugins/clangtools/clangtoolsprojectsettings.cpp index bf210b1f2eb..80f3bd5f2d2 100644 --- a/src/plugins/clangtools/clangtoolsprojectsettings.cpp +++ b/src/plugins/clangtools/clangtoolsprojectsettings.cpp @@ -182,7 +182,7 @@ void ClangToolsProjectSettings::store() map.insert(SETTINGS_KEY_SELECTED_FILES, files); QVariantList list; - for (const SuppressedDiagnostic &diag : qAsConst(m_suppressedDiagnostics)) { + for (const SuppressedDiagnostic &diag : std::as_const(m_suppressedDiagnostics)) { QVariantMap diagMap; diagMap.insert(SETTINGS_KEY_SUPPRESSED_DIAGS_FILEPATH, diag.filePath.toString()); diagMap.insert(SETTINGS_KEY_SUPPRESSED_DIAGS_MESSAGE, diag.description); diff --git a/src/plugins/clangtools/clangtoolsutils.cpp b/src/plugins/clangtools/clangtoolsutils.cpp index 9eeaed31d4b..76c72c60ed1 100644 --- a/src/plugins/clangtools/clangtoolsutils.cpp +++ b/src/plugins/clangtools/clangtoolsutils.cpp @@ -109,7 +109,7 @@ QString createDiagnosticToolTipString( "</head>\n" "<body><dl>"); - for (const StringPair &pair : qAsConst(lines)) { + for (const StringPair &pair : std::as_const(lines)) { html += QLatin1String("<dt>"); html += pair.first; html += QLatin1String("</dt><dd>"); diff --git a/src/plugins/clangtools/documentclangtoolrunner.cpp b/src/plugins/clangtools/documentclangtoolrunner.cpp index 69a9ae615c4..010c751e9fd 100644 --- a/src/plugins/clangtools/documentclangtoolrunner.cpp +++ b/src/plugins/clangtools/documentclangtoolrunner.cpp @@ -102,9 +102,9 @@ static void removeClangToolRefactorMarkers(TextEditor::TextEditorWidget *editor) void DocumentClangToolRunner::scheduleRun() { - for (DiagnosticMark *mark : qAsConst(m_marks)) + for (DiagnosticMark *mark : std::as_const(m_marks)) mark->disable(); - for (TextEditor::TextEditorWidget *editor : qAsConst(m_editorsWithMarkers)) + for (TextEditor::TextEditorWidget *editor : std::as_const(m_editorsWithMarkers)) removeClangToolRefactorMarkers(editor); m_runTimer.start(); } @@ -131,7 +131,7 @@ static FileInfo getFileInfo(const FilePath &file, Project *project) for (const ProjectPart::ConstPtr &projectPart : projectInfo->projectParts()) { QTC_ASSERT(projectPart, continue); - for (const ProjectFile &projectFile : qAsConst(projectPart->files)) { + for (const ProjectFile &projectFile : std::as_const(projectPart->files)) { QTC_ASSERT(projectFile.kind != ProjectFile::Unclassified, continue); QTC_ASSERT(projectFile.kind != ProjectFile::Unsupported, continue); if (projectFile.path == CppModelManager::configurationFileName()) diff --git a/src/plugins/clangtools/documentquickfixfactory.cpp b/src/plugins/clangtools/documentquickfixfactory.cpp index b816b9c0371..1689dd84615 100644 --- a/src/plugins/clangtools/documentquickfixfactory.cpp +++ b/src/plugins/clangtools/documentquickfixfactory.cpp @@ -56,7 +56,7 @@ void ClangToolQuickFixOperation::perform() refactoringFile->setChangeSet(changeSet); } - for (const TextEditor::RefactoringFilePtr &refactoringFile : qAsConst(refactoringFiles)) + for (const TextEditor::RefactoringFilePtr &refactoringFile : std::as_const(refactoringFiles)) refactoringFile->apply(); } diff --git a/src/plugins/clangtools/filterdialog.cpp b/src/plugins/clangtools/filterdialog.cpp index 34c40bd618b..c302c86c8ba 100644 --- a/src/plugins/clangtools/filterdialog.cpp +++ b/src/plugins/clangtools/filterdialog.cpp @@ -57,7 +57,7 @@ public: setHeader({tr("Check"), "#"}); setRootItem(new Utils::StaticTreeItem(QString())); - for (const Check &check : qAsConst(sortedChecks)) + for (const Check &check : std::as_const(sortedChecks)) m_root->appendChild(new CheckItem(check)); } }; diff --git a/src/plugins/clangtools/virtualfilesystemoverlay.cpp b/src/plugins/clangtools/virtualfilesystemoverlay.cpp index 923f7d903ba..16b3864533b 100644 --- a/src/plugins/clangtools/virtualfilesystemoverlay.cpp +++ b/src/plugins/clangtools/virtualfilesystemoverlay.cpp @@ -53,7 +53,7 @@ void VirtualFileSystemOverlay::update() newSaved[doc] = saved; } - for (const AutoSavedPath &path : qAsConst(m_saved)) { + for (const AutoSavedPath &path : std::as_const(m_saved)) { QString error; if (!path.path.removeRecursively(&error)) qCDebug(LOG) << error; @@ -79,7 +79,7 @@ void VirtualFileSystemOverlay::update() jsonRoot["type"] = "directory"; jsonRoot["name"] = root.toUserOutput(); QJsonArray contents; - for (auto doc : qAsConst(documents)) + for (auto doc : std::as_const(documents)) contents << toContent(doc); jsonRoot["contents"] = contents; jsonRoots << jsonRoot; diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 117c5de6cbf..459ac361fbd 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -523,7 +523,7 @@ QString ClearCasePluginPrivate::ccManagesDirectory(const FilePath &directory) co if (vobs.empty()) vobs = getVobList(); - for (const QString &relativeVobDir : qAsConst(vobs)) { + for (const QString &relativeVobDir : std::as_const(vobs)) { const QString vobPath = QDir::cleanPath(rootDir + QDir::fromNativeSeparators(relativeVobDir)); const bool isManaged = (vobPath == directory.toString()) || directory.isChildOf(FilePath::fromString(vobPath)); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 875971a1cfa..8fbea8df256 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -628,7 +628,7 @@ void CMakeBuildStep::recreateBuildTargetsModel() m_buildTargets.push_back(m_allTarget); } - for (const QString &buildTarget : qAsConst(targetList)) + for (const QString &buildTarget : std::as_const(targetList)) addItem(buildTarget, specialTargets(usesAllCapsTargets).contains(buildTarget)); updateBuildTargetsModel(); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 5157f87b6ea..4b089dff6fc 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -543,7 +543,7 @@ void CMakeBuildSystem::updateProjectData() { QSet<QString> res; QStringList apps; - for (const auto &target : qAsConst(m_buildTargets)) { + for (const auto &target : std::as_const(m_buildTargets)) { if (target.targetType == DynamicLibraryType) { res.insert(target.executable.parentDir().toString()); apps.push_back(target.executable.toUserOutput()); @@ -630,7 +630,7 @@ void CMakeBuildSystem::updateProjectData() QtSupport::KitHasMergedHeaderPathsWithQmlImportPaths::id(), false).toBool(); QStringList extraHeaderPaths; QList<QByteArray> moduleMappings; - for (const RawProjectPart &rpp : qAsConst(rpps)) { + for (const RawProjectPart &rpp : std::as_const(rpps)) { FilePath moduleMapFile = buildConfiguration()->buildDirectory() .pathAppended("qml_module_mappings/" + rpp.buildSystemTarget); if (moduleMapFile.exists()) { diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 9ddeb279914..42eccdf7e06 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -448,7 +448,7 @@ private: extraGeneratorCombo->clear(); extraGeneratorCombo->addItem(Tr::tr("<none>"), QString()); - for (const QString &eg : qAsConst(it->extraGenerators)) + for (const QString &eg : std::as_const(it->extraGenerators)) extraGeneratorCombo->addItem(eg, eg); extraGeneratorCombo->setEnabled(extraGeneratorCombo->count() > 1); diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index 3e6b0ece8e4..4be73541a80 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -510,7 +510,7 @@ QList<void *> CMakeProjectImporter::examineDirectory(const FilePath &importPath, buildConfigurationTypes = buildConfigurationTypesString.split(';'); } - for (auto const &buildType: qAsConst(buildConfigurationTypes)) { + for (auto const &buildType: std::as_const(buildConfigurationTypes)) { auto data = std::make_unique<DirectoryData>(); data->cmakeHomeDirectory = @@ -745,7 +745,7 @@ void CMakeProjectPlugin::testCMakeProjectImporterQt() QFETCH(QString, expectedQmake); CMakeConfig config; - for (const QString &c : qAsConst(cache)) { + for (const QString &c : std::as_const(cache)) { const int pos = c.indexOf('='); Q_ASSERT(pos > 0); const QString key = c.left(pos); @@ -802,7 +802,7 @@ void CMakeProjectPlugin::testCMakeProjectImporterToolChain() QCOMPARE(expectedLanguages.count(), expectedToolChains.count()); CMakeConfig config; - for (const QString &c : qAsConst(cache)) { + for (const QString &c : std::as_const(cache)) { const int pos = c.indexOf('='); Q_ASSERT(pos > 0); const QString key = c.left(pos); diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp index 319e35b6858..714c90e2b70 100644 --- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp @@ -321,7 +321,7 @@ void CMakeToolItemModel::removeCMakeTool(const Id &id) void CMakeToolItemModel::apply() { - for (const Id &id : qAsConst(m_removedItems)) + for (const Id &id : std::as_const(m_removedItems)) CMakeToolManager::deregisterCMakeTool(id); QList<CMakeToolTreeItem *> toRegister; @@ -338,7 +338,7 @@ void CMakeToolItemModel::apply() } }); - for (CMakeToolTreeItem *item : qAsConst(toRegister)) { + for (CMakeToolTreeItem *item : std::as_const(toRegister)) { CMakeTool::Detection detection = item->m_autodetected ? CMakeTool::AutoDetection : CMakeTool::ManualDetection; auto cmake = std::make_unique<CMakeTool>(detection, item->m_id); diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp index 2d017528293..301d20dea2e 100644 --- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp @@ -212,7 +212,7 @@ void CMakeToolManager::listDetectedCMake(const QString &detectionSource, QString { QTC_ASSERT(logMessage, return); QStringList logMessages{Tr::tr("CMake:")}; - for (const auto &tool : qAsConst(d->m_cmakeTools)) { + for (const auto &tool : std::as_const(d->m_cmakeTools)) { if (tool->detectionSource() == detectionSource) logMessages.append(tool->displayName()); } diff --git a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp index 176334a57eb..362c62c7b1f 100644 --- a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp @@ -68,7 +68,7 @@ static std::vector<std::unique_ptr<CMakeTool>> autoDetectCMakeTools() const QStringList execs = env.appendExeExtensions(QLatin1String("cmake")); FilePaths suspects; - for (const FilePath &base : qAsConst(path)) { + for (const FilePath &base : std::as_const(path)) { if (base.isEmpty()) continue; @@ -80,7 +80,7 @@ static std::vector<std::unique_ptr<CMakeTool>> autoDetectCMakeTools() } std::vector<std::unique_ptr<CMakeTool>> found; - for (const FilePath &command : qAsConst(suspects)) { + for (const FilePath &command : std::as_const(suspects)) { auto item = std::make_unique<CMakeTool>(CMakeTool::AutoDetection, CMakeTool::createId()); item->setFilePath(command); item->setDisplayName(Tr::tr("System CMake at %1").arg(command.toUserOutput())); diff --git a/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp b/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp index d12b91438e7..812b4ff999d 100644 --- a/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp +++ b/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp @@ -44,7 +44,7 @@ QWidget *ConfigModelItemDelegate::createEditor(QWidget *parent, const QStyleOpti edit->setAttribute(Qt::WA_MacSmallSize); edit->setFocusPolicy(Qt::StrongFocus); edit->setAutoFillBackground(true); - for (const QString &s : qAsConst(data.values)) + for (const QString &s : std::as_const(data.values)) edit->addItem(s); return edit; } else if (data.type == ConfigModel::DataItem::BOOLEAN) { diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp index df4b37814c4..43243be7ada 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp @@ -329,7 +329,7 @@ Command *ActionContainerPrivate::addSeparator(const Context &context, Id group, void ActionContainerPrivate::clear() { for (Group &group : m_groups) { - for (QObject *item : qAsConst(group.items)) { + for (QObject *item : std::as_const(group.items)) { if (auto command = qobject_cast<Command *>(item)) { removeAction(command); disconnect(command, &Command::activeStateChanged, @@ -458,8 +458,8 @@ bool MenuActionContainer::updateInternal() bool hasitems = false; QList<QAction *> actions = m_menu->actions(); - for (const Group &group : qAsConst(m_groups)) { - for (QObject *item : qAsConst(group.items)) { + for (const Group &group : std::as_const(m_groups)) { + for (QObject *item : std::as_const(group.items)) { if (auto container = qobject_cast<ActionContainerPrivate*>(item)) { actions.removeAll(container->menu()->menuAction()); if (container == this) { @@ -491,7 +491,7 @@ bool MenuActionContainer::updateInternal() } if (!hasitems) { // look if there were actions added that we don't control and check if they are enabled - for (const QAction *action : qAsConst(actions)) { + for (const QAction *action : std::as_const(actions)) { if (!action->isSeparator() && action->isEnabled()) { hasitems = true; break; diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index 24ce6591a86..6404d6a4000 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -421,7 +421,7 @@ ActionManagerPrivate::ActionManagerPrivate() = default; ActionManagerPrivate::~ActionManagerPrivate() { // first delete containers to avoid them reacting to command deletion - for (const ActionContainerPrivate *container : qAsConst(m_idContainerMap)) + for (const ActionContainerPrivate *container : std::as_const(m_idContainerMap)) disconnect(container, &QObject::destroyed, this, &ActionManagerPrivate::containerDestroyed); qDeleteAll(m_idContainerMap); qDeleteAll(m_idCmdMap); diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp index ec41d235ec7..c945a694fa5 100644 --- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp +++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp @@ -109,7 +109,7 @@ bool CommandsFile::exportCommands(const QList<ShortcutItem *> &items) arg(ICore::versionString(), QDateTime::currentDateTime().toString(Qt::ISODate))); w.writeStartElement(ctx.mappingElement); - for (const ShortcutItem *item : qAsConst(items)) { + for (const ShortcutItem *item : std::as_const(items)) { const Id id = item->m_cmd->id(); if (item->m_keys.isEmpty() || item->m_keys.first().isEmpty()) { w.writeEmptyElement(ctx.shortCutElement); diff --git a/src/plugins/coreplugin/actionsfilter.cpp b/src/plugins/coreplugin/actionsfilter.cpp index 3c3153cdd42..82099eda581 100644 --- a/src/plugins/coreplugin/actionsfilter.cpp +++ b/src/plugins/coreplugin/actionsfilter.cpp @@ -155,7 +155,7 @@ QList<LocatorFilterEntry> ActionsFilter::matchesFor(QFutureInterface<LocatorFilt }; QMap<MatchLevel, QList<LocatorFilterEntry>> filtered; - const QList<std::optional<FilterResult>> filterResults = Utils::map(qAsConst(m_entries), filter) + const QList<std::optional<FilterResult>> filterResults = Utils::map(std::as_const(m_entries), filter) .results(); for (const std::optional<FilterResult> &filterResult : filterResults) { if (filterResult) @@ -163,7 +163,7 @@ QList<LocatorFilterEntry> ActionsFilter::matchesFor(QFutureInterface<LocatorFilt } QList<LocatorFilterEntry> result; - for (const QList<LocatorFilterEntry> &sublist : qAsConst(filtered)) + for (const QList<LocatorFilterEntry> &sublist : std::as_const(filtered)) result << sublist; return result; } @@ -292,7 +292,7 @@ void ActionsFilter::updateEnabledActionCache() { m_enabledActions.clear(); QList<QAction *> queue = menuBarActions(); - for (QAction *action : qAsConst(queue)) + for (QAction *action : std::as_const(queue)) requestMenuUpdate(action); while (!queue.isEmpty()) { QAction *action = queue.takeFirst(); diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp index 2a9cdef67b8..4fb4f7dee49 100644 --- a/src/plugins/coreplugin/basefilewizard.cpp +++ b/src/plugins/coreplugin/basefilewizard.cpp @@ -31,7 +31,7 @@ BaseFileWizard::BaseFileWizard(const BaseFileWizardFactory *factory, m_extraValues(extraValues), m_factory(factory) { - for (IFileWizardExtension *extension : qAsConst(g_fileWizardExtensions)) + for (IFileWizardExtension *extension : std::as_const(g_fileWizardExtensions)) m_extensionPages += extension->extensionPages(factory); if (!m_extensionPages.empty()) @@ -44,7 +44,7 @@ void BaseFileWizard::initializePage(int id) if (page(id) == m_firstExtensionPage) { generateFileList(); - for (IFileWizardExtension *ex : qAsConst(g_fileWizardExtensions)) + for (IFileWizardExtension *ex : std::as_const(g_fileWizardExtensions)) ex->firstExtensionPageShown(m_files, m_extraValues); } } @@ -74,7 +74,7 @@ void BaseFileWizard::accept() break; } - for (IFileWizardExtension *ex : qAsConst(g_fileWizardExtensions)) { + for (IFileWizardExtension *ex : std::as_const(g_fileWizardExtensions)) { for (int i = 0; i < m_files.count(); i++) { ex->applyCodeStyle(&m_files[i]); } @@ -89,7 +89,7 @@ void BaseFileWizard::accept() bool removeOpenProjectAttribute = false; // Run the extensions - for (IFileWizardExtension *ex : qAsConst(g_fileWizardExtensions)) { + for (IFileWizardExtension *ex : std::as_const(g_fileWizardExtensions)) { bool remove; if (!ex->processFiles(m_files, &remove, &errorMessage)) { if (!errorMessage.isEmpty()) diff --git a/src/plugins/coreplugin/basefilewizardfactory.cpp b/src/plugins/coreplugin/basefilewizardfactory.cpp index ce9807f6076..ff23b143af7 100644 --- a/src/plugins/coreplugin/basefilewizardfactory.cpp +++ b/src/plugins/coreplugin/basefilewizardfactory.cpp @@ -130,7 +130,7 @@ bool BaseFileWizardFactory::writeFiles(const GeneratedFiles &files, QString *err { const GeneratedFile::Attributes noWriteAttributes = GeneratedFile::CustomGeneratorAttribute|GeneratedFile::KeepExistingFileAttribute; - for (const GeneratedFile &generatedFile : qAsConst(files)) + for (const GeneratedFile &generatedFile : std::as_const(files)) if (!(generatedFile.attributes() & noWriteAttributes )) if (!generatedFile.write(errorMessage)) return false; @@ -164,7 +164,7 @@ bool BaseFileWizardFactory::postGenerateFiles(const QWizard *, const GeneratedFi bool BaseFileWizardFactory::postGenerateOpenEditors(const GeneratedFiles &l, QString *errorMessage) { - for (const GeneratedFile &file : qAsConst(l)) { + for (const GeneratedFile &file : std::as_const(l)) { if (file.attributes() & GeneratedFile::OpenEditorAttribute) { if (!EditorManager::openEditor(file.filePath(), file.editorId())) { if (errorMessage) @@ -197,7 +197,7 @@ BaseFileWizardFactory::OverwriteResult BaseFileWizardFactory::promptOverwrite(Ge static const QString directoryMsg = tr("[folder]"); static const QString symLinkMsg = tr("[symbolic link]"); - for (const GeneratedFile &file : qAsConst(*files)) { + for (const GeneratedFile &file : std::as_const(*files)) { const FilePath path = file.filePath(); if (path.exists()) existingFiles.append(path.toString()); @@ -209,7 +209,7 @@ BaseFileWizardFactory::OverwriteResult BaseFileWizardFactory::promptOverwrite(Ge // Format a file list message as ( "<file1> [readonly], <file2> [folder]"). const QString commonExistingPath = Utils::commonPath(existingFiles); QString fileNamesMsgPart; - for (const QString &fileName : qAsConst(existingFiles)) { + for (const QString &fileName : std::as_const(existingFiles)) { const QFileInfo fi(fileName); if (fi.exists()) { if (!fileNamesMsgPart.isEmpty()) @@ -243,7 +243,7 @@ BaseFileWizardFactory::OverwriteResult BaseFileWizardFactory::promptOverwrite(Ge PromptOverwriteDialog overwriteDialog; // Scripts cannot handle overwrite overwriteDialog.setFiles(existingFiles); - for (const GeneratedFile &file : qAsConst(*files)) + for (const GeneratedFile &file : std::as_const(*files)) if (file.attributes() & GeneratedFile::CustomGeneratorAttribute) overwriteDialog.setFileEnabled(file.filePath().toString(), false); if (overwriteDialog.exec() != QDialog::Accepted) @@ -252,7 +252,7 @@ BaseFileWizardFactory::OverwriteResult BaseFileWizardFactory::promptOverwrite(Ge if (existingFilesToKeep.size() == files->size()) // All exist & all unchecked->Cancel. return OverwriteCanceled; // Set 'keep' attribute in files - for (const QString &keepFile : qAsConst(existingFilesToKeep)) { + for (const QString &keepFile : std::as_const(existingFilesToKeep)) { const int i = indexOfFile(*files, FilePath::fromString(keepFile).cleanPath()); QTC_ASSERT(i != -1, return OverwriteCanceled); GeneratedFile &file = (*files)[i]; diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp index 480e8b0ee5c..101b8880563 100644 --- a/src/plugins/coreplugin/designmode.cpp +++ b/src/plugins/coreplugin/designmode.cpp @@ -118,7 +118,7 @@ void DesignMode::registerDesignWidget(QWidget *widget, void DesignMode::unregisterDesignWidget(QWidget *widget) { d->m_stackWidget->removeWidget(widget); - for (DesignEditorInfo *info : qAsConst(d->m_editors)) { + for (DesignEditorInfo *info : std::as_const(d->m_editors)) { if (info->widget == widget) { d->m_editors.removeAll(info); delete info; @@ -138,7 +138,7 @@ void DesignMode::currentEditorChanged(IEditor *editor) if (editor) { const QString mimeType = editor->document()->mimeType(); if (!mimeType.isEmpty()) { - for (const DesignEditorInfo *editorInfo : qAsConst(d->m_editors)) { + for (const DesignEditorInfo *editorInfo : std::as_const(d->m_editors)) { for (const QString &mime : editorInfo->mimeTypes) { if (mime == mimeType) { d->m_stackWidget->setCurrentIndex(editorInfo->widgetIndex); diff --git a/src/plugins/coreplugin/dialogs/codecselector.cpp b/src/plugins/coreplugin/dialogs/codecselector.cpp index 6bb91779249..6cdade2d0b4 100644 --- a/src/plugins/coreplugin/dialogs/codecselector.cpp +++ b/src/plugins/coreplugin/dialogs/codecselector.cpp @@ -55,15 +55,15 @@ CodecSelector::CodecSelector(QWidget *parent, Core::BaseTextDocument *doc) QList<int> mibs = QTextCodec::availableMibs(); Utils::sort(mibs); QList<int> sortedMibs; - for (const int mib : qAsConst(mibs)) + for (const int mib : std::as_const(mibs)) if (mib >= 0) sortedMibs += mib; - for (const int mib : qAsConst(mibs)) + for (const int mib : std::as_const(mibs)) if (mib < 0) sortedMibs += mib; int currentIndex = -1; - for (const int mib : qAsConst(sortedMibs)) { + for (const int mib : std::as_const(sortedMibs)) { QTextCodec *c = QTextCodec::codecForMib(mib); if (!doc->supportsCodec(c)) continue; diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp index 835b63f8147..d9d03501d0f 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp @@ -876,7 +876,7 @@ void ExternalToolConfig::apply() resultMap.insert(it.key(), items); } // Remove tools that have been deleted from the settings (and are no preset) - for (const ExternalTool *tool : qAsConst(originalTools)) { + for (const ExternalTool *tool : std::as_const(originalTools)) { QTC_ASSERT(!tool->preset(), continue); // TODO error handling tool->fileName().removeFile(); diff --git a/src/plugins/coreplugin/dialogs/newdialogwidget.cpp b/src/plugins/coreplugin/dialogs/newdialogwidget.cpp index 634a36128d2..ff9995295eb 100644 --- a/src/plugins/coreplugin/dialogs/newdialogwidget.cpp +++ b/src/plugins/coreplugin/dialogs/newdialogwidget.cpp @@ -307,7 +307,7 @@ void NewDialogWidget::setWizardFactories(QList<IWizardFactory *> factories, if (!showPlatformFilter) m_comboBox->hide(); - for (IWizardFactory *factory : qAsConst(factories)) { + for (IWizardFactory *factory : std::as_const(factories)) { QStandardItem *kindItem; switch (factory->kind()) { case IWizardFactory::ProjectWizard: @@ -342,7 +342,7 @@ void NewDialogWidget::showDialog() static_cast<PlatformFilterProxyModel *>(m_filterProxyModel)->manualReset(); if (!lastCategory.isEmpty()) - for (QStandardItem *item : qAsConst(m_categoryItems)) { + for (QStandardItem *item : std::as_const(m_categoryItems)) { if (item->data(Qt::UserRole) == lastCategory) idx = m_filterProxyModel->mapFromSource(m_model->indexFromItem(item)); } diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp index 76d9b9d1dee..4e0db083bee 100644 --- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp +++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp @@ -108,7 +108,7 @@ ReadOnlyFilesDialogPrivate::ReadOnlyFilesDialogPrivate(ReadOnlyFilesDialog *pare ReadOnlyFilesDialogPrivate::~ReadOnlyFilesDialogPrivate() { - for (const ButtonGroupForFile &groupForFile : qAsConst(buttonGroups)) + for (const ButtonGroupForFile &groupForFile : std::as_const(buttonGroups)) delete groupForFile.group; } @@ -282,7 +282,7 @@ int ReadOnlyFilesDialog::exec() ReadOnlyResult result = RO_Cancel; FilePaths failedToMakeWritable; for (const ReadOnlyFilesDialogPrivate::ButtonGroupForFile &buttongroup - : qAsConst(d->buttonGroups)) { + : std::as_const(d->buttonGroups)) { result = static_cast<ReadOnlyResult>(buttongroup.group->checkedId()); switch (result) { case RO_MakeWritable: @@ -356,7 +356,7 @@ void ReadOnlyFilesDialogPrivate::setAll(int index) // Check for every file if the selected operation is available and change it to the operation. for (const ReadOnlyFilesDialogPrivate::ButtonGroupForFile &groupForFile : - qAsConst(buttonGroups)) { + std::as_const(buttonGroups)) { auto radioButton = qobject_cast<QRadioButton *>(groupForFile.group->button(type)); if (radioButton) radioButton->setChecked(true); @@ -372,7 +372,7 @@ void ReadOnlyFilesDialogPrivate::updateSelectAll() { int selectedOperation = -1; for (const ReadOnlyFilesDialogPrivate::ButtonGroupForFile &groupForFile : - qAsConst(buttonGroups)) { + std::as_const(buttonGroups)) { if (selectedOperation == -1) { selectedOperation = groupForFile.group->checkedId(); } else if (selectedOperation != groupForFile.group->checkedId()) { diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp index 8ad7b8e7492..25e77a77785 100644 --- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp @@ -144,7 +144,7 @@ void SaveItemsDialog::adjustButtonWidths() possibleTexts << tr("Save Selected"); int maxTextWidth = 0; QPushButton *saveButton = m_buttonBox->button(QDialogButtonBox::Save); - for (const QString &text : qAsConst(possibleTexts)) { + for (const QString &text : std::as_const(possibleTexts)) { saveButton->setText(text); int hint = saveButton->sizeHint().width(); if (hint > maxTextWidth) diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp index 2f377e9e7c0..d4a65df5de5 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp @@ -195,11 +195,11 @@ void CategoryModel::ensurePages(Category *category) { if (!category->providerPagesCreated) { QList<IOptionsPage *> createdPages; - for (const IOptionsPageProvider *provider : qAsConst(category->providers)) + for (const IOptionsPageProvider *provider : std::as_const(category->providers)) createdPages += provider->pages(); // check for duplicate ids - for (const IOptionsPage *page : qAsConst(createdPages)) { + for (const IOptionsPage *page : std::as_const(createdPages)) { QTC_ASSERT(!m_pageIds.contains(page->id()), qWarning("duplicate options page id '%s'", qPrintable(page->id().toString()))); } @@ -585,7 +585,7 @@ void SettingsDialog::ensureCategoryWidget(Category *category) m_model.ensurePages(category); auto tabWidget = new QTabWidget; tabWidget->tabBar()->setObjectName("qc_settings_main_tabbar"); // easier lookup in Squish - for (IOptionsPage *page : qAsConst(category->pages)) { + for (IOptionsPage *page : std::as_const(category->pages)) { QWidget *widget = page->widget(); ICore::setupScreenShooter(page->displayName(), widget); auto ssa = new SmartScrollArea(this); @@ -677,9 +677,9 @@ void SettingsDialog::accept() m_finished = true; disconnectTabWidgets(); m_applied = true; - for (IOptionsPage *page : qAsConst(m_visitedPages)) + for (IOptionsPage *page : std::as_const(m_visitedPages)) page->apply(); - for (IOptionsPage *page : qAsConst(m_pages)) + for (IOptionsPage *page : std::as_const(m_pages)) page->finish(); done(QDialog::Accepted); } @@ -690,14 +690,14 @@ void SettingsDialog::reject() return; m_finished = true; disconnectTabWidgets(); - for (IOptionsPage *page : qAsConst(m_pages)) + for (IOptionsPage *page : std::as_const(m_pages)) page->finish(); done(QDialog::Rejected); } void SettingsDialog::apply() { - for (IOptionsPage *page : qAsConst(m_visitedPages)) + for (IOptionsPage *page : std::as_const(m_visitedPages)) page->apply(); m_applied = true; } diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index 28db3a02a9b..0052ddf6e9f 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -306,7 +306,7 @@ QWidget *ShortcutSettings::widget() void ShortcutSettingsWidget::apply() { - for (const ShortcutItem *item : qAsConst(m_scitems)) + for (const ShortcutItem *item : std::as_const(m_scitems)) item->m_cmd->setKeySequences(item->m_keys); } @@ -474,7 +474,7 @@ void ShortcutSettingsWidget::importAction() CommandsFile cf(fileName); QMap<QString, QList<QKeySequence>> mapping = cf.importCommands(); - for (ShortcutItem *item : qAsConst(m_scitems)) { + for (ShortcutItem *item : std::as_const(m_scitems)) { QString sid = item->m_cmd->id().toString(); if (mapping.contains(sid)) { item->m_keys = mapping.value(sid); @@ -494,7 +494,7 @@ void ShortcutSettingsWidget::importAction() void ShortcutSettingsWidget::defaultAction() { - for (ShortcutItem *item : qAsConst(m_scitems)) { + for (ShortcutItem *item : std::as_const(m_scitems)) { item->m_keys = item->m_cmd->defaultKeySequences(); item->m_item->setText(2, keySequencesToNativeString(item->m_keys)); setModified(item->m_item, false); @@ -580,7 +580,7 @@ bool ShortcutSettingsWidget::markCollisions(ShortcutItem *item, int index) Id globalId(Constants::C_GLOBAL); const Context itemContext = item->m_cmd->context(); const bool itemHasGlobalContext = itemContext.contains(globalId); - for (ShortcutItem *currentItem : qAsConst(m_scitems)) { + for (ShortcutItem *currentItem : std::as_const(m_scitems)) { if (item == currentItem) continue; if (!Utils::anyOf(currentItem->m_keys, Utils::equalTo(key))) @@ -613,7 +613,7 @@ bool ShortcutSettingsWidget::markCollisions(ShortcutItem *item, int index) void ShortcutSettingsWidget::markAllCollisions() { - for (ShortcutItem *item : qAsConst(m_scitems)) + for (ShortcutItem *item : std::as_const(m_scitems)) for (int i = 0; i < item->m_keys.size(); ++i) markCollisions(item, i); } diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index 13698bb50f2..c19e65366b5 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -477,7 +477,7 @@ void DocumentManager::renamedFile(const Utils::FilePath &from, const Utils::File } // rename the IDocuments - for (IDocument *document : qAsConst(documentsToRename)) { + for (IDocument *document : std::as_const(documentsToRename)) { d->m_blockedIDocument = document; removeFileInfo(document); document->setFilePath(to); @@ -572,7 +572,7 @@ QList<IDocument *> DocumentManager::modifiedDocuments() modified << document; } - for (IDocument *document : qAsConst(d->m_documentsWithoutWatch)) { + for (IDocument *document : std::as_const(d->m_documentsWithoutWatch)) { if (document->isModified()) modified << document; } @@ -682,7 +682,7 @@ static bool saveModifiedFilesHelper(const QList<IDocument *> &documents, } // Check for files without write permissions. QList<IDocument *> roDocuments; - for (IDocument *document : qAsConst(documentsToSave)) { + for (IDocument *document : std::as_const(documentsToSave)) { if (document->isFileReadOnly()) roDocuments << document; } @@ -699,7 +699,7 @@ static bool saveModifiedFilesHelper(const QList<IDocument *> &documents, return false; } } - for (IDocument *document : qAsConst(documentsToSave)) { + for (IDocument *document : std::as_const(documentsToSave)) { if (!EditorManagerPrivate::saveDocument(document)) { if (cancelled) *cancelled = true; @@ -1088,7 +1088,7 @@ void DocumentManager::checkForReload() QMap<FilePath, FileStateItem> currentStates; QMap<FilePath, IDocument::ChangeType> changeTypes; QSet<IDocument *> changedIDocuments; - for (const FilePath &filePath : qAsConst(d->m_changedFiles)) { + for (const FilePath &filePath : std::as_const(d->m_changedFiles)) { const FilePath fileKey = filePathKey(filePath, KeepLinks); qCDebug(log) << "handling file change for" << filePath << "(" << fileKey << ")"; IDocument::ChangeType type = IDocument::TypeContents; @@ -1119,7 +1119,7 @@ void DocumentManager::checkForReload() // if the resolved names are different when unexpectFileChange is called // we would end up with never-unexpected file names QSet<FilePath> expectedFileKeys; - for (const FilePath &filePath : qAsConst(d->m_expectedFileNames)) { + for (const FilePath &filePath : std::as_const(d->m_expectedFileNames)) { const FilePath cleanAbsFilePath = filePathKey(filePath, KeepLinks); expectedFileKeys.insert(filePathKey(filePath, KeepLinks)); const FilePath resolvedCleanAbsFilePath = cleanAbsFilePath.canonicalPath(); @@ -1130,7 +1130,7 @@ void DocumentManager::checkForReload() // handle the IDocuments QStringList errorStrings; QStringList filesToDiff; - for (IDocument *document : qAsConst(changedIDocuments)) { + for (IDocument *document : std::as_const(changedIDocuments)) { IDocument::ChangeTrigger trigger = IDocument::TriggerInternal; std::optional<IDocument::ChangeType> type; bool changed = false; @@ -1355,7 +1355,7 @@ void DocumentManager::saveSettings() { QVariantList recentFiles; QStringList recentEditorIds; - for (const RecentFile &file : qAsConst(d->m_recentFiles)) { + for (const RecentFile &file : std::as_const(d->m_recentFiles)) { recentFiles.append(file.first.toVariant()); recentEditorIds.append(file.second.toString()); } diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp index b9777b48da2..c154ebb551e 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.cpp +++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp @@ -474,7 +474,7 @@ void DocumentModelPrivate::removeAllSuspendedEntries(PinnedFileRemovalPolicy pin d->m_entryByFixedPath.remove(fixedPath); } QSet<QString> displayNames; - for (DocumentModel::Entry *entry : qAsConst(d->m_entries)) { + for (DocumentModel::Entry *entry : std::as_const(d->m_entries)) { const QString displayName = entry->plainDisplayName(); if (displayNames.contains(displayName)) continue; diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 5480e95bae6..54622fcaf73 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -891,7 +891,7 @@ IEditor *EditorManagerPrivate::openEditor(EditorView *view, const FilePath &file auto button = qobject_cast<QPushButton *>(msgbox.button(QMessageBox::Open)); QTC_ASSERT(button, return nullptr); auto menu = new QMenu(button); - for (EditorType *factory : qAsConst(factories)) { + for (EditorType *factory : std::as_const(factories)) { QAction *action = menu->addAction(factory->displayName()); connect(action, &QAction::triggered, &msgbox, [&selectedFactory, factory, &msgbox]() { selectedFactory = factory; @@ -969,7 +969,7 @@ IEditor *EditorManagerPrivate::openEditorWith(const FilePath &filePath, Id edito views.prepend(currentView); // open editor in current view first } EditorManager::OpenEditorFlags flags; - for (EditorView *view : qAsConst(views)) { + for (EditorView *view : std::as_const(views)) { IEditor *editor = EditorManagerPrivate::openEditor(view, filePath, editorId, flags); if (!openedEditor && editor) openedEditor = editor; @@ -1128,7 +1128,7 @@ void EditorManagerPrivate::showPopupOrSelectDocument() // if the active window has editors, we want that editor area as a reference // TODO: this does not work correctly with multiple editor areas in the same window EditorArea *activeEditorArea = nullptr; - for (EditorArea *area : qAsConst(d->m_editorAreas)) { + for (EditorArea *area : std::as_const(d->m_editorAreas)) { if (area->window() == activeWindow) { activeEditorArea = area; break; @@ -1629,7 +1629,7 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla // 2. keep track of the document and all the editors that might remain open for it QSet<IEditor*> acceptedEditors; QHash<IDocument *, QList<IEditor *> > editorsForDocuments; - for (IEditor *editor : qAsConst(editors)) { + for (IEditor *editor : std::as_const(editors)) { bool editorAccepted = true; const QList<std::function<bool(IEditor *)>> listeners = d->m_closeEditorListeners; for (const std::function<bool(IEditor *)> &listener : listeners) { @@ -1676,7 +1676,7 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla return false; // save editor states - for (IEditor *editor : qAsConst(acceptedEditors)) { + for (IEditor *editor : std::as_const(acceptedEditors)) { if (!editor->document()->filePath().isEmpty() && !editor->document()->isTemporary()) { QByteArray state = editor->saveState(); if (!state.isEmpty()) @@ -1690,7 +1690,7 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla // and sort them per view, so we can remove them from views in an orderly // manner. QMultiHash<EditorView *, IEditor *> editorsPerView; - for (IEditor *editor : qAsConst(acceptedEditors)) { + for (IEditor *editor : std::as_const(acceptedEditors)) { emit m_instance->editorAboutToClose(editor); removeEditor(editor, flag != CloseFlag::Suspend); if (EditorView *view = viewForEditor(editor)) { @@ -1723,7 +1723,7 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla return true; return false; }); - for (EditorView *view : qAsConst(views)) { + for (EditorView *view : std::as_const(views)) { QList<IEditor *> editors = editorsPerView.values(view); // handle current editor in view last IEditor *viewCurrentEditor = view->currentEditor(); @@ -1731,7 +1731,7 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla editors.removeAll(viewCurrentEditor); editors.append(viewCurrentEditor); } - for (IEditor *editor : qAsConst(editors)) { + for (IEditor *editor : std::as_const(editors)) { if (editor == viewCurrentEditor && view == views.last()) { // Avoid removing the globally current editor from its view, // set a new current editor before. @@ -2602,7 +2602,7 @@ void EditorManagerPrivate::autoSuspendDocuments() &IEditor::document); int keptEditorCount = 0; QList<IDocument *> documentsToSuspend; - for (const EditLocation &editLocation : qAsConst(d->m_globalHistory)) { + for (const EditLocation &editLocation : std::as_const(d->m_globalHistory)) { IDocument *document = editLocation.document; if (!document || !document->isSuspendAllowed() || document->isModified() || document->isTemporary() || document->filePath().isEmpty() @@ -2690,7 +2690,7 @@ EditorView *EditorManagerPrivate::currentEditorView() } QTC_CHECK(view); if (!view) { // should not happen, we should always have either currentview or currentdocument - for (const EditorArea *area : qAsConst(d->m_editorAreas)) { + for (const EditorArea *area : std::as_const(d->m_editorAreas)) { if (area->window()->isActiveWindow()) { view = area->findFirstView(); break; @@ -2705,7 +2705,7 @@ EditorView *EditorManagerPrivate::currentEditorView() QList<EditorView *> EditorManagerPrivate::allEditorViews() { QList<EditorView *> views; - for (const EditorArea *area : qAsConst(d->m_editorAreas)) { + for (const EditorArea *area : std::as_const(d->m_editorAreas)) { EditorView *firstView = area->findFirstView(); EditorView *view = firstView; if (view) { @@ -3639,7 +3639,7 @@ bool EditorManager::restoreState(const QByteArray &state) // restore windows QVector<QVariantHash> windowStates; stream >> windowStates; - for (const QVariantHash &windowState : qAsConst(windowStates)) { + for (const QVariantHash &windowState : std::as_const(windowStates)) { EditorWindow *window = d->createEditorWindow(); window->restoreState(windowState); window->show(); @@ -3804,7 +3804,7 @@ void EditorManager::setSessionTitleHandler(WindowTitleHandler handler) */ void EditorManager::updateWindowTitles() { - for (EditorArea *area : qAsConst(d->m_editorAreas)) + for (EditorArea *area : std::as_const(d->m_editorAreas)) emit area->windowTitleNeedsUpdate(); } diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp index 10b751dbf9c..fd788c36c8c 100644 --- a/src/plugins/coreplugin/fancytabwidget.cpp +++ b/src/plugins/coreplugin/fancytabwidget.cpp @@ -75,7 +75,7 @@ QSize FancyTabBar::tabSizeHint(bool minimum) const const int spacing = 8; const int width = 60 + spacing + 2; int maxLabelwidth = 0; - for (auto tab : qAsConst(m_tabs)) { + for (auto tab : std::as_const(m_tabs)) { const int width = fm.horizontalAdvance(tab->text); if (width > maxLabelwidth) maxLabelwidth = width; @@ -155,7 +155,7 @@ void FancyTabBar::leaveEvent(QEvent *event) Q_UNUSED(event) m_hoverIndex = -1; m_hoverRect = QRect(); - for (auto tab : qAsConst(m_tabs)) + for (auto tab : std::as_const(m_tabs)) tab->fadeOut(); } diff --git a/src/plugins/coreplugin/find/findplugin.cpp b/src/plugins/coreplugin/find/findplugin.cpp index 2d844455593..6c3d03294a2 100644 --- a/src/plugins/coreplugin/find/findplugin.cpp +++ b/src/plugins/coreplugin/find/findplugin.cpp @@ -301,7 +301,7 @@ void FindPrivate::setupFilterMenuItems() const Id base("FindFilter."); QList<IFindFilter *> sortedFilters = IFindFilter::allFindFilters(); Utils::sort(sortedFilters, &IFindFilter::displayName); - for (IFindFilter *filter : qAsConst(sortedFilters)) { + for (IFindFilter *filter : std::as_const(sortedFilters)) { QAction *action = new QAction(filterActionName(filter), this); bool isEnabled = filter->isEnabled(); if (isEnabled) diff --git a/src/plugins/coreplugin/find/findtoolwindow.cpp b/src/plugins/coreplugin/find/findtoolwindow.cpp index 1650d9bb538..a543da5d87a 100644 --- a/src/plugins/coreplugin/find/findtoolwindow.cpp +++ b/src/plugins/coreplugin/find/findtoolwindow.cpp @@ -228,7 +228,7 @@ void FindToolWindow::setFindFilters(const QList<IFindFilter *> &filters) { qDeleteAll(m_configWidgets); m_configWidgets.clear(); - for (IFindFilter *filter : qAsConst(m_filters)) + for (IFindFilter *filter : std::as_const(m_filters)) filter->disconnect(this); m_filters = filters; m_filterList->clear(); @@ -353,7 +353,7 @@ void FindToolWindow::writeSettings() settings->beginGroup("Find"); settings->setValueWithDefault("CurrentFilter", m_currentFilter ? m_currentFilter->id() : QString()); - for (IFindFilter *filter : qAsConst(m_filters)) + for (IFindFilter *filter : std::as_const(m_filters)) filter->writeSettings(settings); settings->endGroup(); } diff --git a/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp b/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp index 56647e05090..75736bb6810 100644 --- a/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp +++ b/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp @@ -188,7 +188,7 @@ void HighlightScrollBarOverlay::drawHighlights(QPainter *painter, const double lineHeight = m_highlightController->lineHeight(); - for (const QMap<Utils::Theme::Color, QMap<int, int>> &colors : qAsConst(m_highlightCache)) { + for (const QMap<Utils::Theme::Color, QMap<int, int>> &colors : std::as_const(m_highlightCache)) { const auto itColorEnd = colors.constEnd(); for (auto itColor = colors.constBegin(); itColor != itColorEnd; ++itColor) { const QColor &color = creatorTheme()->color(itColor.key()); diff --git a/src/plugins/coreplugin/find/searchresulttreemodel.cpp b/src/plugins/coreplugin/find/searchresulttreemodel.cpp index 30fd5e56e5b..0080e0baf22 100644 --- a/src/plugins/coreplugin/find/searchresulttreemodel.cpp +++ b/src/plugins/coreplugin/find/searchresulttreemodel.cpp @@ -457,7 +457,7 @@ QList<QModelIndex> SearchResultTreeModel::addResults(const QList<SearchResultIte itemSet.clear(); } QList<QModelIndex> pathIndices; - for (SearchResultTreeItem *item : qAsConst(pathNodes)) + for (SearchResultTreeItem *item : std::as_const(pathNodes)) pathIndices << index(item); return pathIndices; } diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp index d4bd1d98f46..acdc526539e 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.cpp +++ b/src/plugins/coreplugin/find/searchresultwindow.cpp @@ -519,7 +519,7 @@ void SearchResultWindow::clearContents() for (int i = d->m_recentSearchesBox->count() - 1; i > 0 /* don't want i==0 */; --i) d->m_recentSearchesBox->removeItem(i); } - for (Internal::SearchResultWidget *widget : qAsConst(d->m_searchResultWidgets)) + for (Internal::SearchResultWidget *widget : std::as_const(d->m_searchResultWidgets)) widget->notifyVisibilityChanged(false); qDeleteAll(d->m_searchResultWidgets); d->m_searchResultWidgets.clear(); @@ -573,7 +573,7 @@ void SearchResultWindow::setTextEditorFont(const QFont &font, const SearchResult { d->m_font = font; d->m_colors = colors; - for (Internal::SearchResultWidget *widget : qAsConst(d->m_searchResultWidgets)) + for (Internal::SearchResultWidget *widget : std::as_const(d->m_searchResultWidgets)) widget->setTextEditorFont(font, colors); } @@ -583,7 +583,7 @@ void SearchResultWindow::setTextEditorFont(const QFont &font, const SearchResult void SearchResultWindow::setTabWidth(int tabWidth) { d->m_tabWidth = tabWidth; - for (Internal::SearchResultWidget *widget : qAsConst(d->m_searchResultWidgets)) + for (Internal::SearchResultWidget *widget : std::as_const(d->m_searchResultWidgets)) widget->setTabWidth(tabWidth); } /*! diff --git a/src/plugins/coreplugin/foldernavigationwidget.cpp b/src/plugins/coreplugin/foldernavigationwidget.cpp index 70f3c689249..226629386f6 100644 --- a/src/plugins/coreplugin/foldernavigationwidget.cpp +++ b/src/plugins/coreplugin/foldernavigationwidget.cpp @@ -800,7 +800,7 @@ FolderNavigationWidgetFactory::FolderNavigationWidgetFactory() Core::NavigationView FolderNavigationWidgetFactory::createWidget() { auto fnw = new FolderNavigationWidget; - for (const RootDirectory &root : qAsConst(m_rootDirectories)) + for (const RootDirectory &root : std::as_const(m_rootDirectories)) fnw->insertRootDirectory(root); connect(this, &FolderNavigationWidgetFactory::rootDirectoryAdded, diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index 6af6e5b49d9..81aa475ab98 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -246,7 +246,7 @@ void GeneralSettingsWidget::fillCodecBox() const QByteArrayList codecs = QTextCodec::availableCodecs(); Utils::sort(codecs); - for (const QByteArray &codec : qAsConst(codecs)) { + for (const QByteArray &codec : std::as_const(codecs)) { m_codecBox->addItem(QString::fromLocal8Bit(codec)); if (codec == currentCodec) m_codecBox->setCurrentIndex(m_codecBox->count() - 1); diff --git a/src/plugins/coreplugin/iwizardfactory.cpp b/src/plugins/coreplugin/iwizardfactory.cpp index 938dc06fced..47db80bc7f8 100644 --- a/src/plugins/coreplugin/iwizardfactory.cpp +++ b/src/plugins/coreplugin/iwizardfactory.cpp @@ -173,7 +173,7 @@ QList<IWizardFactory*> IWizardFactory::allWizardFactories() s_areFactoriesLoaded = true; QHash<Id, IWizardFactory *> sanityCheck; - for (const FactoryCreator &fc : qAsConst(s_factoryCreators)) { + for (const FactoryCreator &fc : std::as_const(s_factoryCreators)) { IWizardFactory *newFactory = fc(); QTC_ASSERT(newFactory, continue); IWizardFactory *existingFactory = sanityCheck.value(newFactory->id()); @@ -308,7 +308,7 @@ void IWizardFactory::registerFactoryCreator(const IWizardFactory::FactoryCreator QSet<Id> IWizardFactory::allAvailablePlatforms() { QSet<Id> platforms; - for (const IFeatureProvider *featureManager : qAsConst(s_providerList)) + for (const IFeatureProvider *featureManager : std::as_const(s_providerList)) platforms.unite(featureManager->availablePlatforms()); return platforms; @@ -316,7 +316,7 @@ QSet<Id> IWizardFactory::allAvailablePlatforms() QString IWizardFactory::displayNameForPlatform(Id i) { - for (const IFeatureProvider *featureManager : qAsConst(s_providerList)) { + for (const IFeatureProvider *featureManager : std::as_const(s_providerList)) { const QString displayName = featureManager->displayNameForPlatform(i); if (!displayName.isEmpty()) return displayName; @@ -361,7 +361,7 @@ void IWizardFactory::destroyFeatureProvider() void IWizardFactory::clearWizardFactories() { - for (IWizardFactory *factory : qAsConst(s_allFactories)) + for (IWizardFactory *factory : std::as_const(s_allFactories)) ActionManager::unregisterAction(factory->m_action, actionId(factory)); qDeleteAll(s_allFactories); @@ -388,7 +388,7 @@ QSet<Id> IWizardFactory::availableFeatures(Id platformId) { QSet<Id> availableFeatures; - for (const IFeatureProvider *featureManager : qAsConst(s_providerList)) + for (const IFeatureProvider *featureManager : std::as_const(s_providerList)) availableFeatures.unite(featureManager->availableFeatures(platformId)); return availableFeatures; diff --git a/src/plugins/coreplugin/locator/commandlocator.cpp b/src/plugins/coreplugin/locator/commandlocator.cpp index 24842f443f3..0e9e4fd1e0b 100644 --- a/src/plugins/coreplugin/locator/commandlocator.cpp +++ b/src/plugins/coreplugin/locator/commandlocator.cpp @@ -70,7 +70,7 @@ QList<LocatorFilterEntry> CommandLocator::matchesFor(QFutureInterface<LocatorFil QList<LocatorFilterEntry> goodEntries; QList<LocatorFilterEntry> betterEntries; const Qt::CaseSensitivity entryCaseSensitivity = caseSensitivity(entry); - for (const auto &pair : qAsConst(d->commandsData)) { + for (const auto &pair : std::as_const(d->commandsData)) { if (future.isCanceled()) break; diff --git a/src/plugins/coreplugin/locator/executefilter.cpp b/src/plugins/coreplugin/locator/executefilter.cpp index d24f22b620c..854ea514519 100644 --- a/src/plugins/coreplugin/locator/executefilter.cpp +++ b/src/plugins/coreplugin/locator/executefilter.cpp @@ -45,7 +45,7 @@ QList<LocatorFilterEntry> ExecuteFilter::matchesFor(QFutureInterface<LocatorFilt value.append(LocatorFilterEntry(this, entry, QVariant())); QList<LocatorFilterEntry> others; const Qt::CaseSensitivity entryCaseSensitivity = caseSensitivity(entry); - for (const QString &cmd : qAsConst(m_commandHistory)) { + for (const QString &cmd : std::as_const(m_commandHistory)) { if (future.isCanceled()) break; if (cmd == entry) // avoid repeated entry diff --git a/src/plugins/coreplugin/locator/locator.cpp b/src/plugins/coreplugin/locator/locator.cpp index 7c2e3b7a2cc..704a76d8b30 100644 --- a/src/plugins/coreplugin/locator/locator.cpp +++ b/src/plugins/coreplugin/locator/locator.cpp @@ -173,7 +173,7 @@ void Locator::loadSettings() m_refreshTimer.setInterval(settings->value("RefreshInterval", 60).toInt() * 60000); m_settings.useCenteredPopup = settings->value(kUseCenteredPopup, def.useCenteredPopup).toBool(); - for (ILocatorFilter *filter : qAsConst(m_filters)) { + for (ILocatorFilter *filter : std::as_const(m_filters)) { if (settings->contains(filter->id().toString())) { const QByteArray state = settings->value(filter->id().toString()).toByteArray(); if (!state.isEmpty()) @@ -214,7 +214,7 @@ void Locator::updateFilterActions() QMap<Id, QAction *> actionCopy = m_filterActionMap; m_filterActionMap.clear(); // register new actions, update existent - for (ILocatorFilter *filter : qAsConst(m_filters)) { + for (ILocatorFilter *filter : std::as_const(m_filters)) { if (filter->shortcutString().isEmpty() || filter->isHidden()) continue; Id filterId = filter->id(); diff --git a/src/plugins/coreplugin/locator/locator_test.cpp b/src/plugins/coreplugin/locator/locator_test.cpp index fd40a119984..60ef12fbd92 100644 --- a/src/plugins/coreplugin/locator/locator_test.cpp +++ b/src/plugins/coreplugin/locator/locator_test.cpp @@ -56,7 +56,7 @@ void Core::Internal::CorePlugin::test_basefilefilter() MyBaseFileFilter filter(Utils::FileUtils::toFilePathList(testFiles)); BasicLocatorFilterTest test(&filter); - for (const ReferenceData &reference : qAsConst(referenceDataList)) { + for (const ReferenceData &reference : std::as_const(referenceDataList)) { const QList<LocatorFilterEntry> filterEntries = test.matchesFor(reference.searchText); const ResultDataList results = ResultData::fromFilterEntryList(filterEntries); // QTextStream(stdout) << "----" << endl; diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp index a45bb96d447..665290687e2 100644 --- a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp +++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp @@ -40,7 +40,7 @@ void LocatorFiltersFilter::prepareSearch(const QString &entry) uniqueFilters.insert(filterId, filter); } - for (ILocatorFilter *filter : qAsConst(uniqueFilters)) { + for (ILocatorFilter *filter : std::as_const(uniqueFilters)) { if (!filter->shortcutString().isEmpty() && !filter->isHidden() && filter->isEnabled()) { m_filterShortcutStrings.append(filter->shortcutString()); m_filterDisplayNames.append(filter->displayName()); diff --git a/src/plugins/coreplugin/locator/locatorsettingspage.cpp b/src/plugins/coreplugin/locator/locatorsettingspage.cpp index 9468410c7dc..1ba68bff084 100644 --- a/src/plugins/coreplugin/locator/locatorsettingspage.cpp +++ b/src/plugins/coreplugin/locator/locatorsettingspage.cpp @@ -330,7 +330,7 @@ void LocatorSettingsWidget::setFilter(const QString &text) void LocatorSettingsWidget::saveFilterStates() { m_filterStates.clear(); - for (ILocatorFilter *filter : qAsConst(m_filters)) + for (ILocatorFilter *filter : std::as_const(m_filters)) m_filterStates.insert(filter, filter->saveState()); } @@ -352,11 +352,11 @@ void LocatorSettingsWidget::initializeModel() m_model->clear(); QSet<ILocatorFilter *> customFilterSet = Utils::toSet(m_customFilters); auto builtIn = new CategoryItem(tr("Built-in"), 0/*order*/); - for (ILocatorFilter *filter : qAsConst(m_filters)) + for (ILocatorFilter *filter : std::as_const(m_filters)) if (!filter->isHidden() && !customFilterSet.contains(filter)) builtIn->appendChild(new FilterItem(filter)); m_customFilterRoot = new CategoryItem(tr("Custom"), 1/*order*/); - for (ILocatorFilter *customFilter : qAsConst(m_customFilters)) + for (ILocatorFilter *customFilter : std::as_const(m_customFilters)) m_customFilterRoot->appendChild(new FilterItem(customFilter)); m_model->rootItem()->appendChild(builtIn); diff --git a/src/plugins/coreplugin/loggingmanager.cpp b/src/plugins/coreplugin/loggingmanager.cpp index 4a3f392d4c5..f30a816ac09 100644 --- a/src/plugins/coreplugin/loggingmanager.cpp +++ b/src/plugins/coreplugin/loggingmanager.cpp @@ -271,7 +271,7 @@ void LoggingViewManager::prefillCategories() void LoggingViewManager::resetFilterRules() { - for (const FilterRuleSpec &rule : qAsConst(m_originalRules)) { + for (const FilterRuleSpec &rule : std::as_const(m_originalRules)) { const QString level = rule.level.has_value() ? '.' + levelToString(rule.level.value()) : QString(); const QString ruleString = rule.category + level + '=' + (rule.enabled ? "true" : "false"); @@ -285,7 +285,7 @@ bool LoggingViewManager::enabledInOriginalRules(const QMessageLogContext &contex return false; const QString category = QString::fromUtf8(context.category); bool result = false; - for (const FilterRuleSpec &rule : qAsConst(m_originalRules)) { + for (const FilterRuleSpec &rule : std::as_const(m_originalRules)) { const QRegularExpression regex( QRegularExpression::wildcardToRegularExpression(rule.category)); if (regex.match(category).hasMatch()) { diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index df8ef17c33a..a7e943c1961 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -1319,13 +1319,13 @@ void MainWindow::updateContext() { Context contexts = m_highPrioAdditionalContexts; - for (IContext *context : qAsConst(m_activeContext)) + for (IContext *context : std::as_const(m_activeContext)) contexts.add(context->context()); contexts.add(m_lowPrioAdditionalContexts); Context uniquecontexts; - for (const Id &id : qAsConst(contexts)) { + for (const Id &id : std::as_const(contexts)) { if (!uniquecontexts.contains(id)) uniquecontexts.add(id); } diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp index 79045ae40ab..6551cd1a0e8 100644 --- a/src/plugins/coreplugin/mimetypesettings.cpp +++ b/src/plugins/coreplugin/mimetypesettings.cpp @@ -591,7 +591,7 @@ void MimeTypeSettingsPrivate::writeUserModifiedMimeTypes() writer.writeStartDocument(); writer.writeStartElement(QLatin1String(mimeInfoTagC)); - for (const UserMimeType &mt : qAsConst(m_userModifiedMimeTypes)) { + for (const UserMimeType &mt : std::as_const(m_userModifiedMimeTypes)) { writer.writeStartElement(QLatin1String(mimeTypeTagC)); writer.writeAttribute(QLatin1String(mimeTypeAttributeC), mt.name); writer.writeAttribute(QLatin1String(patternAttributeC), diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp index 00960b4e5d2..f17830445d4 100644 --- a/src/plugins/coreplugin/modemanager.cpp +++ b/src/plugins/coreplugin/modemanager.cpp @@ -189,7 +189,7 @@ void ModeManagerPrivate::extensionsInitializedHelper() Utils::sort(m_modes, &IMode::priority); std::reverse(m_modes.begin(), m_modes.end()); - for (IMode *mode : qAsConst(m_modes)) + for (IMode *mode : std::as_const(m_modes)) appendMode(mode); if (m_pendingFirstActiveMode.isValid()) @@ -279,7 +279,7 @@ void ModeManager::addAction(QAction *action, int priority) // Count the number of commands with a higher priority int index = 0; - for (int p : qAsConst(d->m_actions)) { + for (int p : std::as_const(d->m_actions)) { if (p > priority) ++index; } diff --git a/src/plugins/coreplugin/navigationsubwidget.cpp b/src/plugins/coreplugin/navigationsubwidget.cpp index d0fe95abfc2..9f8db2e5974 100644 --- a/src/plugins/coreplugin/navigationsubwidget.cpp +++ b/src/plugins/coreplugin/navigationsubwidget.cpp @@ -90,7 +90,7 @@ void NavigationSubWidget::comboBoxIndexChanged(int factoryIndex) saveSettings(); // Remove toolbutton - for (QWidget *w : qAsConst(m_additionalToolBarWidgets)) + for (QWidget *w : std::as_const(m_additionalToolBarWidgets)) delete w; m_additionalToolBarWidgets.clear(); @@ -111,7 +111,7 @@ void NavigationSubWidget::comboBoxIndexChanged(int factoryIndex) // Add Toolbutton m_additionalToolBarWidgets = n.dockToolBarWidgets; auto layout = qobject_cast<QHBoxLayout *>(m_toolBar->layout()); - for (QToolButton *w : qAsConst(m_additionalToolBarWidgets)) + for (QToolButton *w : std::as_const(m_additionalToolBarWidgets)) layout->insertWidget(layout->count()-2, w); restoreSettings(); diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp index f3fde110bdb..9a76f1d5fe6 100644 --- a/src/plugins/coreplugin/navigationwidget.cpp +++ b/src/plugins/coreplugin/navigationwidget.cpp @@ -223,7 +223,7 @@ QWidget *NavigationWidget::activateSubWidget(Id factoryId, Side fallbackSide) void NavigationWidget::setFactories(const QList<INavigationWidgetFactory *> &factories) { Context navicontext(Constants::C_NAVIGATION_PANE); - for (INavigationWidgetFactory *factory : qAsConst(factories)) { + for (INavigationWidgetFactory *factory : std::as_const(factories)) { const Id id = factory->id(); const Id actionId = id.withPrefix("QtCreator.Sidebar."); @@ -334,7 +334,7 @@ Internal::NavigationSubWidget *NavigationWidget::insertSubItem(int position, int QWidget *NavigationWidget::activateSubWidget(Id factoryId, int preferredPosition) { setShown(true); - for (Internal::NavigationSubWidget *subWidget : qAsConst(d->m_subWidgets)) { + for (Internal::NavigationSubWidget *subWidget : std::as_const(d->m_subWidgets)) { if (subWidget->factory()->id() == factoryId) { subWidget->setFocusWidget(); ICore::raiseWindow(this); @@ -434,7 +434,7 @@ void NavigationWidget::restoreSettings(QSettings *settings) } int position = 0; - for (const QString &id : qAsConst(viewIds)) { + for (const QString &id : std::as_const(viewIds)) { int index = factoryIndex(Id::fromString(id)); if (index >= 0) { // Only add if the id was actually found! @@ -486,7 +486,7 @@ void NavigationWidget::restoreSettings(QSettings *settings) void NavigationWidget::closeSubWidgets() { - for (Internal::NavigationSubWidget *subWidget : qAsConst(d->m_subWidgets)) { + for (Internal::NavigationSubWidget *subWidget : std::as_const(d->m_subWidgets)) { subWidget->saveSettings(); delete subWidget; } diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp index 4c7bbc3d3a5..aef455785e2 100644 --- a/src/plugins/coreplugin/outputpane.cpp +++ b/src/plugins/coreplugin/outputpane.cpp @@ -104,7 +104,7 @@ void OutputPanePlaceHolder::setMaximized(bool maximize) if (maximize) { d->m_nonMaximizedSize = sizes[idx]; int sum = 0; - for (const int s : qAsConst(sizes)) + for (const int s : std::as_const(sizes)) sum += s; for (int i = 0; i < sizes.count(); ++i) { sizes[i] = 32; diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp index b2ae43059f4..8d8f5e7b29d 100644 --- a/src/plugins/coreplugin/outputwindow.cpp +++ b/src/plugins/coreplugin/outputwindow.cpp @@ -551,7 +551,7 @@ void OutputWindow::flush() return; } d->queueTimer.stop(); - for (const auto &chunk : qAsConst(d->queuedOutput)) + for (const auto &chunk : std::as_const(d->queuedOutput)) handleOutputChunk(chunk.first, chunk.second); d->queuedOutput.clear(); d->formatter.flush(); diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp index 682cbb38e7d..1800d562946 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp @@ -515,7 +515,7 @@ void ProgressManagerPrivate::stopFadeOfSummaryProgress() bool ProgressManagerPrivate::hasError() const { - for (const FutureProgress *progress : qAsConst(m_taskList)) + for (const FutureProgress *progress : std::as_const(m_taskList)) if (progress->hasError()) return true; return false; @@ -525,7 +525,7 @@ bool ProgressManagerPrivate::isLastFading() const { if (m_taskList.isEmpty()) return false; - for (const FutureProgress *progress : qAsConst(m_taskList)) { + for (const FutureProgress *progress : std::as_const(m_taskList)) { if (!progress->isFading()) // we still have progress bars that are not fading return false; } @@ -567,7 +567,7 @@ void ProgressManagerPrivate::removeOneOldTask() Id type = (*i)->type(); int taskCount = 0; - for (const FutureProgress *p : qAsConst(m_taskList)) + for (const FutureProgress *p : std::as_const(m_taskList)) if (p->type() == type) ++taskCount; diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp index 4c327835827..f7b833d4dac 100644 --- a/src/plugins/coreplugin/sidebar.cpp +++ b/src/plugins/coreplugin/sidebar.cpp @@ -63,13 +63,13 @@ SideBar::SideBar(QList<SideBarItem*> itemList, d(new SideBarPrivate) { setOrientation(Qt::Vertical); - for (SideBarItem *item : qAsConst(itemList)) { + for (SideBarItem *item : std::as_const(itemList)) { d->m_itemMap.insert(item->id(), item); d->m_availableItemIds.append(item->id()); d->m_availableItemTitles.append(item->title()); } - for (SideBarItem *item : qAsConst(defaultVisible)) { + for (SideBarItem *item : std::as_const(defaultVisible)) { if (!itemList.contains(item)) continue; d->m_defaultVisible.append(item->id()); @@ -78,7 +78,7 @@ SideBar::SideBar(QList<SideBarItem*> itemList, SideBar::~SideBar() { - for (const QPointer<SideBarItem> &i : qAsConst(d->m_itemMap)) + for (const QPointer<SideBarItem> &i : std::as_const(d->m_itemMap)) if (!i.isNull()) delete i.data(); delete d; @@ -138,7 +138,7 @@ void SideBar::makeItemAvailable(SideBarItem *item) void SideBar::setUnavailableItemIds(const QStringList &itemIds) { // re-enable previous items - for (const QString &id : qAsConst(d->m_unavailableItemIds)) { + for (const QString &id : std::as_const(d->m_unavailableItemIds)) { d->m_availableItemIds.append(id); d->m_availableItemTitles.append(d->m_itemMap.value(id).data()->title()); } @@ -224,7 +224,7 @@ void SideBar::closeSubWidget(Internal::SideBarWidget *widget) void SideBar::updateWidgets() { - for (Internal::SideBarWidget *i : qAsConst(d->m_widgets)) + for (Internal::SideBarWidget *i : std::as_const(d->m_widgets)) i->updateAvailableItems(); } @@ -250,7 +250,7 @@ void SideBar::saveSettings(QSettings *settings, const QString &name) void SideBar::closeAllWidgets() { - for (Internal::SideBarWidget *widget : qAsConst(d->m_widgets)) + for (Internal::SideBarWidget *widget : std::as_const(d->m_widgets)) removeSideBarWidget(widget); } @@ -273,7 +273,7 @@ void SideBar::readSettings(QSettings *settings, const QString &name) } } if (d->m_widgets.size() == 0) { - for (const QString &id : qAsConst(d->m_defaultVisible)) + for (const QString &id : std::as_const(d->m_defaultVisible)) insertSideBarWidget(d->m_widgets.count(), id); } diff --git a/src/plugins/coreplugin/sidebarwidget.cpp b/src/plugins/coreplugin/sidebarwidget.cpp index e0497a8efde..35c183001c4 100644 --- a/src/plugins/coreplugin/sidebarwidget.cpp +++ b/src/plugins/coreplugin/sidebarwidget.cpp @@ -68,7 +68,7 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &id) Utils::sort(titleList); QString t = id; if (!titleList.isEmpty()) { - for (const QString &itemTitle : qAsConst(titleList)) + for (const QString &itemTitle : std::as_const(titleList)) m_comboBox->addItem(itemTitle, m_sideBar->idForTitle(itemTitle)); m_comboBox->setCurrentIndex(0); @@ -131,7 +131,7 @@ void SideBarWidget::updateAvailableItems() titleList.append(currentTitle); Utils::sort(titleList); - for (const QString &itemTitle : qAsConst(titleList)) + for (const QString &itemTitle : std::as_const(titleList)) m_comboBox->addItem(itemTitle, m_sideBar->idForTitle(itemTitle)); int idx = m_comboBox->findText(currentTitle); diff --git a/src/plugins/coreplugin/statusbarmanager.cpp b/src/plugins/coreplugin/statusbarmanager.cpp index 80a2a04dddf..79ef861dd0a 100644 --- a/src/plugins/coreplugin/statusbarmanager.cpp +++ b/src/plugins/coreplugin/statusbarmanager.cpp @@ -91,7 +91,7 @@ static void createStatusBarManager() delete statusContext; // This is the catch-all on rampdown. Individual items may // have been removed earlier by destroyStatusBarWidget(). - for (const QPointer<IContext> &context : qAsConst(m_contexts)) { + for (const QPointer<IContext> &context : std::as_const(m_contexts)) { ICore::removeContextObject(context); delete context; } diff --git a/src/plugins/coreplugin/themechooser.cpp b/src/plugins/coreplugin/themechooser.cpp index b19808746a9..1724c6e2cc8 100644 --- a/src/plugins/coreplugin/themechooser.cpp +++ b/src/plugins/coreplugin/themechooser.cpp @@ -179,7 +179,7 @@ static void addThemesFromPath(const QString &path, QList<ThemeEntry> *themes) themeDir.setNameFilters({extension}); themeDir.setFilter(QDir::Files); const QStringList themeList = themeDir.entryList(); - for (const QString &fileName : qAsConst(themeList)) { + for (const QString &fileName : std::as_const(themeList)) { QString id = QFileInfo(fileName).completeBaseName(); themes->append(ThemeEntry(Id::fromString(id), themeDir.absoluteFilePath(fileName))); } diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index 735a813137e..e547ba8ab64 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -544,7 +544,7 @@ void CorePlugin::testVcsManager() // From VCSes: int expectedCount = 0; - for (const QString &result : qAsConst(results)) { + for (const QString &result : std::as_const(results)) { // qDebug() << "Expecting:" << result; const QStringList split = result.split(QLatin1Char(':')); diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index edc3913ccdc..0a9d3c137e6 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -174,7 +174,7 @@ CodePasterPluginPrivate::CodePasterPluginPrivate() ExtensionSystem::IPlugin::ShutdownFlag CodePasterPlugin::aboutToShutdown() { // Delete temporary, fetched files - for (const QString &fetchedSnippet : qAsConst(d->m_fetchedSnippets)) { + for (const QString &fetchedSnippet : std::as_const(d->m_fetchedSnippets)) { QFile file(fetchedSnippet); if (file.exists()) file.remove(); diff --git a/src/plugins/cppcheck/cppchecktool.cpp b/src/plugins/cppcheck/cppchecktool.cpp index cff9d6bc67b..af8e123dcaf 100644 --- a/src/plugins/cppcheck/cppchecktool.cpp +++ b/src/plugins/cppcheck/cppchecktool.cpp @@ -194,7 +194,7 @@ void CppcheckTool::check(const Utils::FilePaths &files) } std::map<CppEditor::ProjectPart::ConstPtr, Utils::FilePaths> groups; - for (const Utils::FilePath &file : qAsConst(filtered)) { + for (const Utils::FilePath &file : std::as_const(filtered)) { const QString stringed = file.toString(); for (const CppEditor::ProjectPart::ConstPtr &part : parts) { using CppEditor::ProjectFile; diff --git a/src/plugins/cppeditor/builtineditordocumentparser.cpp b/src/plugins/cppeditor/builtineditordocumentparser.cpp index d06806a2037..7d3a2430e84 100644 --- a/src/plugins/cppeditor/builtineditordocumentparser.cpp +++ b/src/plugins/cppeditor/builtineditordocumentparser.cpp @@ -136,7 +136,7 @@ void BuiltinEditorDocumentParser::updateImpl(const QFutureInterface<void> &futur } else { // Remove changed files from the snapshot QSet<Utils::FilePath> toRemove; - for (const Document::Ptr &doc : qAsConst(state.snapshot)) { + for (const Document::Ptr &doc : std::as_const(state.snapshot)) { const Utils::FilePath fileName = Utils::FilePath::fromString(doc->fileName()); if (workingCopy.contains(fileName)) { if (workingCopy.get(fileName).second != doc->editorRevision()) @@ -150,7 +150,7 @@ void BuiltinEditorDocumentParser::updateImpl(const QFutureInterface<void> &futur if (!toRemove.isEmpty()) { invalidateSnapshot = true; - for (const Utils::FilePath &fileName : qAsConst(toRemove)) + for (const Utils::FilePath &fileName : std::as_const(toRemove)) state.snapshot.remove(fileName); } } @@ -189,7 +189,7 @@ void BuiltinEditorDocumentParser::updateImpl(const QFutureInterface<void> &futur sourceProcessor.setLanguageFeatures(features); sourceProcessor.run(configurationFileName); if (baseConfig.usePrecompiledHeaders) { - for (const QString &precompiledHeader : qAsConst(state.precompiledHeaders)) + for (const QString &precompiledHeader : std::as_const(state.precompiledHeaders)) sourceProcessor.run(precompiledHeader); } if (!baseState.editorDefines.isEmpty()) diff --git a/src/plugins/cppeditor/builtinindexingsupport.cpp b/src/plugins/cppeditor/builtinindexingsupport.cpp index 1f65f28f047..81d8b11c2c5 100644 --- a/src/plugins/cppeditor/builtinindexingsupport.cpp +++ b/src/plugins/cppeditor/builtinindexingsupport.cpp @@ -168,7 +168,7 @@ void index(QFutureInterface<void> &indexingFuture, QStringList headers; classifyFiles(params.sourceFiles, &headers, &sources); - for (const QString &file : qAsConst(params.sourceFiles)) + for (const QString &file : std::as_const(params.sourceFiles)) sourceProcessor->removeFromCache(file); const int sourceCount = sources.size(); diff --git a/src/plugins/cppeditor/compileroptionsbuilder.cpp b/src/plugins/cppeditor/compileroptionsbuilder.cpp index a0deb3a9193..a1b151de2a2 100644 --- a/src/plugins/cppeditor/compileroptionsbuilder.cpp +++ b/src/plugins/cppeditor/compileroptionsbuilder.cpp @@ -348,9 +348,9 @@ void CompilerOptionsBuilder::addHeaderPathOptions() filter.process(); - for (const HeaderPath &headerPath : qAsConst(filter.userHeaderPaths)) + for (const HeaderPath &headerPath : std::as_const(filter.userHeaderPaths)) addIncludeDirOptionForPath(headerPath); - for (const HeaderPath &headerPath : qAsConst(filter.systemHeaderPaths)) + for (const HeaderPath &headerPath : std::as_const(filter.systemHeaderPaths)) addIncludeDirOptionForPath(headerPath); if (m_useTweakedHeaderPaths != UseTweakedHeaderPaths::No) { @@ -359,7 +359,7 @@ void CompilerOptionsBuilder::addHeaderPathOptions() m_options.prepend("-nostdinc++"); m_options.prepend("-nostdinc"); - for (const HeaderPath &headerPath : qAsConst(filter.builtInHeaderPaths)) + for (const HeaderPath &headerPath : std::as_const(filter.builtInHeaderPaths)) addIncludeDirOptionForPath(headerPath); } } diff --git a/src/plugins/cppeditor/cppchecksymbols.cpp b/src/plugins/cppeditor/cppchecksymbols.cpp index 0d0a8746967..1621f6ae51f 100644 --- a/src/plugins/cppeditor/cppchecksymbols.cpp +++ b/src/plugins/cppeditor/cppchecksymbols.cpp @@ -1120,7 +1120,7 @@ bool CheckSymbols::visit(FunctionDefinitionAST *ast) accept(ast->function_body); const Internal::LocalSymbols locals(_doc, ast); - for (const QList<Result> &uses : qAsConst(locals.uses)) { + for (const QList<Result> &uses : std::as_const(locals.uses)) { for (const Result &u : uses) addUse(u); } diff --git a/src/plugins/cppeditor/cppcodeformatter.cpp b/src/plugins/cppeditor/cppcodeformatter.cpp index e7479ec71c6..ab2b8506b6f 100644 --- a/src/plugins/cppeditor/cppcodeformatter.cpp +++ b/src/plugins/cppeditor/cppcodeformatter.cpp @@ -1090,7 +1090,7 @@ void CodeFormatter::dump() const qDebug() << "Current token index" << m_tokenIndex; qDebug() << "Current state:"; - for (const State &s : qAsConst(m_currentState)) + for (const State &s : std::as_const(m_currentState)) qDebug() << metaEnum.valueToKey(s.type) << s.savedIndentDepth << s.savedPaddingDepth; qDebug() << "Current indent depth:" << m_indentDepth; diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp index 509fbf8a9c4..f17f5c1f62f 100644 --- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp +++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp @@ -1117,7 +1117,7 @@ void ProjectPartsModel::configure(const QList<ProjectInfo::ConstPtr> &projectInf { emit layoutAboutToBeChanged(); m_projectPartsList.clear(); - for (const ProjectInfo::ConstPtr &info : qAsConst(projectInfos)) { + for (const ProjectInfo::ConstPtr &info : std::as_const(projectInfos)) { const QVector<ProjectPart::ConstPtr> projectParts = info->projectParts(); for (const ProjectPart::ConstPtr &projectPart : projectParts) { if (!m_projectPartsList.contains(projectPart)) { @@ -1139,7 +1139,7 @@ QModelIndex ProjectPartsModel::indexForCurrentEditorsProjectPart() const ProjectPart::ConstPtr ProjectPartsModel::projectPartForProjectId(const QString &projectPartId) const { - for (const ProjectPart::ConstPtr &part : qAsConst(m_projectPartsList)) { + for (const ProjectPart::ConstPtr &part : std::as_const(m_projectPartsList)) { if (part->id() == projectPartId) return part; } diff --git a/src/plugins/cppeditor/cppcodemodelinspectordumper.cpp b/src/plugins/cppeditor/cppcodemodelinspectordumper.cpp index cf656aa8387..6b4429574e8 100644 --- a/src/plugins/cppeditor/cppcodemodelinspectordumper.cpp +++ b/src/plugins/cppeditor/cppcodemodelinspectordumper.cpp @@ -521,7 +521,7 @@ void Dumper::dumpProjectInfos(const QList<ProjectInfo::ConstPtr> &projectInfos) if (!part->files.isEmpty()) { m_out << i3 << "Files:{{{4\n"; - for (const ProjectFile &projectFile : qAsConst(part->files)) { + for (const ProjectFile &projectFile : std::as_const(part->files)) { m_out << i4 << Utils::toString(projectFile.kind) << ": " << projectFile.path; if (!projectFile.active) m_out << " (inactive)"; @@ -546,7 +546,7 @@ void Dumper::dumpProjectInfos(const QList<ProjectInfo::ConstPtr> &projectInfos) if (!part->headerPaths.isEmpty()) { m_out << i3 << "Header Paths:{{{4\n"; - for (const ProjectExplorer::HeaderPath &headerPath : qAsConst(part->headerPaths)) { + for (const ProjectExplorer::HeaderPath &headerPath : std::as_const(part->headerPaths)) { m_out << i4 << headerPath.path; printIncludeType(m_out, headerPath.type); m_out << "\n"; @@ -555,7 +555,7 @@ void Dumper::dumpProjectInfos(const QList<ProjectInfo::ConstPtr> &projectInfos) if (!part->precompiledHeaders.isEmpty()) { m_out << i3 << "Precompiled Headers:{{{4\n"; - for (const QString &precompiledHeader : qAsConst(part->precompiledHeaders)) + for (const QString &precompiledHeader : std::as_const(part->precompiledHeaders)) m_out << i4 << precompiledHeader << "\n"; } } // for part diff --git a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp index df3575b9b91..476a3dae5c1 100644 --- a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp +++ b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp @@ -347,7 +347,7 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD QInputDialog dlg(sessionsView); QStringList sessions = ProjectExplorer::SessionManager::sessions(); QStringList currentSessions = d->sessionsModel.stringList(); - for (const QString &s : qAsConst(currentSessions)) + for (const QString &s : std::as_const(currentSessions)) sessions.removeOne(s); if (sessions.isEmpty()) return; diff --git a/src/plugins/cppeditor/cppcodestylesettingspage.cpp b/src/plugins/cppeditor/cppcodestylesettingspage.cpp index 5880d0fab03..225f8fcfdb3 100644 --- a/src/plugins/cppeditor/cppcodestylesettingspage.cpp +++ b/src/plugins/cppeditor/cppcodestylesettingspage.cpp @@ -285,7 +285,7 @@ void CppCodeStylePreferencesWidget::updatePreview() const CppCodeStyleSettings ccss = cppCodeStylePreferences->currentCodeStyleSettings(); const TabSettings ts = cppCodeStylePreferences->currentTabSettings(); QtStyleCodeFormatter formatter(ts, ccss); - for (SnippetEditorWidget *preview : qAsConst(m_previews)) { + for (SnippetEditorWidget *preview : std::as_const(m_previews)) { preview->textDocument()->setTabSettings(ts); preview->setCodeStyle(cppCodeStylePreferences); @@ -307,7 +307,7 @@ void CppCodeStylePreferencesWidget::updatePreview() void CppCodeStylePreferencesWidget::decorateEditors(const FontSettings &fontSettings) { - for (SnippetEditorWidget *editor : qAsConst(m_previews)) { + for (SnippetEditorWidget *editor : std::as_const(m_previews)) { editor->textDocument()->setFontSettings(fontSettings); SnippetProvider::decorateEditor(editor, CppEditor::Constants::CPP_SNIPPETS_GROUP_ID); } @@ -315,7 +315,7 @@ void CppCodeStylePreferencesWidget::decorateEditors(const FontSettings &fontSett void CppCodeStylePreferencesWidget::setVisualizeWhitespace(bool on) { - for (SnippetEditorWidget *editor : qAsConst(m_previews)) { + for (SnippetEditorWidget *editor : std::as_const(m_previews)) { DisplaySettings displaySettings = editor->displaySettings(); displaySettings.m_visualizeWhitespace = on; editor->setDisplaySettings(displaySettings); diff --git a/src/plugins/cppeditor/cppcompletion_test.cpp b/src/plugins/cppeditor/cppcompletion_test.cpp index dff0fd4508f..956ebb9faa7 100644 --- a/src/plugins/cppeditor/cppcompletion_test.cpp +++ b/src/plugins/cppeditor/cppcompletion_test.cpp @@ -258,7 +258,7 @@ void CompletionTest::testCompletionTemplateFunction() QStringList actualCompletions = test.getCompletions(); QString errorPattern(QLatin1String("Completion not found: %1")); - for (const QString &completion : qAsConst(expectedCompletions)) { + for (const QString &completion : std::as_const(expectedCompletions)) { QByteArray errorMessage = errorPattern.arg(completion).toUtf8(); QVERIFY2(actualCompletions.contains(completion), errorMessage.data()); } diff --git a/src/plugins/cppeditor/cppcompletionassist.cpp b/src/plugins/cppeditor/cppcompletionassist.cpp index 68c2a9d8e18..c5eb9f2c41b 100644 --- a/src/plugins/cppeditor/cppcompletionassist.cpp +++ b/src/plugins/cppeditor/cppcompletionassist.cpp @@ -1153,7 +1153,7 @@ void InternalCppCompletionAssistProcessor::completeObjCMsgSend(ClassOrNamespace memberScopes.append(c); } - for (Scope *scope : qAsConst(memberScopes)) { + for (Scope *scope : std::as_const(memberScopes)) { for (int i = 0; i < scope->memberCount(); ++i) { Symbol *symbol = scope->memberAt(i); @@ -1218,7 +1218,7 @@ bool InternalCppCompletionAssistProcessor::completeInclude(const QTextCursor &cu const QStringList suffixes = Utils::mimeTypeForName(QLatin1String("text/x-c++hdr")).suffixes(); - for (const ProjectExplorer::HeaderPath &headerPath : qAsConst(headerPaths)) { + for (const ProjectExplorer::HeaderPath &headerPath : std::as_const(headerPaths)) { QString realPath = headerPath.path; if (!directoryPrefix.isEmpty()) { realPath += QLatin1Char('/'); @@ -1476,7 +1476,7 @@ bool InternalCppCompletionAssistProcessor::globalCompletion(Scope *currentScope) } } - for (ClassOrNamespace *b : qAsConst(usingBindings)) + for (ClassOrNamespace *b : std::as_const(usingBindings)) completeNamespace(b); addKeywords(); @@ -1750,7 +1750,7 @@ bool InternalCppCompletionAssistProcessor::completeQtMethod(const QList<LookupIt const bool wantSignals = type == CompleteQt4Signals || type == CompleteQt5Signals; const bool wantQt5SignalOrSlot = type == CompleteQt5Signals || type == CompleteQt5Slots; - for (Scope *scope : qAsConst(scopes)) { + for (Scope *scope : std::as_const(scopes)) { Class *klass = scope->asClass(); if (!klass) continue; @@ -1850,7 +1850,7 @@ void InternalCppCompletionAssistProcessor::addMacros(const QString &fileName, addMacros_helper(snapshot, fileName, &processed, &definedMacros); - for (const QString ¯oName : qAsConst(definedMacros)) + for (const QString ¯oName : std::as_const(definedMacros)) addCompletionItem(macroName, Icons::macroIcon(), MacrosOrder); } @@ -1932,7 +1932,7 @@ bool InternalCppCompletionAssistProcessor::completeConstructorOrFunction(const Q bool newOverload = true; - for (Function *f : qAsConst(functions)) { + for (Function *f : std::as_const(functions)) { if (fun->match(f)) { newOverload = false; break; @@ -2045,7 +2045,7 @@ bool InternalCppCompletionAssistProcessor::completeConstructorOrFunction(const Q Control *control = context.bindings()->control().data(); // set up signature autocompletion - for (Function *f : qAsConst(functions)) { + for (Function *f : std::as_const(functions)) { Overview overview; overview.showArgumentNames = true; overview.showDefaultArguments = false; diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp index 3ce2884553c..3bf52d996df 100644 --- a/src/plugins/cppeditor/cppeditorplugin.cpp +++ b/src/plugins/cppeditor/cppeditorplugin.cpp @@ -829,8 +829,8 @@ QString correspondingHeaderOrSource(const QString &fileName, bool *wasHeader, Ca candidateFileNames += baseNamesWithAllPrefixes(candidateFileNames, isHeader); // Try to find a file in the same or sibling directories first - for (const QString &candidateDir : qAsConst(candidateDirs)) { - for (const QString &candidateFileName : qAsConst(candidateFileNames)) { + for (const QString &candidateDir : std::as_const(candidateDirs)) { + for (const QString &candidateFileName : std::as_const(candidateFileNames)) { const QString candidateFilePath = candidateDir + QLatin1Char('/') + candidateFileName; const QString normalized = FileUtils::normalizedPathName(candidateFilePath); const QFileInfo candidateFi(normalized); diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp index 2ec33edc30b..62a25ea960c 100644 --- a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp +++ b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp @@ -196,7 +196,7 @@ ClassItem::~ClassItem() Qt::ItemFlags ClassItem::flags() const { - for (FunctionItem *func : qAsConst(functions)) { + for (FunctionItem *func : std::as_const(functions)) { if (!func->alreadyFound) return Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled; } @@ -209,7 +209,7 @@ Qt::CheckState ClassItem::checkState() const if (functions.isEmpty()) return Qt::Unchecked; Qt::CheckState state = functions.first()->checkState(); - for (FunctionItem *function : qAsConst(functions)) { + for (FunctionItem *function : std::as_const(functions)) { Qt::CheckState functionState = function->checkState(); if (functionState != state) return Qt::PartiallyChecked; @@ -469,7 +469,7 @@ public: } } else { auto classItem = static_cast<ClassItem *>(item); - for (FunctionItem *funcItem : qAsConst(classItem->functions)) { + for (FunctionItem *funcItem : std::as_const(classItem->functions)) { if (funcItem->alreadyFound || funcItem->checked == checked) continue; QModelIndex funcIndex = createIndex(funcItem->row, 0, funcItem); @@ -576,7 +576,7 @@ public: Overview printer = CppCodeStyleSettings::currentProjectCodeStyleOverview(); printer.showFunctionSignatures = true; QHash<const Function *, FunctionItem *> virtualFunctions; - for (const Class *clazz : qAsConst(baseClasses)) { + for (const Class *clazz : std::as_const(baseClasses)) { ClassItem *itemBase = new ClassItem(printer.prettyName(clazz->name()), clazz); for (Scope::iterator it = clazz->memberBegin(); it != clazz->memberEnd(); ++it) { if (const Function *func = (*it)->type()->asFunctionType()) { @@ -592,7 +592,7 @@ public: continue; if (func->isFinal()) { - for (const Function *firstVirtual : qAsConst(firstVirtuals)) { + for (const Function *firstVirtual : std::as_const(firstVirtuals)) { if (FunctionItem *first = virtualFunctions[firstVirtual]) { FunctionItem *next = nullptr; for (FunctionItem *removed = first; next != first; removed = next) { @@ -610,7 +610,7 @@ public: // - virtual void *qt_metacast(const char *); // - virtual int qt_metacall(QMetaObject::Call, int, void **); bool skip = false; - for (const Function *firstVirtual : qAsConst(firstVirtuals)) { + for (const Function *firstVirtual : std::as_const(firstVirtuals)) { if (printer.prettyName(firstVirtual->enclosingClass()->name()) == "QObject" && magicQObjectFunctions().contains( printer.prettyName(func->name()))) { @@ -653,7 +653,7 @@ public: factory->setHasReimplementedFunctions(true); funcItem->reimplemented = true; funcItem->alreadyFound = funcExistsInClass; - for (const Function *firstVirtual : qAsConst(firstVirtuals)) { + for (const Function *firstVirtual : std::as_const(firstVirtuals)) { if (FunctionItem *first = virtualFunctions[firstVirtual]) { if (!first->alreadyFound) { while (first->checked != isPureVirtual) { @@ -773,14 +773,14 @@ public: UseMinimalNames useMinimalNames(targetCoN); Control *control = context().bindings()->control().data(); QList<const Function *> insertedFunctions; - for (ClassItem *classItem : qAsConst(m_factory->classFunctionModel->classes)) { + for (ClassItem *classItem : std::as_const(m_factory->classFunctionModel->classes)) { if (classItem->checkState() == Qt::Unchecked) continue; // Insert Declarations (+ definitions) QString lastAccessSpecString; bool first = true; - for (FunctionItem *funcItem : qAsConst(classItem->functions)) { + for (FunctionItem *funcItem : std::as_const(classItem->functions)) { if (funcItem->reimplemented || funcItem->alreadyFound || !funcItem->checked) continue; @@ -1198,7 +1198,7 @@ void InsertVirtualMethodsDialog::setHideReimplementedFunctions(bool hide) void InsertVirtualMethodsDialog::updateOverrideReplacementsComboBox() { m_overrideReplacementComboBox->clear(); - for (const QString &replacement : qAsConst(m_availableOverrideReplacements)) + for (const QString &replacement : std::as_const(m_availableOverrideReplacements)) m_overrideReplacementComboBox->addItem(replacement); } diff --git a/src/plugins/cppeditor/cpplocatordata.cpp b/src/plugins/cppeditor/cpplocatordata.cpp index 97c47cc0daa..3349011ce91 100644 --- a/src/plugins/cppeditor/cpplocatordata.cpp +++ b/src/plugins/cppeditor/cpplocatordata.cpp @@ -69,7 +69,7 @@ void CppLocatorData::flushPendingDocument(bool force) const if (m_pendingDocuments.isEmpty()) return; - for (CPlusPlus::Document::Ptr doc : qAsConst(m_pendingDocuments)) + for (CPlusPlus::Document::Ptr doc : std::as_const(m_pendingDocuments)) m_infosByFile.insert(Internal::StringTable::insert(doc->fileName()), m_search(doc)); m_pendingDocuments.clear(); diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp index c3de62dc27f..da8fdb53f62 100644 --- a/src/plugins/cppeditor/cppmodelmanager.cpp +++ b/src/plugins/cppeditor/cppmodelmanager.cpp @@ -850,7 +850,7 @@ void CppModelManager::ensureUpdated() QStringList CppModelManager::internalProjectFiles() const { QStringList files; - for (const ProjectData &projectData : qAsConst(d->m_projectData)) { + for (const ProjectData &projectData : std::as_const(d->m_projectData)) { for (const ProjectPart::ConstPtr &part : projectData.projectInfo->projectParts()) { for (const ProjectFile &file : part->files) files += file.path; @@ -863,7 +863,7 @@ QStringList CppModelManager::internalProjectFiles() const ProjectExplorer::HeaderPaths CppModelManager::internalHeaderPaths() const { ProjectExplorer::HeaderPaths headerPaths; - for (const ProjectData &projectData: qAsConst(d->m_projectData)) { + for (const ProjectData &projectData: std::as_const(d->m_projectData)) { for (const ProjectPart::ConstPtr &part : projectData.projectInfo->projectParts()) { for (const ProjectExplorer::HeaderPath &path : part->headerPaths) { ProjectExplorer::HeaderPath hp(QDir::cleanPath(path.path), path.type); @@ -891,7 +891,7 @@ ProjectExplorer::Macros CppModelManager::internalDefinedMacros() const { ProjectExplorer::Macros macros; QSet<ProjectExplorer::Macro> alreadyIn; - for (const ProjectData &projectData : qAsConst(d->m_projectData)) { + for (const ProjectData &projectData : std::as_const(d->m_projectData)) { for (const ProjectPart::ConstPtr &part : projectData.projectInfo->projectParts()) { addUnique(part->toolChainMacros, macros, alreadyIn); addUnique(part->projectMacros, macros, alreadyIn); @@ -1023,7 +1023,7 @@ WorkingCopy CppModelManager::buildWorkingCopyList() cppEditorDocument->revision()); } - for (AbstractEditorSupport *es : qAsConst(d->m_extraEditorSupports)) + for (AbstractEditorSupport *es : std::as_const(d->m_extraEditorSupports)) workingCopy.insert(es->fileName(), es->contents(), es->revision()); // Add the project configuration file @@ -1097,7 +1097,7 @@ void CppModelManager::removeProjectInfoFilesAndIncludesFromSnapshot(const Projec { QMutexLocker snapshotLocker(&d->m_snapshotMutex); for (const ProjectPart::ConstPtr &projectPart : projectInfo.projectParts()) { - for (const ProjectFile &cxxFile : qAsConst(projectPart->files)) { + for (const ProjectFile &cxxFile : std::as_const(projectPart->files)) { const QSet<QString> fileNames = d->m_snapshot.allIncludesForDocument(cxxFile.path); for (const QString &fileName : fileNames) d->m_snapshot.remove(fileName); @@ -1195,7 +1195,7 @@ void CppModelManager::recalculateProjectPartMappings() { d->m_projectPartIdToProjectProjectPart.clear(); d->m_fileToProjectParts.clear(); - for (const ProjectData &projectData : qAsConst(d->m_projectData)) { + for (const ProjectData &projectData : std::as_const(d->m_projectData)) { for (const ProjectPart::ConstPtr &projectPart : projectData.projectInfo->projectParts()) { d->m_projectPartIdToProjectProjectPart[projectPart->id()] = projectPart; for (const ProjectFile &cxxFile : projectPart->files) @@ -1245,7 +1245,7 @@ void CppModelManager::updateCppEditorDocuments(bool projectsUpdated) const QSet<Core::IDocument *> invisibleCppEditorDocuments = Utils::toSet(Core::DocumentModel::openedDocuments()); invisibleCppEditorDocuments.subtract(visibleCppEditorDocuments); - for (Core::IDocument *document : qAsConst(invisibleCppEditorDocuments)) { + for (Core::IDocument *document : std::as_const(invisibleCppEditorDocuments)) { const QString filePath = document->filePath().toString(); if (CppEditorDocumentHandle *theCppEditorDocument = cppEditorDocument(filePath)) { const CppEditorDocumentHandle::RefreshReason refreshReason = projectsUpdated @@ -1528,7 +1528,7 @@ QSet<QString> CppModelManager::dependingInternalTargets(const Utils::FilePath &f = correspondingHeaderOrSource(file.toString(), &wasHeader, CacheUsage::ReadOnly); const Utils::FilePaths dependingFiles = snapshot.filesDependingOn( wasHeader ? file : Utils::FilePath::fromString(correspondingFile)); - for (const Utils::FilePath &fn : qAsConst(dependingFiles)) { + for (const Utils::FilePath &fn : std::as_const(dependingFiles)) { for (const ProjectPart::ConstPtr &part : projectPart(fn)) result.insert(part->buildSystemTarget); } diff --git a/src/plugins/cppeditor/cppmodelmanager_test.cpp b/src/plugins/cppeditor/cppmodelmanager_test.cpp index 5f0deb7af94..42ce1809472 100644 --- a/src/plugins/cppeditor/cppmodelmanager_test.cpp +++ b/src/plugins/cppeditor/cppmodelmanager_test.cpp @@ -470,7 +470,7 @@ void ModelManagerTest::testRefreshTimeStampModifiedIfSourcefilesChange() QCOMPARE(refreshedFiles.size(), initialProjectFiles.size()); snapshot = mm->snapshot(); - for (const QString &file : qAsConst(initialProjectFiles)) { + for (const QString &file : std::as_const(initialProjectFiles)) { QVERIFY(refreshedFiles.contains(file)); QVERIFY(snapshot.contains(file)); } @@ -499,7 +499,7 @@ void ModelManagerTest::testRefreshTimeStampModifiedIfSourcefilesChange() QCOMPARE(refreshedFiles.size(), finalProjectFiles.size()); snapshot = mm->snapshot(); - for (const QString &file : qAsConst(finalProjectFiles)) { + for (const QString &file : std::as_const(finalProjectFiles)) { QVERIFY(refreshedFiles.contains(file)); QVERIFY(snapshot.contains(file)); } @@ -550,7 +550,7 @@ void ModelManagerTest::testSnapshotAfterTwoProjects() QCOMPARE(refreshedFiles, Utils::toSet(project1.projectFiles)); const int snapshotSizeAfterProject1 = mm->snapshot().size(); - for (const QString &file : qAsConst(project1.projectFiles)) + for (const QString &file : std::as_const(project1.projectFiles)) QVERIFY(mm->snapshot().contains(file)); // Project 2 @@ -565,9 +565,9 @@ void ModelManagerTest::testSnapshotAfterTwoProjects() QVERIFY(snapshotSizeAfterProject2 > snapshotSizeAfterProject1); QVERIFY(snapshotSizeAfterProject2 >= snapshotSizeAfterProject1 + project2.projectFiles.size()); - for (const QString &file : qAsConst(project1.projectFiles)) + for (const QString &file : std::as_const(project1.projectFiles)) QVERIFY(mm->snapshot().contains(file)); - for (const QString &file : qAsConst(project2.projectFiles)) + for (const QString &file : std::as_const(project2.projectFiles)) QVERIFY(mm->snapshot().contains(file)); } @@ -995,7 +995,7 @@ void ModelManagerTest::testRenameIncludes() // Copy test files to a temporary directory QSet<QString> sourceFiles; - for (const QString &fileName : qAsConst(fileNames)) { + for (const QString &fileName : std::as_const(fileNames)) { const QString &file = workingDir.filePath(fileName); QVERIFY(QFile::copy(testDir.file(fileName), file)); // Saving source file names for the model manager update, @@ -1008,7 +1008,7 @@ void ModelManagerTest::testRenameIncludes() modelManager->updateSourceFiles(sourceFiles).waitForFinished(); QCoreApplication::processEvents(); CPlusPlus::Snapshot snapshot = modelManager->snapshot(); - for (const QString &sourceFile : qAsConst(sourceFiles)) + for (const QString &sourceFile : std::as_const(sourceFiles)) QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet<QString>{oldHeader}); // Renaming the header @@ -1020,7 +1020,7 @@ void ModelManagerTest::testRenameIncludes() modelManager->updateSourceFiles(sourceFiles).waitForFinished(); QCoreApplication::processEvents(); snapshot = modelManager->snapshot(); - for (const QString &sourceFile : qAsConst(sourceFiles)) + for (const QString &sourceFile : std::as_const(sourceFiles)) QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet<QString>{newHeader}); } @@ -1066,7 +1066,7 @@ void ModelManagerTest::testRenameIncludesInEditor() modelManager->updateSourceFiles(sourceFiles).waitForFinished(); QCoreApplication::processEvents(); CPlusPlus::Snapshot snapshot = modelManager->snapshot(); - for (const QString &sourceFile : qAsConst(sourceFiles)) + for (const QString &sourceFile : std::as_const(sourceFiles)) QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet<QString>{headerWithPragmaOnce}); // Open a file in the editor @@ -1144,7 +1144,7 @@ void ModelManagerTest::testRenameIncludesInEditor() modelManager->updateSourceFiles(sourceFiles).waitForFinished(); QCoreApplication::processEvents(); snapshot = modelManager->snapshot(); - for (const QString &sourceFile : qAsConst(sourceFiles)) + for (const QString &sourceFile : std::as_const(sourceFiles)) QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet<QString>{renamedHeaderWithPragmaOnce}); } diff --git a/src/plugins/cppeditor/cppprojectupdater.cpp b/src/plugins/cppeditor/cppprojectupdater.cpp index 6fbc01223cb..52d55457c48 100644 --- a/src/plugins/cppeditor/cppprojectupdater.cpp +++ b/src/plugins/cppeditor/cppprojectupdater.cpp @@ -66,7 +66,7 @@ void CppProjectUpdater::update(const ProjectUpdateInfo &projectUpdateInfo, m_futureSynchronizer.addFuture(generateFuture); // extra compilers - for (QPointer<ExtraCompiler> compiler : qAsConst(m_extraCompilers)) { + for (QPointer<ExtraCompiler> compiler : std::as_const(m_extraCompilers)) { if (compiler->isDirty()) { QPointer<QFutureWatcher<void>> watcher = new QFutureWatcher<void>; // queued connection to delay after the extra compiler updated its result contents, @@ -135,7 +135,7 @@ void CppProjectUpdater::checkForExtraCompilersFinished() QList<ExtraCompiler *> extraCompilers; QSet<QString> compilerFiles; - for (const QPointer<ExtraCompiler> &compiler : qAsConst(m_extraCompilers)) { + for (const QPointer<ExtraCompiler> &compiler : std::as_const(m_extraCompilers)) { if (compiler) { extraCompilers += compiler.data(); compilerFiles += Utils::transform<QSet>(compiler->targets(), &Utils::FilePath::toString); diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/cppquickfix_test.cpp index 0e5ad70b8e0..060eb808a93 100644 --- a/src/plugins/cppeditor/cppquickfix_test.cpp +++ b/src/plugins/cppeditor/cppquickfix_test.cpp @@ -69,7 +69,7 @@ BaseQuickFixTestCase::BaseQuickFixTestCase(const QList<TestDocumentPtr> &testDoc // Check if there is exactly one cursor marker unsigned cursorMarkersCount = 0; - for (const TestDocumentPtr &document : qAsConst(m_testDocuments)) { + for (const TestDocumentPtr &document : std::as_const(m_testDocuments)) { if (document->hasCursorMarker()) ++cursorMarkersCount; } @@ -78,7 +78,7 @@ BaseQuickFixTestCase::BaseQuickFixTestCase(const QList<TestDocumentPtr> &testDoc // Write documents to disk m_temporaryDirectory.reset(new TemporaryDir); QVERIFY(m_temporaryDirectory->isValid()); - for (const TestDocumentPtr &document : qAsConst(m_testDocuments)) { + for (const TestDocumentPtr &document : std::as_const(m_testDocuments)) { if (QFileInfo(document->m_fileName).isRelative()) document->setBaseDirectory(m_temporaryDirectory->path()); document->writeToDisk(); @@ -93,12 +93,12 @@ BaseQuickFixTestCase::BaseQuickFixTestCase(const QList<TestDocumentPtr> &testDoc // Update Code Model QSet<QString> filePaths; - for (const TestDocumentPtr &document : qAsConst(m_testDocuments)) + for (const TestDocumentPtr &document : std::as_const(m_testDocuments)) filePaths << document->filePath(); QVERIFY(parseFiles(filePaths)); // Open Files - for (const TestDocumentPtr &document : qAsConst(m_testDocuments)) { + for (const TestDocumentPtr &document : std::as_const(m_testDocuments)) { QVERIFY(openCppEditor(document->filePath(), &document->m_editor, &document->m_editorWidget)); closeEditorAtEndOfTestCase(document->m_editor); @@ -127,7 +127,7 @@ BaseQuickFixTestCase::BaseQuickFixTestCase(const QList<TestDocumentPtr> &testDoc m_cppCodeStylePreferences->setCurrentDelegate("qt"); // Find the document having the cursor marker - for (const TestDocumentPtr &document : qAsConst(m_testDocuments)) { + for (const TestDocumentPtr &document : std::as_const(m_testDocuments)) { if (document->hasCursorMarker()){ m_documentWithMarker = document; break; @@ -149,7 +149,7 @@ BaseQuickFixTestCase::~BaseQuickFixTestCase() m_modelManager->setHeaderPaths(m_headerPathsToRestore); // Remove created files from file system - for (const TestDocumentPtr &testDocument : qAsConst(m_testDocuments)) + for (const TestDocumentPtr &testDocument : std::as_const(m_testDocuments)) QVERIFY(QFile::remove(testDocument->filePath())); } @@ -201,7 +201,7 @@ QuickFixOperationTest::QuickFixOperationTest(const QList<TestDocumentPtr> &testD operation->perform(); // Compare all files - for (const TestDocumentPtr &testDocument : qAsConst(m_testDocuments)) { + for (const TestDocumentPtr &testDocument : std::as_const(m_testDocuments)) { // Check QString result = testDocument->m_editorWidget->document()->toPlainText(); removeTrailingWhitespace(result); @@ -247,7 +247,7 @@ QuickFixOfferedOperationsTest::QuickFixOfferedOperationsTest( // Convert to QStringList QStringList actualOperationsAsStringList; - for (const QuickFixOperation::Ptr &operation : qAsConst(actualOperations)) + for (const QuickFixOperation::Ptr &operation : std::as_const(actualOperations)) actualOperationsAsStringList << operation->description(); QCOMPARE(actualOperationsAsStringList, expectedOperations); @@ -5865,7 +5865,7 @@ void QuickfixTest::testAddIncludeForUndefinedIdentifier() TemporaryDir temporaryDir; QVERIFY(temporaryDir.isValid()); - for (const TestDocumentPtr &testDocument : qAsConst(testDocuments)) + for (const TestDocumentPtr &testDocument : std::as_const(testDocuments)) testDocument->setBaseDirectory(temporaryDir.path()); QScopedPointer<CppQuickFixFactory> factory; diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index cdfc4d7878f..0c33c377332 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -2064,7 +2064,7 @@ void AddIncludeForUndefinedIdentifier::match(const CppQuickFixInterface &interfa if (matchName(nameAst->name, &matches, &className)) { QList<IndexItem::Ptr> indexItems; const Snapshot forwardHeaders = forwardingHeaders(interface); - for (const Core::LocatorFilterEntry &entry : qAsConst(matches)) { + for (const Core::LocatorFilterEntry &entry : std::as_const(matches)) { IndexItem::Ptr info = entry.internalData.value<IndexItem::Ptr>(); if (!info || info->symbolName() != className) continue; @@ -2076,7 +2076,7 @@ void AddIncludeForUndefinedIdentifier::match(const CppQuickFixInterface &interfa headerAndItsForwardingHeaders << Utils::FilePath::fromString(info->fileName()); headerAndItsForwardingHeaders += localForwardHeaders.filesDependingOn(info->fileName()); - for (const Utils::FilePath &header : qAsConst(headerAndItsForwardingHeaders)) { + for (const Utils::FilePath &header : std::as_const(headerAndItsForwardingHeaders)) { const QString include = findShortestInclude(currentDocumentFilePath, header.toString(), headerPaths); @@ -2443,7 +2443,7 @@ static Enum *findEnum(const QList<LookupItem> &results, const LookupContext &ctx const Name *referenceName = namedType->name(); if (const QualifiedNameId *qualifiedName = referenceName->asQualifiedNameId()) referenceName = qualifiedName->name(); - for (Enum *e : qAsConst(enums)) { + for (Enum *e : std::as_const(enums)) { if (const Name *candidateName = e->name()) { if (candidateName->match(referenceName)) return e; @@ -3221,7 +3221,7 @@ private: { QList<Symbol *> unimplemented; SymbolFinder symbolFinder; - for (Symbol * const s : qAsConst(m_declarations)) { + for (Symbol * const s : std::as_const(m_declarations)) { if (!symbolFinder.findMatchingDefinition(s, snapshot())) unimplemented << s; } @@ -3262,7 +3262,7 @@ private: const auto incDefPos = [&defPos] { defPos = (defPos + 1) % (DefPosImplementationFile + 2); }; - for (Symbol * const func : qAsConst(unimplemented)) { + for (Symbol * const func : std::as_const(unimplemented)) { incDefPos(); if (defPos > DefPosImplementationFile) continue; @@ -3303,7 +3303,7 @@ private: }; QHash<QString, QPair<ChangeSet, QList<ChangeSet::Range>>> changeSets; - for (const MemberFunctionImplSetting &setting : qAsConst(settings)) { + for (const MemberFunctionImplSetting &setting : std::as_const(settings)) { DeclFinder finder(currentFile().data(), setting.func); finder.accept(m_classAST); QTC_ASSERT(finder.decl(), continue); @@ -4677,7 +4677,7 @@ public: } const QStringList memberFunctionsAsStrings = toStringList(memberFunctions); - for (Symbol *const member : qAsConst(dataMembers)) { + for (Symbol *const member : std::as_const(dataMembers)) { ExistingGetterSetterData existing; existing.memberVariableName = QString::fromUtf8(member->identifier()->chars(), member->identifier()->size()); @@ -6922,7 +6922,7 @@ void AssignToLocalVariable::match(const CppQuickFixInterface &interface, QuickFi TypeOfExpression::Preprocess); } - for (const LookupItem &item : qAsConst(items)) { + for (const LookupItem &item : std::as_const(items)) { if (!item.declaration()) continue; @@ -7254,7 +7254,7 @@ public: ChangeSet changes; bool replace = true; - for (const QByteArray &chunk : qAsConst(newContents)) { + for (const QByteArray &chunk : std::as_const(newContents)) { const QString str = decoder->toUnicode(chunk); const QByteArray utf8buf = str.toUtf8(); if (!utf8codec->canEncode(str) || chunk != utf8buf) @@ -7370,7 +7370,7 @@ bool findRawAccessFunction(Class *klass, PointerType *pointerType, QString *objA break; default: // Multiple candidates - prefer a function named data - for (Function *func : qAsConst(candidates)) { + for (Function *func : std::as_const(candidates)) { if (!strcmp(func->name()->identifier()->chars(), "data")) { funcName = func->name(); break; @@ -8111,7 +8111,7 @@ private: processIncludes(refactoring, filePath().toString()); } - for (auto &file : qAsConst(m_changes)) + for (auto &file : std::as_const(m_changes)) file->apply(); } diff --git a/src/plugins/cppeditor/cppquickfixsettingswidget.cpp b/src/plugins/cppeditor/cppquickfixsettingswidget.cpp index 2917dca1491..59af9963ab2 100644 --- a/src/plugins/cppeditor/cppquickfixsettingswidget.cpp +++ b/src/plugins/cppeditor/cppquickfixsettingswidget.cpp @@ -140,7 +140,7 @@ void CppQuickFixSettingsWidget::loadSettings(CppQuickFixSettings *settings) ui->checkBox_signalWithNewValue->setChecked(settings->signalWithNewValue); ui->useAutoCheckBox->setChecked(settings->useAuto); ui->valueTypes->clear(); - for (const auto &valueType : qAsConst(settings->valueTypes)) { + for (const auto &valueType : std::as_const(settings->valueTypes)) { auto item = new QListWidgetItem(valueType, ui->valueTypes); item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemNeverHasChildren); diff --git a/src/plugins/cppeditor/cpptoolstestcase.cpp b/src/plugins/cppeditor/cpptoolstestcase.cpp index 0d361f1ae7a..2d83897e96d 100644 --- a/src/plugins/cppeditor/cpptoolstestcase.cpp +++ b/src/plugins/cppeditor/cpptoolstestcase.cpp @@ -382,7 +382,7 @@ ProjectOpenerAndCloser::~ProjectOpenerAndCloser() hasGcFinished = true; }); - for (Project *project : qAsConst(m_openProjects)) + for (Project *project : std::as_const(m_openProjects)) ProjectExplorerPlugin::unloadProject(project); QElapsedTimer t; diff --git a/src/plugins/cppeditor/fileandtokenactions_test.cpp b/src/plugins/cppeditor/fileandtokenactions_test.cpp index 83c15ef478b..0b781168bdc 100644 --- a/src/plugins/cppeditor/fileandtokenactions_test.cpp +++ b/src/plugins/cppeditor/fileandtokenactions_test.cpp @@ -144,7 +144,7 @@ TestActionsTestCase::TestActionsTestCase(const Actions &tokenActions, const Acti Utils::sort(filesToOpen); // Process all files from the projects - for (const QString &filePath : qAsConst(filesToOpen)) { + for (const QString &filePath : std::as_const(filesToOpen)) { // Skip e.g. "<configuration>" if (!QFileInfo::exists(filePath)) continue; @@ -250,7 +250,7 @@ void TestActionsTestCase::undoChangesInAllEditorWidgets() void TestActionsTestCase::executeActionsOnEditorWidget(CppEditorWidget *editorWidget, TestActionsTestCase::Actions actions) { - for (const ActionPointer &action : qAsConst(actions)) + for (const ActionPointer &action : std::as_const(actions)) action->run(editorWidget); QApplication::processEvents(); } @@ -442,7 +442,7 @@ void RunAllQuickFixesTokenAction::run(CppEditorWidget *editorWidget) cppQuickFixFactory->match(qfi, operations); } - for (QuickFixOperation::Ptr operation : qAsConst(operations)) { + for (QuickFixOperation::Ptr operation : std::as_const(operations)) { qDebug() << " -- Performing Quick Fix" << operation->description(); operation->perform(); TestActionsTestCase::escape(); diff --git a/src/plugins/cppeditor/includeutils.cpp b/src/plugins/cppeditor/includeutils.cpp index 6aad8d0fa1b..5afb9958f81 100644 --- a/src/plugins/cppeditor/includeutils.cpp +++ b/src/plugins/cppeditor/includeutils.cpp @@ -117,7 +117,7 @@ LineForNewIncludeDirective::LineForNewIncludeDirective(const QTextDocument *text // Ignore *.moc includes if requested if (mocIncludeMode == IgnoreMocIncludes) { - for (const Document::Include &include : qAsConst(includes)) { + for (const Document::Include &include : std::as_const(includes)) { if (!include.unresolvedFileName().endsWith(QLatin1String(".moc"))) m_includes << include; } @@ -233,7 +233,7 @@ int LineForNewIncludeDirective::operator()(const QString &newIncludeFileName, IncludeGroups groupsSameIncludeDir; IncludeGroups groupsMixedIncludeDirs; - for (const IncludeGroup &group : qAsConst(groupsMatchingIncludeType)) { + for (const IncludeGroup &group : std::as_const(groupsMatchingIncludeType)) { if (group.hasCommonIncludeDir()) groupsSameIncludeDir << group; else @@ -241,7 +241,7 @@ int LineForNewIncludeDirective::operator()(const QString &newIncludeFileName, } IncludeGroups groupsMatchingIncludeDir; - for (const IncludeGroup &group : qAsConst(groupsSameIncludeDir)) { + for (const IncludeGroup &group : std::as_const(groupsSameIncludeDir)) { if (group.commonIncludeDir() == includeDir(pureIncludeFileName)) groupsMatchingIncludeDir << group; } @@ -251,7 +251,7 @@ int LineForNewIncludeDirective::operator()(const QString &newIncludeFileName, if (!groupsMatchingIncludeDir.isEmpty()) { // The group with the longest common matching prefix is the best group int longestPrefixSoFar = 0; - for (const IncludeGroup &group : qAsConst(groupsMatchingIncludeDir)) { + for (const IncludeGroup &group : std::as_const(groupsMatchingIncludeDir)) { const int groupPrefixLength = group.commonPrefix().length(); if (groupPrefixLength >= longestPrefixSoFar) { bestGroup = group; @@ -272,12 +272,12 @@ int LineForNewIncludeDirective::operator()(const QString &newIncludeFileName, // group with mixed include dirs } else { IncludeGroups groupsIncludeDir; - for (const IncludeGroup &group : qAsConst(groupsMixedIncludeDirs)) { + for (const IncludeGroup &group : std::as_const(groupsMixedIncludeDirs)) { groupsIncludeDir.append( IncludeGroup::detectIncludeGroupsByIncludeDir(group.includes())); } IncludeGroup localBestIncludeGroup = IncludeGroup(QList<Include>()); - for (const IncludeGroup &group : qAsConst(groupsIncludeDir)) { + for (const IncludeGroup &group : std::as_const(groupsIncludeDir)) { if (group.commonIncludeDir() == includeDir(pureIncludeFileName)) localBestIncludeGroup = group; } @@ -307,7 +307,7 @@ QList<IncludeGroup> IncludeGroup::detectIncludeGroupsByNewLines(QList<Document:: int lastLine = 0; QList<Include> currentIncludes; bool isFirst = true; - for (const Include &include : qAsConst(includes)) { + for (const Include &include : std::as_const(includes)) { // First include... if (isFirst) { isFirst = false; @@ -424,7 +424,7 @@ QList<IncludeGroup> IncludeGroup::filterMixedIncludeGroups(const QList<IncludeGr bool IncludeGroup::hasOnlyIncludesOfType(Client::IncludeType includeType) const { - for (const Include &include : qAsConst(m_includes)) { + for (const Include &include : std::as_const(m_includes)) { if (include.type() != includeType) return false; } @@ -467,7 +467,7 @@ int IncludeGroup::lineForNewInclude(const QString &newIncludeFileName, QStringList IncludeGroup::filesNames() const { QStringList names; - for (const Include &include : qAsConst(m_includes)) + for (const Include &include : std::as_const(m_includes)) names << include.unresolvedFileName(); return names; } diff --git a/src/plugins/cppeditor/indexitem.h b/src/plugins/cppeditor/indexitem.h index 27e95a78326..f43124c64d1 100644 --- a/src/plugins/cppeditor/indexitem.h +++ b/src/plugins/cppeditor/indexitem.h @@ -77,7 +77,7 @@ public: VisitorResult visitAllChildren(Visitor callback) const { VisitorResult result = Recurse; - for (const IndexItem::Ptr &child : qAsConst(m_children)) { + for (const IndexItem::Ptr &child : std::as_const(m_children)) { result = callback(child); switch (result) { case Break: diff --git a/src/plugins/cppeditor/modelmanagertesthelper.cpp b/src/plugins/cppeditor/modelmanagertesthelper.cpp index 356883a2426..6b9f98e6c7b 100644 --- a/src/plugins/cppeditor/modelmanagertesthelper.cpp +++ b/src/plugins/cppeditor/modelmanagertesthelper.cpp @@ -55,7 +55,7 @@ void ModelManagerTestHelper::cleanup() { CppModelManager *mm = CppModelManager::instance(); QList<ProjectInfo::ConstPtr> pies = mm->projectInfos(); - for (Project * const p : qAsConst(m_projects)) { + for (Project * const p : std::as_const(m_projects)) { ProjectExplorer::SessionManager::removeProject(p); emit aboutToRemoveProject(p); } diff --git a/src/plugins/cppeditor/projectinfo.cpp b/src/plugins/cppeditor/projectinfo.cpp index 8c0daf37d60..4dcb7cd6f49 100644 --- a/src/plugins/cppeditor/projectinfo.cpp +++ b/src/plugins/cppeditor/projectinfo.cpp @@ -62,7 +62,7 @@ static QSet<QString> getSourceFiles(const QVector<ProjectPart::ConstPtr> &projec { QSet<QString> sourceFiles; for (const ProjectPart::ConstPtr &part : projectParts) { - for (const ProjectFile &file : qAsConst(part->files)) + for (const ProjectFile &file : std::as_const(part->files)) sourceFiles.insert(file.path); } return sourceFiles; @@ -83,7 +83,7 @@ static ProjectExplorer::HeaderPaths getHeaderPaths( { QSet<ProjectExplorer::HeaderPath> uniqueHeaderPaths; for (const ProjectPart::ConstPtr &part : projectParts) { - for (const ProjectExplorer::HeaderPath &headerPath : qAsConst(part->headerPaths)) + for (const ProjectExplorer::HeaderPath &headerPath : std::as_const(part->headerPaths)) uniqueHeaderPaths.insert(headerPath); } return ProjectExplorer::HeaderPaths(uniqueHeaderPaths.cbegin(), uniqueHeaderPaths.cend()); diff --git a/src/plugins/cppeditor/projectpart.cpp b/src/plugins/cppeditor/projectpart.cpp index ee53e61ad2d..464c138cc8b 100644 --- a/src/plugins/cppeditor/projectpart.cpp +++ b/src/plugins/cppeditor/projectpart.cpp @@ -76,7 +76,7 @@ static HeaderPaths getHeaderPaths(const RawProjectPart &rpp, // Prevent duplicate include paths. // TODO: Do this once when finalizing the raw project part? std::set<QString> seenPaths; - for (const HeaderPath &p : qAsConst(rpp.headerPaths)) { + for (const HeaderPath &p : std::as_const(rpp.headerPaths)) { const QString cleanPath = QDir::cleanPath(p.path); if (seenPaths.insert(cleanPath).second) headerPaths << HeaderPath(cleanPath, p.type); diff --git a/src/plugins/cppeditor/symbolfinder.cpp b/src/plugins/cppeditor/symbolfinder.cpp index a2df28b5f77..df93d36246d 100644 --- a/src/plugins/cppeditor/symbolfinder.cpp +++ b/src/plugins/cppeditor/symbolfinder.cpp @@ -268,7 +268,7 @@ Symbol *SymbolFinder::findMatchingVarDefinition(Symbol *declaration, const Snaps candidates << fallbacks; SymbolWithPriority best; - for (const auto &candidate : qAsConst(candidates)) { + for (const auto &candidate : std::as_const(candidates)) { if (candidate.first == declaration) continue; if (QLatin1String(candidate.first->fileName()) == declFile diff --git a/src/plugins/cppeditor/typehierarchybuilder_test.cpp b/src/plugins/cppeditor/typehierarchybuilder_test.cpp index d83b7fa5913..5a1a5a1028d 100644 --- a/src/plugins/cppeditor/typehierarchybuilder_test.cpp +++ b/src/plugins/cppeditor/typehierarchybuilder_test.cpp @@ -34,7 +34,7 @@ QString toString(const TypeHierarchy &hierarchy, int indent = 0) Utils::sort(sortedHierarchy, [&oo](const TypeHierarchy &h1, const TypeHierarchy &h2) -> bool { return oo.prettyName(h1.symbol()->name()) < oo.prettyName(h2.symbol()->name()); }); - for (const TypeHierarchy &childHierarchy : qAsConst(sortedHierarchy)) + for (const TypeHierarchy &childHierarchy : std::as_const(sortedHierarchy)) result += toString(childHierarchy, indent + 2); return result; } diff --git a/src/plugins/ctfvisualizer/ctftracemanager.cpp b/src/plugins/ctfvisualizer/ctftracemanager.cpp index 980aa3363f1..879e8fdd33f 100644 --- a/src/plugins/ctfvisualizer/ctftracemanager.cpp +++ b/src/plugins/ctfvisualizer/ctftracemanager.cpp @@ -177,7 +177,7 @@ void CtfTraceManager::finalize() ++it; } } - for (CtfTimelineModel *model: qAsConst(m_threadModels)) { + for (CtfTimelineModel *model: std::as_const(m_threadModels)) { model->finalize(m_traceBegin, m_traceEnd, m_processNames[model->m_processId], m_threadNames[model->m_threadId]); } @@ -256,7 +256,7 @@ void CtfTraceManager::updateStatistics() }); m_statisticsModel->beginLoading(); - for (auto thread : qAsConst(m_threadModels)) { + for (auto thread : std::as_const(m_threadModels)) { if (showAll || m_threadRestrictions[thread->tid()]) { const int eventCount = thread->count(); @@ -273,7 +273,7 @@ void CtfTraceManager::updateStatistics() void CtfTraceManager::clearAll() { m_modelAggregator->clear(); - for (CtfTimelineModel *model: qAsConst(m_threadModels)) { + for (CtfTimelineModel *model: std::as_const(m_threadModels)) { model->deleteLater(); } m_threadModels.clear(); diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index e54114b7e8d..91e6c9c0d1e 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -2035,7 +2035,7 @@ void BreakHandler::releaseAllBreakpoints() } clear(); // Make now-unclaimed breakpoints globally visible again. - for (GlobalBreakpoint gbp: qAsConst(gbps)) { + for (GlobalBreakpoint gbp: std::as_const(gbps)) { if (gbp) gbp->updateMarker(); } diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 9e8496e246b..b0da3a13637 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -991,7 +991,7 @@ void CdbEngine::runCommand(const DebuggerCommand &dbgCmd) } QTC_CHECK(argumentSplitPos == arguments.size()); int tokenPart = splittedArguments.size(); - for (QStringView part : qAsConst(splittedArguments)) + for (QStringView part : std::as_const(splittedArguments)) str << prefix << " -t " << token << '.' << --tokenPart << ' ' << part << '\n'; } else { cmd = prefix; @@ -2019,7 +2019,7 @@ void CdbEngine::handleSessionIdle(const QString &message) elapsedLogTime(), qPrintable(message), qPrintable(stateName(state()))); - for (const InterruptCallback &callback : qAsConst(m_interrupCallbacks)) + for (const InterruptCallback &callback : std::as_const(m_interrupCallbacks)) callback(); m_interrupCallbacks.clear(); diff --git a/src/plugins/debugger/cdb/cdboptionspage.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp index 419e3985702..a7440ea4e46 100644 --- a/src/plugins/debugger/cdb/cdboptionspage.cpp +++ b/src/plugins/debugger/cdb/cdboptionspage.cpp @@ -105,11 +105,11 @@ CdbBreakEventWidget::CdbBreakEventWidget(QWidget *parent) : QWidget(parent) void CdbBreakEventWidget::clear() { - for (QLineEdit *l : qAsConst(m_lineEdits)) { + for (QLineEdit *l : std::as_const(m_lineEdits)) { if (l) l->clear(); } - for (QCheckBox *c : qAsConst(m_checkBoxes)) + for (QCheckBox *c : std::as_const(m_checkBoxes)) c->setChecked(false); } diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 326fa93b733..695175bc01d 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -2840,7 +2840,7 @@ void CppDebuggerEngine::validateRunParameters(DebuggerRunParameters &rp) bool found = false; while (str < limit) { const QString string = QString::fromUtf8(str); - for (auto pair : qAsConst(globalRegExpSourceMap)) { + for (auto pair : std::as_const(globalRegExpSourceMap)) { const QRegularExpressionMatch match = pair.first.match(string); if (match.hasMatch()) { rp.sourcePathMap.insert(string.left(match.capturedStart()) + match.captured(1), @@ -2862,7 +2862,7 @@ void CppDebuggerEngine::validateRunParameters(DebuggerRunParameters &rp) if (hasEmbeddedInfo || hasLink) return; - for (const QByteArray &name : qAsConst(interesting)) { + for (const QByteArray &name : std::as_const(interesting)) { const QString found = seen.contains(name) ? Tr::tr("Found.") : Tr::tr("Not found."); detailedWarning.append('\n' + Tr::tr("Section %1: %2").arg(QString::fromUtf8(name)).arg(found)); diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index 5c4c973aefd..8602f031fdf 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -651,7 +651,7 @@ void DebuggerItemManagerPrivate::autoDetectCdbDebuggers() } } - for (const FilePath &cdb : qAsConst(cdbs)) { + for (const FilePath &cdb : std::as_const(cdbs)) { if (DebuggerItemManager::findByCommand(cdb)) continue; DebuggerItem item; @@ -738,7 +738,7 @@ void DebuggerItemManagerPrivate::autoDetectGdbOrLldbDebuggers(const FilePaths &s path.iterateDirectory(addSuspect, {filters, QDir::Files | QDir::Executable}); QStringList logMessages{Tr::tr("Searching debuggers...")}; - for (const FilePath &command : qAsConst(suspects)) { + for (const FilePath &command : std::as_const(suspects)) { const auto commandMatches = [command](const DebuggerTreeItem *titem) { return titem->m_item.command() == command; }; diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index af1ab3ab194..b4ee7cf1ac9 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -182,7 +182,7 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *parent) m_perspectiveMenu = new QMenu; connect(m_perspectiveMenu, &QMenu::aboutToShow, this, [this] { m_perspectiveMenu->clear(); - for (Perspective *perspective : qAsConst(m_perspectives)) { + for (Perspective *perspective : std::as_const(m_perspectives)) { m_perspectiveMenu->addAction(perspective->d->m_name, perspective, [perspective] { if (auto subPerspective = Perspective::findPerspective( perspective->d->m_lastActiveSubPerspectiveId)) @@ -875,7 +875,7 @@ Context PerspectivePrivate::context() const PerspectivePrivate::~PerspectivePrivate() { - for (const DockOperation &op : qAsConst(m_dockOperations)) + for (const DockOperation &op : std::as_const(m_dockOperations)) delete op.widget; } diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index c6d256a1233..63517e48b92 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1819,7 +1819,7 @@ void DebuggerPluginPrivate::attachToQmlPort() void DebuggerPluginPrivate::runScheduled() { - for (DebuggerRunTool *debugger : qAsConst(m_scheduledStarts)) + for (DebuggerRunTool *debugger : std::as_const(m_scheduledStarts)) debugger->startRunControl(); } @@ -2494,7 +2494,7 @@ void DebuggerUnitTests::testDebuggerMatching() auto expectedLevel = static_cast<DebuggerItem::MatchLevel>(result); Abis debuggerAbis; - for (const QString &abi : qAsConst(debugger)) + for (const QString &abi : std::as_const(debugger)) debuggerAbis << Abi::fromString(abi); DebuggerItem item; diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index ef045c2abbd..d72c57fe6f1 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -188,7 +188,7 @@ void DebuggerRunTool::setStartMode(DebuggerStartMode startMode) projects.removeOne(startupProject); projects.insert(0, startupProject); } - for (Project *project : qAsConst(projects)) + for (Project *project : std::as_const(projects)) m_runParameters.projectSourceFiles.append(project->files(Project::SourceFiles)); if (!projects.isEmpty()) m_runParameters.projectSourceDirectory = projects.first()->projectDirectory(); diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index 20021e9798c..d853bc8f009 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -669,7 +669,7 @@ public: void DebuggerToolTipManagerPrivate::hideAllToolTips() { purgeClosedToolTips(); - for (const DebuggerToolTipHolder *tooltip : qAsConst(m_tooltips)) + for (const DebuggerToolTipHolder *tooltip : std::as_const(m_tooltips)) tooltip->widget->hide(); } @@ -996,7 +996,7 @@ void DebuggerToolTipManagerPrivate::updateVisibleToolTips() } // Reposition and show all tooltips of that file. - for (DebuggerToolTipHolder *tooltip : qAsConst(m_tooltips)) { + for (DebuggerToolTipHolder *tooltip : std::as_const(m_tooltips)) { if (tooltip->context.fileName == filePath) tooltip->positionShow(toolTipEditor->editorWidget()); else @@ -1012,7 +1012,7 @@ void DebuggerToolTipManager::updateToolTips() // Stack frame changed: All tooltips of that file acquire the engine, // all others release (arguable, this could be more precise?) - for (DebuggerToolTipHolder *tooltip : qAsConst(d->m_tooltips)) + for (DebuggerToolTipHolder *tooltip : std::as_const(d->m_tooltips)) tooltip->updateTooltip(d->m_engine); d->updateVisibleToolTips(); // Move tooltip when stepping in same file. } @@ -1023,14 +1023,14 @@ void DebuggerToolTipManager::deregisterEngine() d->purgeClosedToolTips(); - for (DebuggerToolTipHolder *tooltip : qAsConst(d->m_tooltips)) + for (DebuggerToolTipHolder *tooltip : std::as_const(d->m_tooltips)) if (tooltip->context.engineType == d->m_engine->objectName()) tooltip->releaseEngine(); d->saveSessionData(); // FIXME: For now remove all. - for (DebuggerToolTipHolder *tooltip : qAsConst(d->m_tooltips)) + for (DebuggerToolTipHolder *tooltip : std::as_const(d->m_tooltips)) tooltip->destroy(); d->purgeClosedToolTips(); } @@ -1111,7 +1111,7 @@ void DebuggerToolTipManagerPrivate::saveSessionData() w.writeStartDocument(); w.writeStartElement(sessionDocumentC); w.writeAttribute(sessionVersionAttributeC, "1.0"); - for (DebuggerToolTipHolder *tooltip : qAsConst(m_tooltips)) + for (DebuggerToolTipHolder *tooltip : std::as_const(m_tooltips)) if (tooltip->widget->isPinned) tooltip->saveSessionData(w); w.writeEndDocument(); @@ -1127,7 +1127,7 @@ void DebuggerToolTipManager::closeAllToolTips() void DebuggerToolTipManagerPrivate::closeAllToolTips() { - for (DebuggerToolTipHolder *tooltip : qAsConst(m_tooltips)) + for (DebuggerToolTipHolder *tooltip : std::as_const(m_tooltips)) tooltip->destroy(); m_tooltips.clear(); } @@ -1135,7 +1135,7 @@ void DebuggerToolTipManagerPrivate::closeAllToolTips() void DebuggerToolTipManager::resetLocation() { d->purgeClosedToolTips(); - for (DebuggerToolTipHolder *tooltip : qAsConst(d->m_tooltips)) + for (DebuggerToolTipHolder *tooltip : std::as_const(d->m_tooltips)) tooltip->widget->pin(); } @@ -1306,7 +1306,7 @@ DebuggerToolTipContexts DebuggerToolTipManager::pendingTooltips() const { StackFrame frame = d->m_engine->stackHandler()->currentFrame(); DebuggerToolTipContexts rc; - for (DebuggerToolTipHolder *tooltip : qAsConst(d->m_tooltips)) { + for (DebuggerToolTipHolder *tooltip : std::as_const(d->m_tooltips)) { const DebuggerToolTipContext &context = tooltip->context; if (context.iname.startsWith("tooltip") && context.matchesFrame(frame)) rc.push_back(context); @@ -1323,7 +1323,7 @@ bool DebuggerToolTipManagerPrivate::eventFilter(QObject *o, QEvent *e) const auto me = static_cast<const QMoveEvent *>(e); const QPoint dist = me->pos() - me->oldPos(); purgeClosedToolTips(); - for (DebuggerToolTipHolder *tooltip : qAsConst(m_tooltips)) { + for (DebuggerToolTipHolder *tooltip : std::as_const(m_tooltips)) { if (tooltip->widget && tooltip->widget->isVisible()) tooltip->widget->move(tooltip->widget->pos() + dist); } @@ -1335,7 +1335,7 @@ bool DebuggerToolTipManagerPrivate::eventFilter(QObject *o, QEvent *e) const bool isMinimized = static_cast<const QWidget *>(o)->windowState() & Qt::WindowMinimized; if (wasMinimized != isMinimized) { purgeClosedToolTips(); - for (DebuggerToolTipHolder *tooltip : qAsConst(m_tooltips)) + for (DebuggerToolTipHolder *tooltip : std::as_const(m_tooltips)) tooltip->widget->setVisible(!isMinimized); } break; diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp index aed67a599c5..cfed65dfa24 100644 --- a/src/plugins/debugger/disassembleragent.cpp +++ b/src/plugins/debugger/disassembleragent.cpp @@ -345,7 +345,7 @@ void DisassemblerAgent::removeBreakpointMarker(const Breakpoint &bp) if (!d->document) return; - for (DisassemblerBreakpointMarker *marker : qAsConst(d->breakpointMarks)) { + for (DisassemblerBreakpointMarker *marker : std::as_const(d->breakpointMarks)) { if (marker->m_bp == bp) { d->breakpointMarks.removeOne(marker); d->document->removeMark(marker); diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 30a1403f9ee..eca5b1729ca 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -798,13 +798,13 @@ void GdbEngine::commandTimeout() QList<int> keys = m_commandForToken.keys(); Utils::sort(keys); bool killIt = false; - for (int key : qAsConst(keys)) { + for (int key : std::as_const(keys)) { const DebuggerCommand &cmd = m_commandForToken.value(key); killIt = true; showMessage(QString::number(key) + ": " + cmd.function); } QStringList commands; - for (const DebuggerCommand &cmd : qAsConst(m_commandForToken)) + for (const DebuggerCommand &cmd : std::as_const(m_commandForToken)) commands << QString("\"%1\"").arg(cmd.function); if (killIt) { showMessage(QString("TIMED OUT WAITING FOR GDB REPLY. " @@ -2910,7 +2910,7 @@ void GdbEngine::handleShowModuleSections(const DebuggerResponse &response, const QString needle = prefix + moduleName; Sections sections; bool active = false; - for (const QString &line : qAsConst(lines)) { + for (const QString &line : std::as_const(lines)) { if (line.startsWith(prefix)) { if (active) break; @@ -3815,7 +3815,7 @@ void GdbEngine::setupEngine() const QStringList testList = qtcEnvironmentVariable("QTC_DEBUGGER_TESTS").split(','); for (const QString &test : testList) m_testCases.insert(test.toInt()); - for (int test : qAsConst(m_testCases)) + for (int test : std::as_const(m_testCases)) showMessage("ENABLING TEST CASE: " + QString::number(test)); m_expectTerminalTrap = terminal(); @@ -4176,7 +4176,7 @@ void GdbEngine::resetCommandQueue() QString msg; QTextStream ts(&msg); ts << "RESETING COMMAND QUEUE. LEFT OVER TOKENS: "; - for (const DebuggerCommand &cmd : qAsConst(m_commandForToken)) + for (const DebuggerCommand &cmd : std::as_const(m_commandForToken)) ts << "CMD:" << cmd.function; m_commandForToken.clear(); m_flagsForToken.clear(); diff --git a/src/plugins/debugger/peripheralregisterhandler.cpp b/src/plugins/debugger/peripheralregisterhandler.cpp index 4d9a8341d87..3cd1a5ae8df 100644 --- a/src/plugins/debugger/peripheralregisterhandler.cpp +++ b/src/plugins/debugger/peripheralregisterhandler.cpp @@ -782,7 +782,7 @@ QMenu *PeripheralRegisterHandler::createRegisterGroupsMenu(DebuggerState state) const auto groupMenu = new QMenu(Tr::tr("View Groups")); const auto actionGroup = new QActionGroup(groupMenu); bool hasActions = false; - for (const PeripheralRegisterGroup &group : qAsConst(m_peripheralRegisterGroups)) { + for (const PeripheralRegisterGroup &group : std::as_const(m_peripheralRegisterGroups)) { const QString groupName = group.name; const QString actName = QStringLiteral("%1: %2").arg(groupName, group.description); QAction *act = groupMenu->addAction(actName); diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 5eb9b89e4d4..200803440e7 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -875,7 +875,7 @@ static ConsoleItem *constructLogItemTree(const QVariant &result, std::sort(children.begin(), children.end(), compareConsoleItems); item = new ConsoleItem(ConsoleItem::DefaultType, text); - for (ConsoleItem *child : qAsConst(children)) { + for (ConsoleItem *child : std::as_const(children)) { if (child) item->appendChild(child); } @@ -895,7 +895,7 @@ static ConsoleItem *constructLogItemTree(const QVariant &result, std::sort(children.begin(), children.end(), compareConsoleItems); item = new ConsoleItem(ConsoleItem::DefaultType, text); - for (ConsoleItem *child : qAsConst(children)) { + for (ConsoleItem *child : std::as_const(children)) { if (child) item->appendChild(child); } @@ -1804,7 +1804,7 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data) } QMap<QString,QString> files; - for (const QString &file : qAsConst(sourceFiles)) { + for (const QString &file : std::as_const(sourceFiles)) { QString shortName = file; QString fullName = engine->toFileInProject(file); files.insert(shortName, fullName); @@ -1856,7 +1856,7 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data) int newColumn = sourceLineText.indexOf('(') + 1; - for (const Breakpoint &bp : qAsConst(v8Breakpoints)) { + for (const Breakpoint &bp : std::as_const(v8Breakpoints)) { QTC_ASSERT(bp, continue); const BreakpointParameters ¶ms = bp->requestedParameters(); @@ -1882,7 +1882,7 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data) if (inferiorStop) { //Update breakpoint data - for (const Breakpoint &bp : qAsConst(v8Breakpoints)) { + for (const Breakpoint &bp : std::as_const(v8Breakpoints)) { QTC_ASSERT(bp, continue); if (bp->functionName().isEmpty()) { bp->setFunctionName(invocationText); @@ -1895,7 +1895,7 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data) } if (engine->state() == InferiorRunOk) { - for (const Breakpoint &bp : qAsConst(v8Breakpoints)) { + for (const Breakpoint &bp : std::as_const(v8Breakpoints)) { QTC_ASSERT(bp, continue); if (breakpointsTemp.contains(bp->responseId())) clearBreakpoint(bp); @@ -2238,7 +2238,7 @@ void QmlEnginePrivate::constructChildLogItems(ConsoleItem *item, const QmlV8Obje if (debuggerSettings()->sortStructMembers.value()) std::sort(children.begin(), children.end(), compareConsoleItems); - for (ConsoleItem *child : qAsConst(children)) + for (ConsoleItem *child : std::as_const(children)) item->appendChild(child); } @@ -2364,7 +2364,7 @@ void QmlEnginePrivate::handleExecuteDebuggerCommand(const QVariantMap &response) debuggerConsole()->printItem(constructLogItemTree(extractData(response.value(BODY)))); // Update the locals - for (int index : qAsConst(currentFrameScopes)) + for (int index : std::as_const(currentFrameScopes)) scope(index); } else { debuggerConsole()->printItem(new ConsoleItem(ConsoleItem::ErrorType, @@ -2439,7 +2439,7 @@ void QmlEnginePrivate::handleVersion(const QVariantMap &response) void QmlEnginePrivate::flushSendBuffer() { QTC_ASSERT(state() == Enabled, return); - for (const QByteArray &msg : qAsConst(sendBuffer)) + for (const QByteArray &msg : std::as_const(sendBuffer)) sendMessage(msg); sendBuffer.clear(); } diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp index 8eb1eac5c0b..722ffd1e2d0 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.cpp +++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp @@ -247,7 +247,7 @@ void QmlInspectorAgent::onResult(quint32 queryId, const QVariant &value, m_rootContexts.insert(engineId, qvariant_cast<ContextReference>(value)); if (m_rootContexts.size() == m_engines.size()) { clearObjectTree(); - for (const auto &engine : qAsConst(m_engines)) { + for (const auto &engine : std::as_const(m_engines)) { QString name = engine.name(); if (name.isEmpty()) name = QString::fromLatin1("Engine %1").arg(engine.debugId()); @@ -270,7 +270,7 @@ void QmlInspectorAgent::newObject(int engineId, int /*objectId*/, int /*parentId log(LogReceive, "OBJECT_CREATED"); - for (const auto &engine : qAsConst(m_engines)) { + for (const auto &engine : std::as_const(m_engines)) { if (engine.debugId() == engineId) { m_delayQueryTimer.start(); break; @@ -361,7 +361,7 @@ void QmlInspectorAgent::queryEngineContext() m_rootContexts.clear(); m_rootContextQueryIds.clear(); - for (const auto &engine : qAsConst(m_engines)) + for (const auto &engine : std::as_const(m_engines)) m_rootContextQueryIds.append(m_engineClient->queryRootContexts(engine)); } @@ -424,7 +424,7 @@ void QmlInspectorAgent::verifyAndInsertObjectInTree(const ObjectReference &objec // Still not found? Maybe we're loading the engine itself. if (engineId == -1) { - for (const auto &engine : qAsConst(m_engines)) { + for (const auto &engine : std::as_const(m_engines)) { if (engine.debugId() == objectDebugId) { engineId = engine.debugId(); break; diff --git a/src/plugins/debugger/threadshandler.cpp b/src/plugins/debugger/threadshandler.cpp index e353c09a0f3..cc0920fb121 100644 --- a/src/plugins/debugger/threadshandler.cpp +++ b/src/plugins/debugger/threadshandler.cpp @@ -301,7 +301,7 @@ bool ThreadsHandler::notifyGroupExited(const QString &groupId) if (item->threadData.groupId == groupId) list.append(item); }); - for (ThreadItem *item : qAsConst(list)) + for (ThreadItem *item : std::as_const(list)) destroyItem(item); m_pidForGroupId.remove(groupId); diff --git a/src/plugins/debugger/uvsc/uvscclient.cpp b/src/plugins/debugger/uvsc/uvscclient.cpp index 961f838e501..c647b7b038c 100644 --- a/src/plugins/debugger/uvsc/uvscclient.cpp +++ b/src/plugins/debugger/uvsc/uvscclient.cpp @@ -551,7 +551,7 @@ bool UvscClient::inspectLocal(const QStringList &expandedLocalINames, } if (localIName == "local") { - for (const GdbMi &child : qAsConst(children)) + for (const GdbMi &child : std::as_const(children)) data.addChild(child); } else { const GdbMi childrenEntry = UvscUtils::buildChildrenEntry(children); diff --git a/src/plugins/debugger/uvsc/uvscengine.cpp b/src/plugins/debugger/uvsc/uvscengine.cpp index 7f874bfdf23..019f5eca4d0 100644 --- a/src/plugins/debugger/uvsc/uvscengine.cpp +++ b/src/plugins/debugger/uvsc/uvscengine.cpp @@ -684,7 +684,7 @@ void UvscEngine::handleReloadRegisters() showMessage(Tr::tr("UVSC: Reading registers failed."), LogMisc); } else { RegisterHandler *handler = registerHandler(); - for (const auto ® : qAsConst(m_registers)) + for (const auto ® : std::as_const(m_registers)) handler->updateRegister(reg.second); handler->commitUpdates(); } diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index 1cd74cae4ad..8f93dadfec4 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -1543,7 +1543,7 @@ MemoryMarkupList WatchModel::variableMemoryMarkup(WatchItem *item, name = ranges.at(i).second; } dbg << '\n'; - for (const MemoryMarkup &m : qAsConst(result)) + for (const MemoryMarkup &m : std::as_const(result)) dbg << m.address << ' ' << m.length << ' ' << m.toolTip << '\n'; } @@ -2139,7 +2139,7 @@ void WatchHandler::cleanup() { m_model->m_expandedINames.clear(); theWatcherNames.remove(QString()); - for (const QString &exp : qAsConst(theTemporaryWatchers)) + for (const QString &exp : std::as_const(theTemporaryWatchers)) theWatcherNames.remove(exp); theTemporaryWatchers.clear(); saveWatchers(); @@ -2171,7 +2171,7 @@ void WatchHandler::insertItems(const GdbMi &data) itemsToSort.insert(static_cast<WatchItem *>(item->parent())); } - for (WatchItem *toplevel : qAsConst(itemsToSort)) + for (WatchItem *toplevel : std::as_const(itemsToSort)) toplevel->sortChildren(&sortByName); } @@ -2210,7 +2210,7 @@ bool WatchHandler::insertItem(WatchItem *item) void WatchModel::reexpandItems() { - for (const QString &iname : qAsConst(m_expandedINames)) { + for (const QString &iname : std::as_const(m_expandedINames)) { if (WatchItem *item = findItem(iname)) { emit itemIsExpanded(indexForItem(item)); emit inameIsExpanded(iname); @@ -2266,7 +2266,7 @@ void WatchHandler::notifyUpdateStarted(const UpdateParameters &updateParameters) item->forAllChildren(marker); }); } else { - for (const QString &iname : qAsConst(inames)) { + for (const QString &iname : std::as_const(inames)) { if (WatchItem *item = m_model->findItem(iname)) item->forAllChildren(marker); } @@ -2288,7 +2288,7 @@ void WatchHandler::notifyUpdateFinished() return true; }); - for (WatchItem *item : qAsConst(toRemove)) + for (WatchItem *item : std::as_const(toRemove)) m_model->destroyItem(item); m_model->forAllItems([this](WatchItem *item) { @@ -2712,7 +2712,7 @@ QString WatchHandler::individualFormatRequests() const void WatchHandler::appendFormatRequests(DebuggerCommand *cmd) const { QJsonArray expanded; - for (const QString &name : qAsConst(m_model->m_expandedINames)) + for (const QString &name : std::as_const(m_model->m_expandedINames)) expanded.append(name); cmd->arg("expanded", expanded); diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index 6e8dffba5b6..d19a4363f6f 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/src/plugins/designer/formeditorplugin.cpp @@ -151,7 +151,7 @@ static FilePath otherFile() } // Try to find existing file with desired suffix const FilePath currentBaseName = current.parentDir().pathAppended(current.baseName() + '.'); - for (const QString &candidateSuffix : qAsConst(candidateSuffixes)) { + for (const QString &candidateSuffix : std::as_const(candidateSuffixes)) { const FilePath filePath = currentBaseName.stringAppended(candidateSuffix); if (filePath.isFile()) return filePath.absoluteFilePath(); diff --git a/src/plugins/designer/formeditorstack.cpp b/src/plugins/designer/formeditorstack.cpp index c99335a8216..f6f24c103a2 100644 --- a/src/plugins/designer/formeditorstack.cpp +++ b/src/plugins/designer/formeditorstack.cpp @@ -140,7 +140,7 @@ void FormEditorStack::updateFormWindowSelectionHandles() if (Designer::Constants::Internal::debug) qDebug() << "updateFormWindowSelectionHandles"; QDesignerFormWindowInterface *activeFormWindow = m_designerCore->formWindowManager()->activeFormWindow(); - for (const EditorData &fdm : qAsConst(m_formEditors)) { + for (const EditorData &fdm : std::as_const(m_formEditors)) { const bool active = activeFormWindow == fdm.widgetHost->formWindow(); fdm.widgetHost->updateFormWindowSelectionHandles(active); } @@ -168,7 +168,7 @@ void FormEditorStack::modeAboutToChange(Utils::Id mode) // Sync the editor when entering edit mode if (mode == Core::Constants::MODE_EDIT) - for (const EditorData &data : qAsConst(m_formEditors)) + for (const EditorData &data : std::as_const(m_formEditors)) data.formWindowEditor->formWindowFile()->syncXmlFromFormWindow(); } diff --git a/src/plugins/designer/gotoslot_test.cpp b/src/plugins/designer/gotoslot_test.cpp index ec3253f7a58..bfc200acd15 100644 --- a/src/plugins/designer/gotoslot_test.cpp +++ b/src/plugins/designer/gotoslot_test.cpp @@ -154,7 +154,7 @@ public: QVERIFY(EditorManager::currentDocument()->isModified()); // Wait for updated documents - for (TextEditor::BaseTextEditor *editor : qAsConst(editors)) { + for (TextEditor::BaseTextEditor *editor : std::as_const(editors)) { QElapsedTimer t; t.start(); const QString filePath = editor->document()->filePath().toString(); diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index 85e57a3db9a..e889e212222 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/src/plugins/designer/qtcreatorintegration.cpp @@ -477,7 +477,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName, // Find the class definition (ui class defined as member or base class) // in the file itself or in the directly included files (order 1). - for (const Document::Ptr &d : qAsConst(docMap)) { + for (const Document::Ptr &d : std::as_const(docMap)) { LookupContext context(d, docTable); const ClassDocumentPtrPair cd = findClassRecursively(context, candidate, 1u); if (cd.first) { @@ -519,7 +519,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName, workingCopy = CppEditor::CppModelManager::instance()->workingCopy(); docTable = CppEditor::CppModelManager::instance()->snapshot(); newDocTable = {}; - for (const auto &file : qAsConst(filePaths)) { + for (const auto &file : std::as_const(filePaths)) { const Document::Ptr doc = docTable.document(file); if (doc) newDocTable.insert(doc); diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp index 6789792bacf..8bd426a773e 100644 --- a/src/plugins/designer/resourcehandler.cpp +++ b/src/plugins/designer/resourcehandler.cpp @@ -115,7 +115,7 @@ void ResourceHandler::updateResourcesHelper(bool updateProjectResources) // Check if the user has chosen to update the lacking resource inside designer if (dirty && updateProjectResources) { QStringList qrcPathsToBeAdded; - for (const QString &originalQrcPath : qAsConst(m_originalUiQrcPaths)) { + for (const QString &originalQrcPath : std::as_const(m_originalUiQrcPaths)) { if (!projectQrcFiles.contains(originalQrcPath) && !qrcPathsToBeAdded.contains(originalQrcPath)) qrcPathsToBeAdded.append(originalQrcPath); } diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp index c84cc4f1e54..f767198b6d3 100644 --- a/src/plugins/designer/settingspage.cpp +++ b/src/plugins/designer/settingspage.cpp @@ -96,7 +96,7 @@ bool SettingsPageProvider::matches(const QRegularExpression ®ex) const for (size_t i = 0; i < itemCount; ++i) m_keywords << Utils::stripAccelerator(QCoreApplication::translate(uitext[i].context, uitext[i].value)); } - for (const QString &key : qAsConst(m_keywords)) { + for (const QString &key : std::as_const(m_keywords)) { if (key.contains(regex)) return true; } diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp index 07c4f31bd6e..8beb3027f05 100644 --- a/src/plugins/diffeditor/diffutils.cpp +++ b/src/plugins/diffeditor/diffutils.cpp @@ -1286,7 +1286,7 @@ static QList<FileData> readGitPatch(QStringView patch, bool *ok, QFutureInterfac QList<FileData> fileDataList; readOk = false; int i = 0; - for (const auto &patchInfo : qAsConst(patches)) { + for (const auto &patchInfo : std::as_const(patches)) { if (jobController) { if (jobController->isCanceled()) return {}; diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp index 1c9a83a93bc..b6a40b18ed0 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp @@ -432,7 +432,7 @@ UnifiedDiffOutput UnifiedDiffData::diffOutput(QFutureInterface<void> &fi, int pr int i = 0; const int count = input.m_contextFileData.size(); - for (const FileData &fileData : qAsConst(input.m_contextFileData)) { + for (const FileData &fileData : std::as_const(input.m_contextFileData)) { const QString leftFileInfo = "--- " + fileData.fileInfo[LeftSide].fileName + '\n'; const QString rightFileInfo = "+++ " + fileData.fileInfo[RightSide].fileName + '\n'; output.diffData.m_fileInfo[blockNumber] = fileData.fileInfo; diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index d50e81ccbe6..0f08650618a 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -480,7 +480,7 @@ bool DockerDevicePrivate::createContainer() dockerCreate.addArgs({"-u", QString("%1:%2").arg(getuid()).arg(getgid())}); #endif - for (QString mount : qAsConst(m_data.mounts)) { + for (QString mount : std::as_const(m_data.mounts)) { if (mount.isEmpty()) continue; mount = q->mapToDevicePath(FilePath::fromUserInput(mount)); @@ -490,7 +490,7 @@ bool DockerDevicePrivate::createContainer() addTemporaryMount(Core::ICore::resourcePath("debugger/"), dumperPath); q->setDebugDumperPath(dumperPath); - for (const auto &[path, containerPath] : qAsConst(m_temporaryMounts)) { + for (const auto &[path, containerPath] : std::as_const(m_temporaryMounts)) { if (path.isEmpty()) continue; dockerCreate.addArgs({"-v", path.nativePath() + ':' + containerPath.nativePath()}); diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index bcde351b8c3..86eaa8efa12 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -6122,7 +6122,7 @@ bool FakeVimHandler::Private::handleExRegisterCommand(const ExCommand &cmd) } QString info; info += "--- Registers ---\n"; - for (char reg : qAsConst(regs)) { + for (char reg : std::as_const(regs)) { QString value = quoteUnprintable(registerContents(reg)); info += QString("\"%1 %2\n").arg(reg).arg(value); } @@ -6528,7 +6528,7 @@ bool FakeVimHandler::Private::handleExMultiRepeatCommand(const ExCommand &cmd) beginEditBlock(); - for (const QTextCursor &tc : qAsConst(matches)) { + for (const QTextCursor &tc : std::as_const(matches)) { setPosition(tc.position()); handleExCommand(innerCmd); } diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index cde11c1c220..12648471f8c 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -1396,7 +1396,7 @@ void FakeVimPluginPrivate::moveSomewhere(FakeVimHandler *handler, DistFunction f while (repeat < 0 || repeat-- > 0) { editors.removeOne(currentEditor); int bestValue = -1; - for (IEditor *editor : qAsConst(editors)) { + for (IEditor *editor : std::as_const(editors)) { QWidget *w = editor->widget(); QRect editorRect(w->mapToGlobal(w->geometry().topLeft()), w->mapToGlobal(w->geometry().bottomRight())); @@ -1428,7 +1428,7 @@ void FakeVimPluginPrivate::keepOnlyWindow() QList<IEditor *> editors = EditorManager::visibleEditors(); editors.removeOne(currentEditor); - for (IEditor *editor : qAsConst(editors)) { + for (IEditor *editor : std::as_const(editors)) { EditorManager::activateEditor(editor); triggerAction(Core::Constants::REMOVE_CURRENT_SPLIT); } diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 7916ee020d2..c9b56a142ad 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -416,7 +416,7 @@ void GenericBuildSystem::parse(RefreshOptions options) QStringList normalPaths; QStringList frameworkPaths; const auto baseDir = Utils::FilePath::fromString(m_includesFileName).parentDir(); - for (const QString &rawPath : qAsConst(m_rawProjectIncludePaths)) { + for (const QString &rawPath : std::as_const(m_rawProjectIncludePaths)) { if (rawPath.startsWith("-F")) frameworkPaths << rawPath.mid(2); else @@ -440,7 +440,7 @@ FilePath GenericBuildSystem::findCommonSourceRoot() return FilePath::fromFileInfo(QFileInfo(m_filesFileName)); QString root = m_files.front().first.toString(); - for (const SourceFile &sourceFile : qAsConst(m_files)) { + for (const SourceFile &sourceFile : std::as_const(m_files)) { const QString item = sourceFile.first.toString(); if (root.length() > item.length()) root.truncate(item.length()); @@ -468,7 +468,7 @@ void GenericBuildSystem::refresh(RefreshOptions options) FilePath baseDir = findCommonSourceRoot(); std::vector<std::unique_ptr<FileNode>> fileNodes; - for (const SourceFile &f : qAsConst(m_files)) { + for (const SourceFile &f : std::as_const(m_files)) { FileType fileType = FileType::Source; // ### FIXME if (f.first.endsWith(".qrc")) fileType = FileType::Resource; diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp index c262f07c0bc..4deefcb734c 100644 --- a/src/plugins/git/branchmodel.cpp +++ b/src/plugins/git/branchmodel.cpp @@ -127,7 +127,7 @@ public: fn.append(nodes.first()->sha); nodes.removeFirst(); - for (const BranchNode *n : qAsConst(nodes)) + for (const BranchNode *n : std::as_const(nodes)) fn.append(n->name); return fn; @@ -390,7 +390,7 @@ Qt::ItemFlags BranchModel::flags(const QModelIndex &index) const void BranchModel::clear() { - for (BranchNode *root : qAsConst(d->rootNode->children)) { + for (BranchNode *root : std::as_const(d->rootNode->children)) { while (root->count()) delete root->children.takeLast(); } diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp index eb8d5ad86e7..bc4f48277a8 100644 --- a/src/plugins/git/branchview.cpp +++ b/src/plugins/git/branchview.cpp @@ -392,7 +392,7 @@ bool BranchView::checkout() QList<Stash> stashes; client->synchronousStashList(m_repository, &stashes); - for (const Stash &stash : qAsConst(stashes)) { + for (const Stash &stash : std::as_const(stashes)) { if (stash.message.startsWith(popMessageStart)) { branchCheckoutDialog.foundStashForNextBranch(); break; @@ -428,7 +428,7 @@ bool BranchView::checkout() QList<Stash> stashes; QString stashName; client->synchronousStashList(m_repository, &stashes); - for (const Stash &stash : qAsConst(stashes)) { + for (const Stash &stash : std::as_const(stashes)) { if (stash.message.startsWith(popMessageStart)) { stashName = stash.name; break; diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp index 9691a8266a4..cd4857edeb4 100644 --- a/src/plugins/git/gerrit/gerritmodel.cpp +++ b/src/plugins/git/gerrit/gerritmodel.cpp @@ -908,7 +908,7 @@ void GerritModel::resultRetrieved(const QByteArray &output) std::stable_sort(changes.begin(), changes.end(), gerritChangeLessThan); numberIndexHash.clear(); - for (const GerritChangePtr &c : qAsConst(changes)) { + for (const GerritChangePtr &c : std::as_const(changes)) { // Avoid duplicate entries for example in the (unlikely) // case people do self-reviews. if (!itemForNumber(c->number)) { diff --git a/src/plugins/git/gerrit/gerritremotechooser.cpp b/src/plugins/git/gerrit/gerritremotechooser.cpp index df628194ba9..2d319bc8cb8 100644 --- a/src/plugins/git/gerrit/gerritremotechooser.cpp +++ b/src/plugins/git/gerrit/gerritremotechooser.cpp @@ -103,7 +103,7 @@ bool GerritRemoteChooser::updateRemotes(bool forceReload) void GerritRemoteChooser::addRemote(const GerritServer &server, const QString &name) { if (!m_allowDups) { - for (const auto &remote : qAsConst(m_remotes)) { + for (const auto &remote : std::as_const(m_remotes)) { if (remote.second == server) return; } diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 386549993ff..002d603a431 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1796,7 +1796,7 @@ QString GitClient::synchronousTopic(const FilePath &workingDirectory) const const QString dereference("^{}"); QString remoteBranch; - for (const QString &ref : qAsConst(references)) { + for (const QString &ref : std::as_const(references)) { int derefInd = ref.indexOf(dereference); if (ref.startsWith(tagStart)) return ref.mid(tagStart.size(), (derefInd == -1) ? -1 : derefInd - tagStart.size()); @@ -1968,7 +1968,7 @@ bool GitClient::stashNameFromMessage(const FilePath &workingDirectory, QList<Stash> stashes; if (!synchronousStashList(workingDirectory, &stashes, errorMessage)) return false; - for (const Stash &s : qAsConst(stashes)) { + for (const Stash &s : std::as_const(stashes)) { if (s.message == message) { *name = s.name; return true; @@ -2321,7 +2321,7 @@ void GitClient::updateSubmodulesIfNeeded(const FilePath &workingDirectory, bool void GitClient::finishSubmoduleUpdate() { - for (const FilePath &submoduleDir : qAsConst(m_updatedSubmodules)) + for (const FilePath &submoduleDir : std::as_const(m_updatedSubmodules)) endStashScope(submoduleDir); m_updatedSubmodules.clear(); } diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp index 1e0fc3f1312..243952c2d41 100644 --- a/src/plugins/git/gitgrep.cpp +++ b/src/plugins/git/gitgrep.cpp @@ -108,7 +108,7 @@ public: } single.matchingLine = text; - for (const auto &match : qAsConst(matches)) { + for (const auto &match : std::as_const(matches)) { single.matchStart = match.matchStart; single.matchLength = match.matchLength; single.regexpCapturedTexts = match.regexpCapturedTexts; diff --git a/src/plugins/git/githighlighters.cpp b/src/plugins/git/githighlighters.cpp index a3b7547f080..046a8b0c66e 100644 --- a/src/plugins/git/githighlighters.cpp +++ b/src/plugins/git/githighlighters.cpp @@ -138,7 +138,7 @@ void GitRebaseHighlighter::highlightBlock(const QString &text) setFormat(match.capturedStart(), match.capturedLength(), formatForCategory(Format_Change)); } } else { - for (const RebaseAction &action : qAsConst(m_actions)) { + for (const RebaseAction &action : std::as_const(m_actions)) { const QRegularExpressionMatch match = action.exp.match(text); if (match.hasMatch()) { const int len = match.capturedLength(); diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 4a19145300b..f2e277a7552 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1689,15 +1689,15 @@ void GitPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as) // Note: This menu is visible if there is no repository. Only // 'Create Repository'/'Show' actions should be available. const QString fileName = Utils::quoteAmpersands(state.currentFileName()); - for (ParameterAction *fileAction : qAsConst(m_fileActions)) + for (ParameterAction *fileAction : std::as_const(m_fileActions)) fileAction->setParameter(fileName); // If the current file looks like a patch, offer to apply m_applyCurrentFilePatchAction->setParameter(state.currentPatchFileDisplayName()); const QString projectName = state.currentProjectName(); - for (ParameterAction *projectAction : qAsConst(m_projectActions)) + for (ParameterAction *projectAction : std::as_const(m_projectActions)) projectAction->setParameter(projectName); - for (QAction *repositoryAction : qAsConst(m_repositoryActions)) + for (QAction *repositoryAction : std::as_const(m_repositoryActions)) repositoryAction->setEnabled(repositoryEnabled); m_submoduleUpdateAction->setVisible(repositoryEnabled diff --git a/src/plugins/gitlab/gitlabdialog.cpp b/src/plugins/gitlab/gitlabdialog.cpp index 7d95b2252d4..94de24d6f15 100644 --- a/src/plugins/gitlab/gitlabdialog.cpp +++ b/src/plugins/gitlab/gitlabdialog.cpp @@ -161,7 +161,7 @@ void GitLabDialog::updateRemotes() { m_remoteComboBox->clear(); const GitLabParameters *global = GitLabPlugin::globalParameters(); - for (const GitLabServer &server : qAsConst(global->gitLabServers)) + for (const GitLabServer &server : std::as_const(global->gitLabServers)) m_remoteComboBox->addItem(server.displayString(), QVariant::fromValue(server)); m_remoteComboBox->setCurrentIndex(m_remoteComboBox->findData( diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp index 40223ea5d29..b532c3b0fdf 100644 --- a/src/plugins/help/docsettingspage.cpp +++ b/src/plugins/help/docsettingspage.cpp @@ -327,7 +327,7 @@ void DocSettingsPageWidget::removeDocumentation(const QList<QModelIndex> &items) Utils::sort(itemsByDecreasingRow, [](const QModelIndex &i1, const QModelIndex &i2) { return i1.row() > i2.row(); }); - for (const QModelIndex &item : qAsConst(itemsByDecreasingRow)) { + for (const QModelIndex &item : std::as_const(itemsByDecreasingRow)) { const int row = item.row(); const QString nameSpace = m_model.entryAt(row).nameSpace; diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp index 55b22e97741..fd3473b57a0 100644 --- a/src/plugins/help/helpindexfilter.cpp +++ b/src/plugins/help/helpindexfilter.cpp @@ -84,7 +84,7 @@ QList<LocatorFilterEntry> HelpIndexFilter::matchesFor(QFutureInterface<LocatorFi const Qt::CaseSensitivity cs = caseSensitivity(entry); QList<LocatorFilterEntry> entries; - for (const QString &keyword : qAsConst(m_lastIndicesCache)) { + for (const QString &keyword : std::as_const(m_lastIndicesCache)) { const int index = keyword.indexOf(entry, 0, cs); LocatorFilterEntry filterEntry(this, keyword, QVariant(), m_icon); filterEntry.highlightInfo = {index, int(entry.length())}; diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index d3a54d6c119..30d638f40c7 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/src/plugins/help/helpwidget.cpp @@ -990,7 +990,7 @@ void HelpWidget::highlightSearchTerms(HelpViewer *viewer) { if (m_searchTerms.isEmpty()) return; - for (const QString &term : qAsConst(m_searchTerms)) + for (const QString &term : std::as_const(m_searchTerms)) viewer->findText(term, {}, false, true); m_searchTerms.clear(); } diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index eff01885b8b..8d8255c2293 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -298,7 +298,7 @@ void IosConfigurations::updateAutomaticKitList() existingKits.subtract(resultingKits); qCDebug(kitSetupLog) << "Removing unused kits:"; printKits(existingKits); - for (Kit *kit : qAsConst(existingKits)) + for (Kit *kit : std::as_const(existingKits)) KitManager::deregisterKit(kit); } @@ -474,7 +474,7 @@ void IosConfigurations::loadProvisioningData(bool notify) return teamInfo1.value(freeTeamTag).toInt() < teamInfo2.value(freeTeamTag).toInt(); }); - for (auto teamInfo : qAsConst(teams)) { + for (auto teamInfo : std::as_const(teams)) { auto team = std::make_shared<DevelopmentTeam>(); team->m_name = teamInfo.value(teamNameTag).toString(); team->m_email = teamInfo.value(emailTag).toString(); @@ -624,7 +624,7 @@ QDebug &operator<<(QDebug &stream, DevelopmentTeamPtr team) { QTC_ASSERT(team, return stream); stream << team->displayName() << team->identifier() << team->isFreeProfile(); - for (const auto &profile : qAsConst(team->m_profiles)) + for (const auto &profile : std::as_const(team->m_profiles)) stream << "Profile:" << profile; return stream; } diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp index f1e5b9717e7..277bfbfbcad 100644 --- a/src/plugins/ios/iosdevice.cpp +++ b/src/plugins/ios/iosdevice.cpp @@ -510,7 +510,7 @@ IosDeviceManager::IosDeviceManager(QObject *parent) : void IosDeviceManager::updateUserModeDevices() { - for (const QString &uid : qAsConst(m_userModeDeviceIds)) + for (const QString &uid : std::as_const(m_userModeDeviceIds)) updateInfo(uid); } diff --git a/src/plugins/ios/iosprobe.cpp b/src/plugins/ios/iosprobe.cpp index 97204b42daf..08d670c44f4 100644 --- a/src/plugins/ios/iosprobe.cpp +++ b/src/plugins/ios/iosprobe.cpp @@ -103,7 +103,7 @@ void XcodeProbe::setupDefaultToolchains(const QString &devPath) } if (!clangProfile.cCompilerPath.isEmpty() || !clangProfile.cxxCompilerPath.isEmpty()) { - for (const QString &arch : qAsConst(allArchitectures)) { + for (const QString &arch : std::as_const(allArchitectures)) { const QString clangFullName = QString(QLatin1String("Apple Clang (%1)")).arg(arch) + ((devPath != defaultDeveloperPath) ? QString(QLatin1String(" in %1")).arg(devPath) diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp index 16717cdfee0..be68f933639 100644 --- a/src/plugins/languageclient/client.cpp +++ b/src/plugins/languageclient/client.cpp @@ -203,7 +203,7 @@ public: } updateEditorToolBar(m_openedDocument.keys()); } - for (IAssistProcessor *processor : qAsConst(m_runningAssistProcessors)) + for (IAssistProcessor *processor : std::as_const(m_runningAssistProcessors)) processor->setAsyncProposalAvailable(nullptr); qDeleteAll(m_documentHighlightsTimer); m_documentHighlightsTimer.clear(); @@ -1548,7 +1548,7 @@ bool ClientPrivate::reset() // temporary container needed since m_resetAssistProvider is changed in resetAssistProviders for (TextEditor::TextDocument *document : m_resetAssistProvider.keys()) resetAssistProviders(document); - for (TextEditor::IAssistProcessor *processor : qAsConst(m_runningAssistProcessors)) + for (TextEditor::IAssistProcessor *processor : std::as_const(m_runningAssistProcessors)) processor->setAsyncProposalAvailable(nullptr); m_runningAssistProcessors.clear(); qDeleteAll(m_documentHighlightsTimer); diff --git a/src/plugins/languageclient/diagnosticmanager.cpp b/src/plugins/languageclient/diagnosticmanager.cpp index 5b829263af2..cb199538e9f 100644 --- a/src/plugins/languageclient/diagnosticmanager.cpp +++ b/src/plugins/languageclient/diagnosticmanager.cpp @@ -159,7 +159,7 @@ void DiagnosticManager::setExtraSelectionsId(const Utils::Id &extraSelectionsId) void DiagnosticManager::forAllMarks(std::function<void (TextEditor::TextMark *)> func) { - for (const Marks &marks : qAsConst(m_marks)) { + for (const Marks &marks : std::as_const(m_marks)) { for (TextEditor::TextMark *mark : marks.marks) func(mark); } diff --git a/src/plugins/languageclient/documentsymbolcache.cpp b/src/plugins/languageclient/documentsymbolcache.cpp index 66c189a4b5b..465c3c4f690 100644 --- a/src/plugins/languageclient/documentsymbolcache.cpp +++ b/src/plugins/languageclient/documentsymbolcache.cpp @@ -64,7 +64,7 @@ void DocumentSymbolCache::requestSymbolsImpl() m_compressionTimer.start(200); return; } - for (const DocumentUri &uri : qAsConst(m_compressedUris)) { + for (const DocumentUri &uri : std::as_const(m_compressedUris)) { auto entry = m_cache.find(uri); if (entry != m_cache.end()) { emit gotSymbols(uri, entry.value()); diff --git a/src/plugins/languageclient/languageclientcompletionassist.cpp b/src/plugins/languageclient/languageclientcompletionassist.cpp index 6c108708420..fd8346962a5 100644 --- a/src/plugins/languageclient/languageclientcompletionassist.cpp +++ b/src/plugins/languageclient/languageclientcompletionassist.cpp @@ -468,7 +468,7 @@ void LanguageClientCompletionAssistProvider::setTriggerCharacters( { m_activationCharSequenceLength = 0; m_triggerChars = triggerChars.value_or(QList<QString>()); - for (const QString &trigger : qAsConst(m_triggerChars)) { + for (const QString &trigger : std::as_const(m_triggerChars)) { if (trigger.length() > m_activationCharSequenceLength) m_activationCharSequenceLength = trigger.length(); } diff --git a/src/plugins/languageclient/languageclientfunctionhint.cpp b/src/plugins/languageclient/languageclientfunctionhint.cpp index ec180f4f05a..2b5b46cdfac 100644 --- a/src/plugins/languageclient/languageclientfunctionhint.cpp +++ b/src/plugins/languageclient/languageclientfunctionhint.cpp @@ -147,7 +147,7 @@ void FunctionHintAssistProvider::setTriggerCharacters( const std::optional<QList<QString>> &triggerChars) { m_triggerChars = triggerChars.value_or(QList<QString>()); - for (const QString &trigger : qAsConst(m_triggerChars)) { + for (const QString &trigger : std::as_const(m_triggerChars)) { if (trigger.length() > m_activationCharSequenceLength) m_activationCharSequenceLength = trigger.length(); } diff --git a/src/plugins/languageclient/languageclientmanager.cpp b/src/plugins/languageclient/languageclientmanager.cpp index fce7cc8b825..47624ca5f29 100644 --- a/src/plugins/languageclient/languageclientmanager.cpp +++ b/src/plugins/languageclient/languageclientmanager.cpp @@ -186,7 +186,7 @@ void LanguageClientManager::addExclusiveRequest(const MessageId &id, Client *cli void LanguageClientManager::reportFinished(const MessageId &id, Client *byClient) { QTC_ASSERT(managerInstance, return); - for (Client *client : qAsConst(managerInstance->m_exclusiveRequests[id])) { + for (Client *client : std::as_const(managerInstance->m_exclusiveRequests[id])) { if (client != byClient) client->cancelRequest(id); } @@ -275,14 +275,14 @@ void LanguageClientManager::applySettings() documents << managerInstance->m_clientForDocument.keys(client); shutdownClient(client); } - for (auto document : qAsConst(documents)) + for (auto document : std::as_const(documents)) managerInstance->m_clientForDocument.remove(document); if (!setting->isValid() || !setting->m_enabled) continue; switch (setting->m_startBehavior) { case BaseSettings::AlwaysOn: { Client *client = startClient(setting); - for (TextEditor::TextDocument *document : qAsConst(documents)) + for (TextEditor::TextDocument *document : std::as_const(documents)) managerInstance->m_clientForDocument[document] = client; break; } @@ -296,7 +296,7 @@ void LanguageClientManager::applySettings() } if (!documents.isEmpty()) { Client *client = startClient(setting); - for (TextEditor::TextDocument *document : qAsConst(documents)) + for (TextEditor::TextDocument *document : std::as_const(documents)) client->openDocument(document); } break; @@ -514,7 +514,7 @@ void LanguageClientManager::documentOpened(Core::IDocument *document) } else if (setting->m_startBehavior == BaseSettings::RequiresFile && clients.isEmpty()) { clients << startClient(setting); } - for (auto client : qAsConst(clients)) + for (auto client : std::as_const(clients)) client->openDocument(textDocument); } } @@ -546,7 +546,7 @@ void LanguageClientManager::documentWillSave(Core::IDocument *document) void LanguageClientManager::updateProject(ProjectExplorer::Project *project) { - for (BaseSettings *setting : qAsConst(m_currentSettings)) { + for (BaseSettings *setting : std::as_const(m_currentSettings)) { if (setting->isValid() && setting->m_enabled && setting->m_startBehavior == BaseSettings::RequiresProject) { diff --git a/src/plugins/languageclient/languageclientsymbolsupport.cpp b/src/plugins/languageclient/languageclientsymbolsupport.cpp index 5bed7bc164d..fdce7843224 100644 --- a/src/plugins/languageclient/languageclientsymbolsupport.cpp +++ b/src/plugins/languageclient/languageclientsymbolsupport.cpp @@ -438,7 +438,7 @@ QList<Core::SearchResultItem> generateReplaceItems(const WorkspaceEdit &edits, QMap<Utils::FilePath, QList<ItemData>> rangesInDocument; auto documentChanges = edits.documentChanges().value_or(QList<TextDocumentEdit>()); if (!documentChanges.isEmpty()) { - for (const TextDocumentEdit &documentChange : qAsConst(documentChanges)) { + for (const TextDocumentEdit &documentChange : std::as_const(documentChanges)) { rangesInDocument[documentChange.textDocument().uri().toFilePath()] = convertEdits( documentChange.edits()); } diff --git a/src/plugins/languageclient/languageclientutils.cpp b/src/plugins/languageclient/languageclientutils.cpp index dbea480a70f..f85d62a4c28 100644 --- a/src/plugins/languageclient/languageclientutils.cpp +++ b/src/plugins/languageclient/languageclientutils.cpp @@ -183,7 +183,7 @@ void updateCodeActionRefactoringMarker(Client *client, } else if (std::optional<WorkspaceEdit::Changes> localChanges = edit->changes()) { edits = (*localChanges)[uri]; } - for (const TextEdit &edit : qAsConst(edits)) + for (const TextEdit &edit : std::as_const(edits)) addMarkerForCursor(action, edit.range()); } } diff --git a/src/plugins/languageclient/locatorfilter.cpp b/src/plugins/languageclient/locatorfilter.cpp index 6df5170a42d..971c701d5d8 100644 --- a/src/plugins/languageclient/locatorfilter.cpp +++ b/src/plugins/languageclient/locatorfilter.cpp @@ -250,7 +250,7 @@ void WorkspaceLocatorFilter::prepareSearch(const QString &entry, params.setLimit(m_maxResultCount); QMutexLocker locker(&m_mutex); - for (auto client : qAsConst(clients)) { + for (auto client : std::as_const(clients)) { if (!client->reachable()) continue; if (!(force || client->locatorsEnabled())) diff --git a/src/plugins/languageclient/semantichighlightsupport.cpp b/src/plugins/languageclient/semantichighlightsupport.cpp index e9f6429acaf..d51d62ad1fa 100644 --- a/src/plugins/languageclient/semantichighlightsupport.cpp +++ b/src/plugins/languageclient/semantichighlightsupport.cpp @@ -235,7 +235,7 @@ void SemanticTokenSupport::setLegend(const LanguageServerProtocol::SemanticToken void SemanticTokenSupport::updateFormatHash() { auto fontSettings = TextEditorSettings::fontSettings(); - for (int tokenType : qAsConst(m_tokenTypes)) { + for (int tokenType : std::as_const(m_tokenTypes)) { if (tokenType < 0) continue; TextStyle style; @@ -364,7 +364,7 @@ void SemanticTokenSupport::handleSemanticTokensDelta( const QList<int> &data = tokens.data(); int newDataSize = data.size(); - for (const SemanticTokensEdit &edit : qAsConst(edits)) + for (const SemanticTokensEdit &edit : std::as_const(edits)) newDataSize += edit.dataSize() - edit.deleteCount(); QList<int> newData; newData.reserve(newDataSize); @@ -373,7 +373,7 @@ void SemanticTokenSupport::handleSemanticTokensDelta( const auto end = data.end(); qCDebug(LOGLSPHIGHLIGHT) << "Edit Tokens"; qCDebug(LOGLSPHIGHLIGHT) << "Data before edit " << data; - for (const SemanticTokensEdit &edit : qAsConst(edits)) { + for (const SemanticTokensEdit &edit : std::as_const(edits)) { if (edit.start() > data.size()) // prevent edits after the previously reported data return; for (const auto start = data.begin() + edit.start(); it < start; ++it) @@ -446,7 +446,7 @@ void SemanticTokenSupport::highlight(const Utils::FilePath &filePath, bool force }; if (LOGLSPHIGHLIGHT().isDebugEnabled()) { qCDebug(LOGLSPHIGHLIGHT) << "Expanded Tokens for " << filePath; - for (const ExpandedSemanticToken &token : qAsConst(expandedTokens)) { + for (const ExpandedSemanticToken &token : std::as_const(expandedTokens)) { qCDebug(LOGLSPHIGHLIGHT) << token.line << token.column << token.length << token.type << token.modifiers; } diff --git a/src/plugins/macros/macro.cpp b/src/plugins/macros/macro.cpp index dba5472ca40..2f7e44fe393 100644 --- a/src/plugins/macros/macro.cpp +++ b/src/plugins/macros/macro.cpp @@ -121,7 +121,7 @@ bool Macro::save(const QString &fileName, QWidget *parent) QDataStream stream(saver.file()); stream << d->version; stream << d->description; - for (const MacroEvent &event : qAsConst(d->events)) { + for (const MacroEvent &event : std::as_const(d->events)) { event.save(stream); } saver.setResult(&stream); diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp index 627f8ee8c46..4f79dee1867 100644 --- a/src/plugins/macros/macromanager.cpp +++ b/src/plugins/macros/macromanager.cpp @@ -178,7 +178,7 @@ bool MacroManagerPrivate::executeMacro(Macro *macro) for (const MacroEvent ¯oEvent : macroEvents) { if (error) break; - for (IMacroHandler *handler : qAsConst(handlers)) { + for (IMacroHandler *handler : std::as_const(handlers)) { if (handler->canExecuteEvent(macroEvent)) { if (!handler->executeEvent(macroEvent)) error = true; @@ -256,7 +256,7 @@ void MacroManager::startMacro() Core::ActionManager::command(Constants::END_MACRO)->action()->setEnabled(true); Core::ActionManager::command(Constants::EXECUTE_LAST_MACRO)->action()->setEnabled(false); Core::ActionManager::command(Constants::SAVE_LAST_MACRO)->action()->setEnabled(false); - for (IMacroHandler *handler : qAsConst(d->handlers)) + for (IMacroHandler *handler : std::as_const(d->handlers)) handler->startRecording(d->currentMacro); const QString endShortcut = Core::ActionManager::command(Constants::END_MACRO) @@ -281,7 +281,7 @@ void MacroManager::endMacro() Core::ActionManager::command(Constants::END_MACRO)->action()->setEnabled(false); Core::ActionManager::command(Constants::EXECUTE_LAST_MACRO)->action()->setEnabled(true); Core::ActionManager::command(Constants::SAVE_LAST_MACRO)->action()->setEnabled(true); - for (IMacroHandler *handler : qAsConst(d->handlers)) + for (IMacroHandler *handler : std::as_const(d->handlers)) handler->endRecordingMacro(d->currentMacro); d->isRecording = false; diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp index 58156c4d8f6..44705c7ebd8 100644 --- a/src/plugins/macros/macrooptionswidget.cpp +++ b/src/plugins/macros/macrooptionswidget.cpp @@ -135,7 +135,7 @@ void MacroOptionsWidget::remove() void MacroOptionsWidget::apply() { // Remove macro - for (const QString &name : qAsConst(m_macroToRemove)) { + for (const QString &name : std::as_const(m_macroToRemove)) { MacroManager::instance()->deleteMacro(name); m_macroToChange.remove(name); } diff --git a/src/plugins/marketplace/productlistmodel.cpp b/src/plugins/marketplace/productlistmodel.cpp index baa12cc73d0..7e2f0f76d86 100644 --- a/src/plugins/marketplace/productlistmodel.cpp +++ b/src/plugins/marketplace/productlistmodel.cpp @@ -308,7 +308,7 @@ void SectionedProducts::fetchNextImage() if (QPixmapCache::find(nextUrl, nullptr)) { // this image is already cached it might have been added while downloading - for (ProductListModel *model : qAsConst(m_productModels)) + for (ProductListModel *model : std::as_const(m_productModels)) model->updateModelIndexesForUrl(nextUrl); fetchNextImage(); return; @@ -337,7 +337,7 @@ void SectionedProducts::onImageDownloadFinished(QNetworkReply *reply) Qt::KeepAspectRatio, Qt::SmoothTransformation); pixmap.setDevicePixelRatio(dpr); QPixmapCache::insert(url, pixmap); - for (ProductListModel *model : qAsConst(m_productModels)) + for (ProductListModel *model : std::as_const(m_productModels)) model->updateModelIndexesForUrl(url); } } // handle error not needed - it's okay'ish to have no images as long as the rest works @@ -386,7 +386,7 @@ void SectionedProducts::onTagClicked(const QString &tag) QList<Core::ListItem *> SectionedProducts::items() { QList<Core::ListItem *> result; - for (const ProductListModel *model : qAsConst(m_productModels)) + for (const ProductListModel *model : std::as_const(m_productModels)) result.append(model->items()); return result; } diff --git a/src/plugins/mcusupport/mcukitmanager.cpp b/src/plugins/mcusupport/mcukitmanager.cpp index d7e3d1cc389..ef7f9f2ed2a 100644 --- a/src/plugins/mcusupport/mcukitmanager.cpp +++ b/src/plugins/mcusupport/mcukitmanager.cpp @@ -43,7 +43,7 @@ namespace McuSupport::Internal { static QMap<QByteArray, QByteArray> cMakeConfigToMap(const CMakeConfig &config) { QMap<QByteArray, QByteArray> map; - for (const auto &configItem : qAsConst(config.toList())) { + for (const auto &configItem : std::as_const(config.toList())) { map.insert(configItem.key, configItem.value); } return map; @@ -493,7 +493,7 @@ void createAutomaticKits(const SettingsHandler::Ptr &settingsHandler) McuSdkRepository repo{targetsAndPackages(qtForMCUsPackage, settingsHandler)}; bool needsUpgrade = false; - for (const auto &target : qAsConst(repo.mcuTargets)) { + for (const auto &target : std::as_const(repo.mcuTargets)) { // if kit already exists, skip if (!matchingKits(target.get(), qtForMCUsPackage).empty()) continue; @@ -530,7 +530,7 @@ void upgradeKitsByCreatingNewPackage(const SettingsHandler::Ptr &settingsHandler McuSdkRepository repo{targetsAndPackages(qtForMCUsPackage, settingsHandler)}; - for (const auto &target : qAsConst(repo.mcuTargets)) { + for (const auto &target : std::as_const(repo.mcuTargets)) { if (!matchingKits(target.get(), qtForMCUsPackage).empty()) // already up-to-date continue; @@ -570,7 +570,7 @@ void updatePathsInExistingKits(const SettingsHandler::Ptr &settingsHandler) McuPackagePtr qtForMCUsPackage{createQtForMCUsPackage(settingsHandler)}; McuSdkRepository repo{targetsAndPackages(qtForMCUsPackage, settingsHandler)}; - for (const auto &target : qAsConst(repo.mcuTargets)) { + for (const auto &target : std::as_const(repo.mcuTargets)) { if (target->isValid()) { for (auto *kit : kitsWithMismatchedDependencies(target.get())) { auto changes = cMakeConfigToMap(CMakeConfigurationKitAspect::configuration(kit)); @@ -629,7 +629,7 @@ void fixExistingKits(const SettingsHandler::Ptr &settingsHandler) } if (!kit->hasValue(kitQmlImportPath)) { auto config = CMakeProjectManager::CMakeConfigurationKitAspect::configuration(kit); - for (const auto &cfgItem : qAsConst(config)) { + for (const auto &cfgItem : std::as_const(config)) { if (cfgItem.key == "QUL_GENERATORS") { auto idx = cfgItem.value.indexOf("/lib/cmake/Qul"); auto qulDir = cfgItem.value.left(idx); @@ -655,7 +655,7 @@ void fixExistingKits(const SettingsHandler::Ptr &settingsHandler) qtForMCUsPackage->updateStatus(); if (qtForMCUsPackage->isValidStatus()) { McuSdkRepository repo{targetsAndPackages(qtForMCUsPackage, settingsHandler)}; - for (const auto &target : qAsConst(repo.mcuTargets)) + for (const auto &target : std::as_const(repo.mcuTargets)) for (auto kit : existingKits(target.get())) { if (McuDependenciesKitAspect::dependencies(kit).isEmpty()) { McuKitFactory::setKitCMakeOptions(kit, target.get(), qtForMCUsPackage); diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index 7f4eb241b48..edd7ac13bfc 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -100,7 +100,7 @@ void McuSupportOptions::setQulDir(const FilePath &) sdkRepository = targetsAndPackages(qtForMCUsSdkPackage, settingsHandler); else sdkRepository = McuSdkRepository{}; - for (const auto &package : qAsConst(sdkRepository.packages)) + for (const auto &package : std::as_const(sdkRepository.packages)) connect(package.get(), &McuAbstractPackage::changed, this, diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp index 35f663d8e60..f4a794e4133 100644 --- a/src/plugins/mcusupport/mcusupportoptionspage.cpp +++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp @@ -256,7 +256,7 @@ void McuSupportOptionsWidget::showMcuTargetPackages() row.fieldItem->widget()->hide(); } - for (const auto &package : qAsConst(m_options.sdkRepository.packages)) { + for (const auto &package : std::as_const(m_options.sdkRepository.packages)) { QWidget *packageWidget = package->widget(); if (!mcuTarget->packages().contains(package) || package->label().isEmpty()) continue; @@ -289,7 +289,7 @@ void McuSupportOptionsWidget::apply() m_settingsHandler->setAutomaticKitCreation(m_options.automaticKitCreationEnabled()); pathsChanged |= m_options.qtForMCUsSdkPackage->writeToSettings(); - for (const auto &package : qAsConst(m_options.sdkRepository.packages)) + for (const auto &package : std::as_const(m_options.sdkRepository.packages)) pathsChanged |= package->writeToSettings(); if (pathsChanged) { diff --git a/src/plugins/mercurial/commiteditor.cpp b/src/plugins/mercurial/commiteditor.cpp index 3288d63389e..ab46c2b5c82 100644 --- a/src/plugins/mercurial/commiteditor.cpp +++ b/src/plugins/mercurial/commiteditor.cpp @@ -50,7 +50,7 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra VcsBaseSubmitEditor::filterUntrackedFilesOfProject(fileModel->repositoryRoot(), &shouldTrack); - for (const QString &track : qAsConst(shouldTrack)) { + for (const QString &track : std::as_const(shouldTrack)) { for (const VcsBaseClient::StatusItem &item : repoStatus) { if (item.file == track) fileModel->addFile(item.file, item.flags, Unchecked); diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 389accbd641..f9332fcc04c 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -708,7 +708,7 @@ void MercurialPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as) revertFile->setParameter(filename); statusFile->setParameter(filename); - for (QAction *repoAction : qAsConst(m_repositoryActionList)) + for (QAction *repoAction : std::as_const(m_repositoryActionList)) repoAction->setEnabled(repoEnabled); } diff --git a/src/plugins/modeleditor/modeleditor.cpp b/src/plugins/modeleditor/modeleditor.cpp index e0f1838c582..8180f0ef5b2 100644 --- a/src/plugins/modeleditor/modeleditor.cpp +++ b/src/plugins/modeleditor/modeleditor.cpp @@ -1046,7 +1046,7 @@ void ModelEditor::initToolbars() QList<qmt::Toolbar> toolbars = stereotypeController->toolbars(); std::stable_sort(toolbars.begin(), toolbars.end(), [=](const qmt::Toolbar &lhs, const qmt::Toolbar &rhs) { return lhs.priority() > rhs.priority(); }); - for (const qmt::Toolbar &toolbar : qAsConst(toolbars)) { + for (const qmt::Toolbar &toolbar : std::as_const(toolbars)) { QWidget *toolBar = toolBars.value(toolbar.id()); QLayout *toolBarLayout = nullptr; if (!toolBar) { @@ -1171,7 +1171,7 @@ void ModelEditor::initToolbars() // add stretch to all layouts and calculate width of tool bar int maxWidth = 48; - for (QWidget *toolBar : qAsConst(toolBars)) { + for (QWidget *toolBar : std::as_const(toolBars)) { QMT_ASSERT(toolBar, continue); auto layout = qobject_cast<QBoxLayout *>(toolBar->layout()); QMT_ASSERT(layout, continue); diff --git a/src/plugins/modeleditor/modelsmanager.cpp b/src/plugins/modeleditor/modelsmanager.cpp index 5a5cd67276b..fe7bbc9bbd5 100644 --- a/src/plugins/modeleditor/modelsmanager.cpp +++ b/src/plugins/modeleditor/modelsmanager.cpp @@ -145,7 +145,7 @@ void ModelsManager::releaseModel(ExtDocumentController *documentController) void ModelsManager::openDiagram(const qmt::Uid &modelUid, const qmt::Uid &diagramUid) { - for (const ManagedModel &managedModel : qAsConst(d->managedModels)) { + for (const ManagedModel &managedModel : std::as_const(d->managedModels)) { if (managedModel.m_documentController->projectController()->project()->uid() == modelUid) { qmt::MDiagram *diagram = managedModel.m_documentController->modelController()->findObject<qmt::MDiagram>(diagramUid); QMT_ASSERT(diagram, continue); @@ -208,7 +208,7 @@ void ModelsManager::onAboutToShowContextMenu(ProjectExplorer::Node *node) { bool canOpenDiagram = false; - for (const ManagedModel &managedModel : qAsConst(d->managedModels)) { + for (const ManagedModel &managedModel : std::as_const(d->managedModels)) { if (managedModel.m_documentController->pxNodeController()->hasDiagramForExplorerNode(node)) { canOpenDiagram = true; break; @@ -226,7 +226,7 @@ void ModelsManager::onOpenDiagramFromProjectExplorer() { if (ProjectExplorer::ProjectTree::currentNode() == d->contextMenuOwnerNode) { qmt::MDiagram *diagram = nullptr; - for (const ManagedModel &managedModel : qAsConst(d->managedModels)) { + for (const ManagedModel &managedModel : std::as_const(d->managedModels)) { if ((diagram = managedModel.m_documentController->pxNodeController()->findDiagramForExplorerNode(d->contextMenuOwnerNode))) { openDiagram(managedModel.m_documentController, diagram); break; @@ -245,7 +245,7 @@ void ModelsManager::onOpenDefaultModel(const qmt::Uid &modelUid) void ModelsManager::openDiagram(ExtDocumentController *documentController, qmt::MDiagram *diagram) { - for (const ManagedModel &managedModel : qAsConst(d->managedModels)) { + for (const ManagedModel &managedModel : std::as_const(d->managedModels)) { if (managedModel.m_documentController == documentController) { Core::IEditor *editor = Core::EditorManager::activateEditorForDocument(managedModel.m_modelDocument); if (auto modelEditor = qobject_cast<ModelEditor *>(editor)) { diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp index 718f9b12ab3..958b9388a2a 100644 --- a/src/plugins/nim/project/nimcompilerbuildstep.cpp +++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp @@ -175,7 +175,7 @@ CommandLine NimCompilerBuildStep::commandLine() cmd.addArg("--out:" + outFilePath().toString()); cmd.addArg("--nimCache:" + bc->cacheDirectory().toString()); - for (const QString &arg : qAsConst(m_userCompilerOptions)) { + for (const QString &arg : std::as_const(m_userCompilerOptions)) { if (!arg.isEmpty()) cmd.addArg(arg); } diff --git a/src/plugins/perforce/perforcesubmiteditor.cpp b/src/plugins/perforce/perforcesubmiteditor.cpp index 18f595663be..db7474edfaa 100644 --- a/src/plugins/perforce/perforcesubmiteditor.cpp +++ b/src/plugins/perforce/perforcesubmiteditor.cpp @@ -103,7 +103,7 @@ void PerforceSubmitEditor::updateFields() lines = m_entries.value(QLatin1String("Files")).split(newLine); // split up "file#add" and store complete spec line as user data - for (const QString &specLine : qAsConst(lines)) { + for (const QString &specLine : std::as_const(lines)) { const QStringList list = specLine.split(QLatin1Char('#')); if (list.size() == 2) { const QString file = list.at(0).trimmed(); diff --git a/src/plugins/perfprofiler/perfconfigwidget.cpp b/src/plugins/perfprofiler/perfconfigwidget.cpp index 1441c305747..69eb0fab710 100644 --- a/src/plugins/perfprofiler/perfconfigwidget.cpp +++ b/src/plugins/perfprofiler/perfconfigwidget.cpp @@ -182,7 +182,7 @@ void PerfConfigWidget::handleProcessDone() Tr::tr("No Trace Points Found"), Tr::tr("Trace points can be defined with \"perf probe -a\".")); } else { - for (const QByteArray &event : qAsConst(tracePoints)) { + for (const QByteArray &event : std::as_const(tracePoints)) { int row = model->rowCount(); model->insertRow(row); model->setData(model->index(row, PerfConfigEventsModel::ColumnEventType), diff --git a/src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp b/src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp index 0b111c102d0..5c34eb633a4 100644 --- a/src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp +++ b/src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp @@ -310,7 +310,7 @@ void PerfProfilerFlameGraphModel::finalize(PerfProfilerFlameGraphData *data) node->resourcePeak = node->resourceUsage; node->lastResourceChangeId = data->resourcePeakId(); } - for (const auto &child : qAsConst(node->children)) + for (const auto &child : std::as_const(node->children)) nodes.enqueue(child.get()); } diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp index 66084dbdca9..092bdf9c783 100644 --- a/src/plugins/perfprofiler/perfprofilertool.cpp +++ b/src/plugins/perfprofiler/perfprofilertool.cpp @@ -500,7 +500,7 @@ void PerfProfilerTool::updateFilterMenu() QList<PerfProfilerTraceManager::Thread> threads = m_traceManager->threads().values(); std::sort(threads.begin(), threads.end()); - for (const PerfProfilerTraceManager::Thread &thread : qAsConst(threads)) { + for (const PerfProfilerTraceManager::Thread &thread : std::as_const(threads)) { QAction *action = m_filterMenu->addAction( QString::fromLatin1("%1 (%2)") .arg(QString::fromUtf8(m_traceManager->string(thread.name))) diff --git a/src/plugins/perfprofiler/perftimelinemodelmanager.cpp b/src/plugins/perfprofiler/perftimelinemodelmanager.cpp index cd5e1c581f2..e86d3a81308 100644 --- a/src/plugins/perfprofiler/perftimelinemodelmanager.cpp +++ b/src/plugins/perfprofiler/perftimelinemodelmanager.cpp @@ -63,7 +63,7 @@ void PerfTimelineModelManager::finalize() m_unfinished.clear(); const qint64 frequency = m_traceManager->samplingFrequency(); - for (PerfTimelineModel *model : qAsConst(finished)) { + for (PerfTimelineModel *model : std::as_const(finished)) { model->setSamplingFrequency(frequency); threads.remove(model->tid()); } @@ -84,7 +84,7 @@ void PerfTimelineModelManager::finalize() }); QVariantList modelsToAdd; - for (PerfTimelineModel *model : qAsConst(finished)) + for (PerfTimelineModel *model : std::as_const(finished)) modelsToAdd.append(QVariant::fromValue(model)); setModels(modelsToAdd); } diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index fcf0cb4d0df..8022256325d 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -1201,7 +1201,7 @@ Abis Abi::abisOfBinary(const Utils::FilePath &path) // Remove duplicates: Abis result; - for (const Abi &a : qAsConst(tmp)) { + for (const Abi &a : std::as_const(tmp)) { if (!result.contains(a)) result.append(a); } diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 1e22fac9961..1f58332b8b2 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -228,7 +228,7 @@ AppOutputPane::~AppOutputPane() { qCDebug(appOutputLog) << "AppOutputPane::~AppOutputPane: Entries left" << m_runControlTabs.size(); - for (const RunControlTab &rt : qAsConst(m_runControlTabs)) { + for (const RunControlTab &rt : std::as_const(m_runControlTabs)) { delete rt.window; delete rt.runControl; } @@ -355,7 +355,7 @@ void AppOutputPane::updateFilter() const QList<Core::OutputWindow *> AppOutputPane::outputWindows() const { QList<Core::OutputWindow *> windows; - for (const RunControlTab &tab : qAsConst(m_runControlTabs)) { + for (const RunControlTab &tab : std::as_const(m_runControlTabs)) { if (tab.window) windows << tab.window; } @@ -381,7 +381,7 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc) connect(rc, &RunControl::started, this, runControlChanged); connect(rc, &RunControl::stopped, this, [this, rc] { QTimer::singleShot(0, this, [this, rc] { runControlFinished(rc); }); - for (const RunControlTab &t : qAsConst(m_runControlTabs)) { + for (const RunControlTab &t : std::as_const(m_runControlTabs)) { if (t.runControl == rc) { t.window->flush(); break; @@ -451,7 +451,7 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc) connect(ow, &Core::OutputWindow::wheelZoom, this, [this, ow]() { float fontZoom = ow->fontZoom(); - for (const RunControlTab &tab : qAsConst(m_runControlTabs)) + for (const RunControlTab &tab : std::as_const(m_runControlTabs)) tab.window->setFontZoom(fontZoom); }); connect(TextEditor::TextEditorSettings::instance(), &TextEditor::TextEditorSettings::fontSettingsChanged, @@ -476,7 +476,7 @@ void AppOutputPane::handleOldOutput(Core::OutputWindow *window) const void AppOutputPane::updateFromSettings() { - for (const RunControlTab &tab : qAsConst(m_runControlTabs)) { + for (const RunControlTab &tab : std::as_const(m_runControlTabs)) { tab.window->setWordWrapEnabled(m_settings.wrapOutput); tab.window->setMaxCharCount(m_settings.maxCharCount); } @@ -677,19 +677,19 @@ void AppOutputPane::enableDefaultButtons() void AppOutputPane::zoomIn(int range) { - for (const RunControlTab &tab : qAsConst(m_runControlTabs)) + for (const RunControlTab &tab : std::as_const(m_runControlTabs)) tab.window->zoomIn(range); } void AppOutputPane::zoomOut(int range) { - for (const RunControlTab &tab : qAsConst(m_runControlTabs)) + for (const RunControlTab &tab : std::as_const(m_runControlTabs)) tab.window->zoomOut(range); } void AppOutputPane::resetZoom() { - for (const RunControlTab &tab : qAsConst(m_runControlTabs)) + for (const RunControlTab &tab : std::as_const(m_runControlTabs)) tab.window->resetZoom(); } diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index df0c433ed28..b858fdb4d46 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -284,10 +284,10 @@ void BuildConfiguration::doInitialize(const BuildInfo &info) d->m_initialBuildType = info.buildType; - for (Utils::Id id : qAsConst(d->m_initialBuildSteps)) + for (Utils::Id id : std::as_const(d->m_initialBuildSteps)) d->m_buildSteps.appendStep(id); - for (Utils::Id id : qAsConst(d->m_initialCleanSteps)) + for (Utils::Id id : std::as_const(d->m_initialCleanSteps)) d->m_cleanSteps.appendStep(id); if (d->m_initializer) @@ -702,7 +702,7 @@ BuildConfigurationFactory *BuildConfigurationFactory::find(const Kit *k, const F { QTC_ASSERT(k, return nullptr); const Utils::Id deviceType = DeviceTypeKitAspect::deviceTypeId(k); - for (BuildConfigurationFactory *factory : qAsConst(g_buildConfigurationFactories)) { + for (BuildConfigurationFactory *factory : std::as_const(g_buildConfigurationFactories)) { if (Utils::mimeTypeForFile(projectPath).matchesName(factory->m_supportedProjectMimeTypeName) && factory->supportsTargetDeviceType(deviceType)) return factory; @@ -713,7 +713,7 @@ BuildConfigurationFactory *BuildConfigurationFactory::find(const Kit *k, const F // create BuildConfigurationFactory * BuildConfigurationFactory::find(Target *parent) { - for (BuildConfigurationFactory *factory : qAsConst(g_buildConfigurationFactories)) { + for (BuildConfigurationFactory *factory : std::as_const(g_buildConfigurationFactories)) { if (factory->canHandle(parent)) return factory; } @@ -775,7 +775,7 @@ BuildConfiguration *BuildConfigurationFactory::create(Target *parent, const Buil BuildConfiguration *BuildConfigurationFactory::restore(Target *parent, const QVariantMap &map) { const Utils::Id id = idFromMap(map); - for (BuildConfigurationFactory *factory : qAsConst(g_buildConfigurationFactories)) { + for (BuildConfigurationFactory *factory : std::as_const(g_buildConfigurationFactories)) { QTC_ASSERT(factory->m_creator, return nullptr); if (!factory->canHandle(parent)) continue; diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index b682d7a50e5..59beff60f77 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -508,7 +508,7 @@ void BuildManager::emitCancelMessage() void BuildManager::clearBuildQueue() { - for (BuildStep *bs : qAsConst(d->m_buildQueue)) { + for (BuildStep *bs : std::as_const(d->m_buildQueue)) { decrementActiveBuildSteps(bs); disconnectOutput(bs); } diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp index 38a177addf5..070e8f3b545 100644 --- a/src/plugins/projectexplorer/buildstep.cpp +++ b/src/plugins/projectexplorer/buildstep.cpp @@ -145,7 +145,7 @@ QWidget *BuildStep::doCreateConfigWidget() setSummaryText(m_summaryUpdater()); }; - for (BaseAspect *aspect : qAsConst(m_aspects)) + for (BaseAspect *aspect : std::as_const(m_aspects)) connect(aspect, &BaseAspect::changed, widget, recreateSummary); connect(buildConfiguration(), &BuildConfiguration::buildDirectoryChanged, @@ -159,7 +159,7 @@ QWidget *BuildStep::doCreateConfigWidget() QWidget *BuildStep::createConfigWidget() { Layouting::Form builder; - for (BaseAspect *aspect : qAsConst(m_aspects)) { + for (BaseAspect *aspect : std::as_const(m_aspects)) { if (aspect->isVisible()) aspect->addToLayout(builder.finishRow()); } diff --git a/src/plugins/projectexplorer/customparser.cpp b/src/plugins/projectexplorer/customparser.cpp index 7bcc18a6210..e10f1e8f380 100644 --- a/src/plugins/projectexplorer/customparser.cpp +++ b/src/plugins/projectexplorer/customparser.cpp @@ -277,7 +277,7 @@ public: void setSelectedParsers(const QList<Utils::Id> &parsers) { - for (const auto &p : qAsConst(parserCheckBoxes)) + for (const auto &p : std::as_const(parserCheckBoxes)) p.first->setChecked(parsers.contains(p.second)); emit selectionChanged(); } @@ -285,7 +285,7 @@ public: QList<Utils::Id> selectedParsers() const { QList<Utils::Id> parsers; - for (const auto &p : qAsConst(parserCheckBoxes)) { + for (const auto &p : std::as_const(parserCheckBoxes)) { if (p.first->isChecked()) parsers << p.second; } @@ -301,7 +301,7 @@ private: const auto layout = qobject_cast<QVBoxLayout *>(this->layout()); QTC_ASSERT(layout, return); const QList<Utils::Id> parsers = selectedParsers(); - for (const auto &p : qAsConst(parserCheckBoxes)) + for (const auto &p : std::as_const(parserCheckBoxes)) delete p.first; parserCheckBoxes.clear(); for (const CustomParserSettings &s : ProjectExplorerPlugin::customParsers()) { diff --git a/src/plugins/projectexplorer/customparserssettingspage.cpp b/src/plugins/projectexplorer/customparserssettingspage.cpp index e2f8d63ff97..c832d77a12c 100644 --- a/src/plugins/projectexplorer/customparserssettingspage.cpp +++ b/src/plugins/projectexplorer/customparserssettingspage.cpp @@ -104,7 +104,7 @@ private: [](const CustomParserSettings &s1, const CustomParserSettings &s2) { return s1.displayName < s2.displayName; }); - for (const CustomParserSettings &s : qAsConst(m_customParsers)) { + for (const CustomParserSettings &s : std::as_const(m_customParsers)) { const auto item = new QListWidgetItem(s.displayName); item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable); m_parserListView.addItem(item); diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp index f55755bb9e9..181f09033b9 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp @@ -311,7 +311,7 @@ GeneratedFiles CustomWizard::generateWizardFiles(QString *errorMessage) const return rc; } // Add the template files specified by the <file> elements. - for (const CustomWizardFile &file : qAsConst(d->m_parameters->files)) + for (const CustomWizardFile &file : std::as_const(d->m_parameters->files)) if (!createFile(file, d->m_parameters->directory, ctx->targetPath.toString(), context()->replacements, &rc, errorMessage)) return {}; diff --git a/src/plugins/projectexplorer/customwizard/customwizardpage.cpp b/src/plugins/projectexplorer/customwizard/customwizardpage.cpp index a657d78626d..5d966e5011c 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardpage.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardpage.cpp @@ -74,7 +74,7 @@ CustomWizardFieldPage::CustomWizardFieldPage(const QSharedPointer<CustomWizardCo m_formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); if (debug) qDebug() << Q_FUNC_INFO << parameters->fields.size(); - for (const CustomWizardField &f : qAsConst(parameters->fields)) + for (const CustomWizardField &f : std::as_const(parameters->fields)) addField(f); vLayout->addLayout(m_formLayout); m_errorLabel->setVisible(false); @@ -281,7 +281,7 @@ void CustomWizardFieldPage::initializePage() { QWizardPage::initializePage(); clearError(); - for (const LineEditData &led : qAsConst(m_lineEdits)) { + for (const LineEditData &led : std::as_const(m_lineEdits)) { if (!led.userChange.isNull()) { led.lineEdit->setText(led.userChange); } else if (!led.defaultText.isEmpty()) { @@ -292,7 +292,7 @@ void CustomWizardFieldPage::initializePage() if (!led.placeholderText.isEmpty()) led.lineEdit->setPlaceholderText(led.placeholderText); } - for (const TextEditData &ted : qAsConst(m_textEdits)) { + for (const TextEditData &ted : std::as_const(m_textEdits)) { if (!ted.userChange.isNull()) { ted.textEdit->setText(ted.userChange); } else if (!ted.defaultText.isEmpty()) { @@ -301,7 +301,7 @@ void CustomWizardFieldPage::initializePage() ted.textEdit->setText(defaultText); } } - for (const PathChooserData &ped : qAsConst(m_pathChoosers)) { + for (const PathChooserData &ped : std::as_const(m_pathChoosers)) { if (!ped.userChange.isNull()) { ped.pathChooser->setFilePath(FilePath::fromUserInput(ped.userChange)); } else if (!ped.defaultText.isEmpty()) { @@ -349,7 +349,7 @@ bool CustomWizardFieldPage::validatePage() { clearError(); // Check line edits with validators - for (const LineEditData &led : qAsConst(m_lineEdits)) { + for (const LineEditData &led : std::as_const(m_lineEdits)) { if (const QValidator *val = led.lineEdit->validator()) { int pos = 0; QString text = led.lineEdit->text(); diff --git a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp index 3e92ccd1c4c..ea232426986 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp @@ -167,7 +167,7 @@ Core::GeneratedFiles if (CustomWizard::verbose()) { QDebug nospace = qDebug().nospace(); nospace << script << " generated:\n"; - for (const Core::GeneratedFile &f : qAsConst(files)) + for (const Core::GeneratedFile &f : std::as_const(files)) nospace << ' ' << f.filePath() << f.attributes() << '\n'; } return files; diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index 6c93f745882..559de555121 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -175,7 +175,7 @@ DeployConfiguration *DeployConfigurationFactory::create(Target *parent) DeployConfiguration *dc = createDeployConfiguration(parent); QTC_ASSERT(dc, return nullptr); BuildStepList *stepList = dc->stepList(); - for (const BuildStepList::StepCreationInfo &info : qAsConst(m_initialSteps)) { + for (const BuildStepList::StepCreationInfo &info : std::as_const(m_initialSteps)) { if (!info.condition || info.condition(parent)) stepList->appendStep(info.stepId); } diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp index 7a5c9c416a9..c0ae7a1726e 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp @@ -92,7 +92,7 @@ void DeviceManager::replaceInstance() const QList<Id> newIds = Utils::transform(DeviceManagerPrivate::clonedInstance->d->devices, &IDevice::id); - for (const IDevice::Ptr &dev : qAsConst(m_instance->d->devices)) { + for (const IDevice::Ptr &dev : std::as_const(m_instance->d->devices)) { if (!newIds.contains(dev->id())) dev->aboutToBeRemoved(); } @@ -124,7 +124,7 @@ DeviceManager *DeviceManager::cloneInstance() void DeviceManager::copy(const DeviceManager *source, DeviceManager *target, bool deep) { if (deep) { - for (const IDevice::Ptr &device : qAsConst(source->d->devices)) + for (const IDevice::Ptr &device : std::as_const(source->d->devices)) target->d->devices << device->clone(); } else { target->d->devices = source->d->devices; @@ -170,8 +170,8 @@ void DeviceManager::load() userDevices = fromMap(reader.restoreValues().value(DeviceManagerKey).toMap(), &defaultDevices); // Insert devices into the model. Prefer the higher device version when there are multiple // devices with the same id. - for (IDevice::ConstPtr device : qAsConst(userDevices)) { - for (const IDevice::Ptr &sdkDevice : qAsConst(sdkDevices)) { + for (IDevice::ConstPtr device : std::as_const(userDevices)) { + for (const IDevice::Ptr &sdkDevice : std::as_const(sdkDevices)) { if (device->id() == sdkDevice->id()) { if (device->version() < sdkDevice->version()) device = sdkDevice; @@ -182,7 +182,7 @@ void DeviceManager::load() addDevice(device); } // Append the new SDK devices to the model. - for (const IDevice::Ptr &sdkDevice : qAsConst(sdkDevices)) + for (const IDevice::Ptr &sdkDevice : std::as_const(sdkDevices)) addDevice(sdkDevice); // Overwrite with the saved default devices. @@ -245,7 +245,7 @@ QVariantMap DeviceManager::toMap() const } map.insert(QLatin1String(DefaultDevicesKey), defaultDeviceMap); QVariantList deviceList; - for (const IDevice::Ptr &device : qAsConst(d->devices)) + for (const IDevice::Ptr &device : std::as_const(d->devices)) deviceList << device->toMap(); map.insert(QLatin1String(DeviceListKey), deviceList); return map; @@ -256,7 +256,7 @@ void DeviceManager::addDevice(const IDevice::ConstPtr &_device) const IDevice::Ptr device = _device->clone(); QStringList names; - for (const IDevice::Ptr &tmp : qAsConst(d->devices)) { + for (const IDevice::Ptr &tmp : std::as_const(d->devices)) { if (tmp->id() != device->id()) names << tmp->displayName(); } diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp index 9bffdaff890..68f0b037011 100644 --- a/src/plugins/projectexplorer/editorconfiguration.cpp +++ b/src/plugins/projectexplorer/editorconfiguration.cpp @@ -390,7 +390,7 @@ void EditorConfiguration::slotAboutToRemoveProject(Project *project) if (project->editorConfiguration() != this) return; - for (BaseTextEditor *editor : qAsConst(d->m_editors)) + for (BaseTextEditor *editor : std::as_const(d->m_editors)) deconfigureEditor(editor); } diff --git a/src/plugins/projectexplorer/environmentwidget.cpp b/src/plugins/projectexplorer/environmentwidget.cpp index 33c6193dd4d..4e9ca13c3e5 100644 --- a/src/plugins/projectexplorer/environmentwidget.cpp +++ b/src/plugins/projectexplorer/environmentwidget.cpp @@ -373,7 +373,7 @@ void EnvironmentWidget::updateSummaryText() Utils::EnvironmentItem::sort(&list); QString text; - for (const Utils::EnvironmentItem &item : qAsConst(list)) { + for (const Utils::EnvironmentItem &item : std::as_const(list)) { if (item.name != Utils::EnvironmentModel::tr("<VARIABLE>")) { if (!d->m_baseEnvironmentText.isEmpty() || !text.isEmpty()) text.append(QLatin1String("<br>")); diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp index b71ae0a1279..8c8e46f4220 100644 --- a/src/plugins/projectexplorer/extracompiler.cpp +++ b/src/plugins/projectexplorer/extracompiler.cpp @@ -263,7 +263,7 @@ void ExtraCompilerPrivate::updateIssues() QList<QTextEdit::ExtraSelection> selections; const QTextDocument *document = widget->document(); - for (const Task &issue : qAsConst(issues)) { + for (const Task &issue : std::as_const(issues)) { QTextEdit::ExtraSelection selection; QTextCursor cursor(document->findBlockByNumber(issue.line - 1)); cursor.movePosition(QTextCursor::StartOfLine); diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 0b2b37fbcf5..e4581419faf 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -627,7 +627,7 @@ HeaderPaths GccToolChain::builtInHeaderPaths(const Utils::Environment &env, headerCache->insert({env, arguments}, paths); qCDebug(gccLog) << "Reporting header paths to code model:"; - for (const HeaderPath &hp : qAsConst(paths)) { + for (const HeaderPath &hp : std::as_const(paths)) { qCDebug(gccLog) << compilerCommand.toUserOutput() << (languageId == Constants::CXX_LANGUAGE_ID ? ": C++ [" : ": C [") << arguments.join(", ") << "]" << hp.path; @@ -1108,7 +1108,7 @@ static FilePaths findCompilerCandidates(const ToolchainDetector &detector, FilePaths searchPaths = detector.searchPaths; if (searchPaths.isEmpty()) searchPaths = device->systemEnvironment().path(); - for (const FilePath &deviceDir : qAsConst(searchPaths)) { + for (const FilePath &deviceDir : std::as_const(searchPaths)) { static const QRegularExpression regexp(binaryRegexp); const auto callBack = [&compilerPaths, compilerName](const FilePath &candidate) { if (candidate.fileName() == compilerName) @@ -1142,7 +1142,7 @@ static FilePaths findCompilerCandidates(const ToolchainDetector &detector, searchPaths << ccachePath; } } - for (const FilePath &dir : qAsConst(searchPaths)) { + for (const FilePath &dir : std::as_const(searchPaths)) { static const QRegularExpression regexp(binaryRegexp); QDir binDir(dir.toString()); const QStringList fileNames = binDir.entryList(nameFilters, @@ -1173,7 +1173,7 @@ Toolchains GccToolChainFactory::autoDetectToolchains( Toolchains existingCandidates = filtered(detector.alreadyKnown, [language](const ToolChain *tc) { return tc->language() == language; }); Toolchains result; - for (const FilePath &compilerPath : qAsConst(compilerPaths)) { + for (const FilePath &compilerPath : std::as_const(compilerPaths)) { bool alreadyExists = false; for (ToolChain * const existingTc : existingCandidates) { // We have a match if the existing toolchain ultimately refers to the same file diff --git a/src/plugins/projectexplorer/gnumakeparser.cpp b/src/plugins/projectexplorer/gnumakeparser.cpp index b8f8080a2f1..2842ad25b6d 100644 --- a/src/plugins/projectexplorer/gnumakeparser.cpp +++ b/src/plugins/projectexplorer/gnumakeparser.cpp @@ -348,7 +348,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing() FilePaths searchDirs = childParser->searchDirectories(); // add extra directories: - for (const QString &dir : qAsConst(extraSearchDirs)) + for (const QString &dir : std::as_const(extraSearchDirs)) testbench.addSearchDir(FilePath::fromString(dir)); testbench.testParsing(input, inputChannel, @@ -357,13 +357,13 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing() // make sure we still have all the original dirs FilePaths newSearchDirs = tester->directories; - for (const FilePath &dir : qAsConst(searchDirs)) { + for (const FilePath &dir : std::as_const(searchDirs)) { QVERIFY(newSearchDirs.contains(dir)); newSearchDirs.removeOne(dir); } // make sure we have all additional dirs: - for (const QString &dir : qAsConst(additionalSearchDirs)) { + for (const QString &dir : std::as_const(additionalSearchDirs)) { const FilePath fp = FilePath::fromString(dir); QVERIFY(newSearchDirs.contains(fp)); newSearchDirs.removeOne(fp); diff --git a/src/plugins/projectexplorer/ioutputparser.cpp b/src/plugins/projectexplorer/ioutputparser.cpp index 9a783e2f77e..f11f53d09cd 100644 --- a/src/plugins/projectexplorer/ioutputparser.cpp +++ b/src/plugins/projectexplorer/ioutputparser.cpp @@ -105,7 +105,7 @@ void OutputTaskParser::runPostPrintActions(QPlainTextEdit *edit) }); } - for (const TaskInfo &t : qAsConst(d->scheduledTasks)) + for (const TaskInfo &t : std::as_const(d->scheduledTasks)) TaskHub::addTask(t.task); d->scheduledTasks.clear(); } diff --git a/src/plugins/projectexplorer/journaldwatcher.cpp b/src/plugins/projectexplorer/journaldwatcher.cpp index ecef018f289..47dcd558de3 100644 --- a/src/plugins/projectexplorer/journaldwatcher.cpp +++ b/src/plugins/projectexplorer/journaldwatcher.cpp @@ -190,7 +190,7 @@ void JournaldWatcher::handleEntry() if (logEntry.isEmpty()) break; - for (const JournaldWatcherPrivate::SubscriberInformation &info: qAsConst(d->m_subscriptions)) + for (const JournaldWatcherPrivate::SubscriberInformation &info: std::as_const(d->m_subscriptions)) info.subscription(logEntry); } } diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp index 67b8da4ce56..8992fd4ab96 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp @@ -1391,7 +1391,7 @@ bool JsonFieldPage::isComplete() const bool result = true; bool hasErrorMessage = false; - for (Field *f : qAsConst(m_fields)) { + for (Field *f : std::as_const(m_fields)) { f->adjustState(m_expander); if (!f->validate(m_expander, &message)) { if (!message.isEmpty()) { @@ -1411,19 +1411,19 @@ bool JsonFieldPage::isComplete() const void JsonFieldPage::initializePage() { - for (Field *f : qAsConst(m_fields)) + for (Field *f : std::as_const(m_fields)) f->initialize(m_expander); } void JsonFieldPage::cleanupPage() { - for (Field *f : qAsConst(m_fields)) + for (Field *f : std::as_const(m_fields)) f->cleanup(m_expander); } bool JsonFieldPage::validatePage() { - for (Field * const f : qAsConst(m_fields)) + for (Field * const f : std::as_const(m_fields)) if (!f->persistenceKey().isEmpty() && f->hasUserChanges()) { const QVariant value = f->toSettings(); if (value.isValid()) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp index 7ce7802bda6..6ec0b1b5440 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp @@ -174,7 +174,7 @@ JsonWizard::GeneratorFiles JsonWizard::generateFileList() if (m_files.isEmpty() && errorMessage.isEmpty()) { emit preGenerateFiles(); - for (JsonWizardGenerator *gen : qAsConst(m_generators)) { + for (JsonWizardGenerator *gen : std::as_const(m_generators)) { const Utils::FilePath wizardDir = Utils::FilePath::fromString(stringValue(QLatin1String("WizardDir"))); const Core::GeneratedFiles tmp = diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp index 63723c757b3..7c169519e48 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp @@ -599,13 +599,13 @@ Wizard *JsonWizardFactory::runWizardImpl(const FilePath &path, QWidget *parent, wizard->setValue(QStringLiteral("id"), id().toString()); MacroExpander *expander = wizard->expander(); - for (const JsonWizard::OptionDefinition &od : qAsConst(m_options)) { + for (const JsonWizard::OptionDefinition &od : std::as_const(m_options)) { if (od.condition(*expander)) wizard->setValue(od.key(), od.value(*expander)); } bool havePage = false; - for (const Page &data : qAsConst(m_pages)) { + for (const Page &data : std::as_const(m_pages)) { QTC_ASSERT(data.isValid(), continue); if (!JsonWizard::boolFromVariant(data.enabled, wizard->expander())) @@ -633,7 +633,7 @@ Wizard *JsonWizardFactory::runWizardImpl(const FilePath &path, QWidget *parent, } } - for (const Generator &data : qAsConst(m_generators)) { + for (const Generator &data : std::as_const(m_generators)) { QTC_ASSERT(data.isValid(), continue); JsonWizardGeneratorFactory *factory = Utils::findOr(s_generatorFactories, nullptr, [&data](JsonWizardGeneratorFactory *f) { @@ -680,7 +680,7 @@ QString JsonWizardFactory::localizedString(const QVariant &value) const QString locale = languageSetting().toLower(); QStringList locales; locales << locale << QLatin1String("en") << QLatin1String("C") << tmp.keys(); - for (const QString &locale : qAsConst(locales)) { + for (const QString &locale : std::as_const(locales)) { QString result = tmp.value(locale, QString()).toString(); if (!result.isEmpty()) return result; @@ -834,7 +834,7 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const FilePath &base return false; } - for (const QVariant &v : qAsConst(list)) { + for (const QVariant &v : std::as_const(list)) { Generator gen = parseGenerator(v, errorMessage); if (gen.isValid()) m_generators.append(gen); @@ -849,7 +849,7 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const FilePath &base return false; } - for (const QVariant &v : qAsConst(list)) { + for (const QVariant &v : std::as_const(list)) { Page p = parsePage(v, errorMessage); if (p.isValid()) m_pages.append(p); diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp index 4a191535837..c1b83cb8e9f 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp @@ -95,7 +95,7 @@ Core::GeneratedFile JsonWizardFileGenerator::generateFile(const File &file, // evaluate file options once: QHash<QString, QString> options; - for (const JsonWizard::OptionDefinition &od : qAsConst(file.options)) { + for (const JsonWizard::OptionDefinition &od : std::as_const(file.options)) { if (od.condition(*expander)) options.insert(od.key(), od.value(*expander)); } @@ -171,7 +171,7 @@ Core::GeneratedFiles JsonWizardFileGenerator::fileList(Utils::MacroExpander *exp const QSet<Utils::FilePath> knownFiles = Utils::transform<QSet>(fileList, &File::target); - for (const File &dir : qAsConst(dirList)) { + for (const File &dir : std::as_const(dirList)) { Utils::FilePath sourceDir(dir.source); const Utils::FilePaths entries = sourceDir.dirEntries(QDir::NoDotAndDotDot | QDir::Files| QDir::Hidden); diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp index 719c5790234..9e33dd0b5e7 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp @@ -139,7 +139,7 @@ JsonWizardGenerator::OverwriteResult JsonWizardGenerator::promptForOverwrite(Jso QStringList existingFiles; bool oddStuffFound = false; - for (const JsonWizard::GeneratorFile &f : qAsConst(*files)) { + for (const JsonWizard::GeneratorFile &f : std::as_const(*files)) { if (f.file.filePath().exists() && !(f.file.attributes() & GeneratedFile::ForceOverwrite) && !(f.file.attributes() & GeneratedFile::KeepExistingFileAttribute)) @@ -153,7 +153,7 @@ JsonWizardGenerator::OverwriteResult JsonWizardGenerator::promptForOverwrite(Jso // Format a file list message as ( "<file1> [readonly], <file2> [folder]"). const QString commonExistingPath = Utils::commonPath(existingFiles); QString fileNamesMsgPart; - for (const QString &fileName : qAsConst(existingFiles)) { + for (const QString &fileName : std::as_const(existingFiles)) { const QFileInfo fi(fileName); if (fi.exists()) { if (!fileNamesMsgPart.isEmpty()) @@ -187,7 +187,7 @@ JsonWizardGenerator::OverwriteResult JsonWizardGenerator::promptForOverwrite(Jso // Scripts cannot handle overwrite overwriteDialog.setFiles(existingFiles); - for (const JsonWizard::GeneratorFile &file : qAsConst(*files)) + for (const JsonWizard::GeneratorFile &file : std::as_const(*files)) if (!file.generator->canKeepExistingFiles()) overwriteDialog.setFileEnabled(file.file.filePath().toString(), false); if (overwriteDialog.exec() != QDialog::Accepted) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp index ef1a8c0b8e2..a7477d0a39e 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp @@ -101,7 +101,7 @@ Core::GeneratedFiles JsonWizardScannerGenerator::fileList(Utils::MacroExpander * bool JsonWizardScannerGenerator::matchesSubdirectoryPattern(const Utils::FilePath &path) { - for (const QRegularExpression ®exp : qAsConst(m_subDirectoryExpressions)) { + for (const QRegularExpression ®exp : std::as_const(m_subDirectoryExpressions)) { if (regexp.match(path.path()).hasMatch()) return true; } diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index 9ea9c6606c8..1bbe25c7e8e 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -516,12 +516,12 @@ QVariantMap Kit::toMap() const data.insert(DEVICE_TYPE_FOR_ICON_KEY, d->m_deviceTypeForIcon.toSetting()); QStringList mutableInfo; - for (const Id id : qAsConst(d->m_mutable)) + for (const Id id : std::as_const(d->m_mutable)) mutableInfo << id.toString(); data.insert(QLatin1String(MUTABLE_INFO_KEY), mutableInfo); QStringList stickyInfo; - for (const Id id : qAsConst(d->m_sticky)) + for (const Id id : std::as_const(d->m_sticky)) stickyInfo << id.toString(); data.insert(QLatin1String(STICKY_INFO_KEY), stickyInfo); diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index 22675f4e672..0265d6376d0 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -207,7 +207,7 @@ public: }); QTC_ASSERT(!languageList.isEmpty(), return); int row = 0; - for (Id l : qAsConst(languageList)) { + for (Id l : std::as_const(languageList)) { layout->addWidget(new QLabel(ToolChainManager::displayNameOfLanguageId(l) + ':'), row, 0); auto cb = new QComboBox; cb->setSizePolicy(QSizePolicy::Ignored, cb->sizePolicy().verticalPolicy()); diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp index 00744b0801e..d79b73de293 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp @@ -221,7 +221,7 @@ void KitManagerConfigWidget::setHasUniqueName(bool unique) void KitManagerConfigWidget::makeStickySubWidgetsReadOnly() { - for (KitAspectWidget *w : qAsConst(m_widgets)) { + for (KitAspectWidget *w : std::as_const(m_widgets)) { if (w->kit()->isSticky(w->kitInformation()->id())) w->makeReadOnly(); } @@ -272,7 +272,7 @@ void KitManagerConfigWidget::setIcon() Utils::sort(allDeviceFactories, less); } QMenu iconMenu; - for (const IDeviceFactory * const factory : qAsConst(allDeviceFactories)) { + for (const IDeviceFactory * const factory : std::as_const(allDeviceFactories)) { if (factory->icon().isNull()) continue; QAction *action = iconMenu.addAction(factory->icon(), @@ -332,7 +332,7 @@ void KitManagerConfigWidget::workingCopyWasUpdated(Kit *k) k->fix(); m_fixingKit = false; - for (KitAspectWidget *w : qAsConst(m_widgets)) + for (KitAspectWidget *w : std::as_const(m_widgets)) w->refresh(); m_cachedDisplayName.clear(); @@ -360,7 +360,7 @@ void KitManagerConfigWidget::kitWasUpdated(Kit *k) void KitManagerConfigWidget::showEvent(QShowEvent *event) { Q_UNUSED(event) - for (KitAspectWidget *widget : qAsConst(m_widgets)) + for (KitAspectWidget *widget : std::as_const(m_widgets)) widget->refresh(); } diff --git a/src/plugins/projectexplorer/kitmodel.cpp b/src/plugins/projectexplorer/kitmodel.cpp index a26455ba972..25ef46f5867 100644 --- a/src/plugins/projectexplorer/kitmodel.cpp +++ b/src/plugins/projectexplorer/kitmodel.cpp @@ -290,7 +290,7 @@ void KitModel::updateKit(Kit *) void KitModel::removeKit(Kit *k) { QList<KitNode *> nodes = m_toRemoveList; - for (KitNode *n : qAsConst(nodes)) { + for (KitNode *n : std::as_const(nodes)) { if (n->widget->configures(k)) { m_toRemoveList.removeOne(n); if (m_defaultNode == n) diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index 89bb81de0f1..5ea8a718dfa 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -615,7 +615,7 @@ private: setKit(m_kit); } else { // Refresh all widgets if the number of mutable settings did not change - for (KitAspectWidget *w : qAsConst(m_widgets)) + for (KitAspectWidget *w : std::as_const(m_widgets)) w->refresh(); } } diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index e33c264ab4b..e3f506c0595 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -792,7 +792,7 @@ void MsvcToolChain::updateEnvironmentModifications(Utils::EnvironmentItems modif if (modifications != m_environmentModifications) { if (Log().isDebugEnabled()) { qCDebug(Log) << "Update environment for " << displayName(); - for (const EnvironmentItem &item : qAsConst(modifications)) + for (const EnvironmentItem &item : std::as_const(modifications)) qCDebug(Log) << '\t' << item; } m_environmentModifications = modifications; @@ -1294,7 +1294,7 @@ MsvcToolChainConfigWidget::MsvcToolChainConfigWidget(ToolChain *tc) m_varsBatPathCombo->setObjectName("varsBatCombo"); m_varsBatPathCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); m_varsBatPathCombo->setEditable(true); - for (const MsvcToolChain *tmpTc : qAsConst(g_availableMsvcToolchains)) { + for (const MsvcToolChain *tmpTc : std::as_const(g_availableMsvcToolchains)) { const QString nativeVcVars = QDir::toNativeSeparators(tmpTc->varsBat()); if (!tmpTc->varsBat().isEmpty() && m_varsBatPathCombo->findText(nativeVcVars) == -1) { @@ -1403,7 +1403,7 @@ void MsvcToolChainConfigWidget::updateAbis() // choose one appropriately. Abis supportedAbis; Abi targetAbi; - for (const MsvcToolChain *tc : qAsConst(g_availableMsvcToolchains)) { + for (const MsvcToolChain *tc : std::as_const(g_availableMsvcToolchains)) { if (tc->varsBat() == normalizedVcVars && tc->targetAbi().wordWidth() == wordWidth && tc->targetAbi().architecture() == arch && tc->language() == currentTc->language()) { // We need to filter out duplicates as there might be multiple toolchains with @@ -1504,7 +1504,7 @@ void ClangClToolChainConfigWidget::setFromClangClToolChain() m_nameDisplayLabel->setText(currentTC->displayName()); m_varsBatDisplayCombo->clear(); m_varsBatDisplayCombo->addItem(msvcVarsToDisplay(*currentTC)); - for (const MsvcToolChain *tc : qAsConst(g_availableMsvcToolchains)) { + for (const MsvcToolChain *tc : std::as_const(g_availableMsvcToolchains)) { const QString varsToDisplay = msvcVarsToDisplay(*tc); if (m_varsBatDisplayCombo->findText(varsToDisplay) == -1) m_varsBatDisplayCombo->addItem(varsToDisplay); @@ -1993,7 +1993,7 @@ Toolchains MsvcToolChainFactory::autoDetect(const ToolchainDetector &detector) c detectCppBuildTools2015(&results); - for (ToolChain *tc : qAsConst(results)) + for (ToolChain *tc : std::as_const(results)) tc->setDetection(ToolChain::AutoDetection); return results; diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index cb87e033296..de503fff874 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -358,7 +358,7 @@ void Project::setExtraProjectFiles(const QSet<FilePath> &projectDocumentPaths, return toRemove.contains(d->filePath()); }); if (docUpdater) { - for (const auto &doc : qAsConst(d->m_extraProjectDocuments)) + for (const auto &doc : std::as_const(d->m_extraProjectDocuments)) docUpdater(doc.get()); } QList<IDocument *> toRegister; @@ -391,7 +391,7 @@ void Project::updateExtraProjectFiles(const QSet<FilePath> &projectDocumentPaths void Project::updateExtraProjectFiles(const DocUpdater &docUpdater) { - for (const auto &doc : qAsConst(d->m_extraProjectDocuments)) + for (const auto &doc : std::as_const(d->m_extraProjectDocuments)) docUpdater(doc.get()); } @@ -625,7 +625,7 @@ FilePaths Project::files(const NodeMatcher &filter) const result.append(projectFilePath()); FilePath lastAdded; - for (const Node *n : qAsConst(d->m_sortedNodeList)) { + for (const Node *n : std::as_const(d->m_sortedNodeList)) { if (!filter(n)) continue; diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 43d193819ff..db57d6f2bca 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -3570,7 +3570,7 @@ void ProjectExplorerPluginPrivate::updateContextMenuActions(Node *currentNode) m_defaultRunConfiguration = runConfigs.first(); } else if (runConfigs.count() > 1) { runMenu->menu()->menuAction()->setVisible(true); - for (RunConfiguration *rc : qAsConst(runConfigs)) { + for (RunConfiguration *rc : std::as_const(runConfigs)) { auto *act = new QAction(runMenu->menu()); act->setText(tr("Run %1").arg(rc->displayName())); runMenu->menu()->addAction(act); @@ -3792,7 +3792,7 @@ void ProjectExplorerPluginPrivate::addExistingProjects() return; FilePaths failedProjects; FilePaths addedProjects; - for (const FilePath &filePath : qAsConst(subProjectFilePaths)) { + for (const FilePath &filePath : std::as_const(subProjectFilePaths)) { if (projectNode->addSubProject(filePath)) addedProjects << filePath; else @@ -3968,7 +3968,7 @@ void ProjectExplorerPluginPrivate::removeFile() filesToRemove << siblings; } - for (const NodeAndPath &file : qAsConst(filesToRemove)) { + for (const NodeAndPath &file : std::as_const(filesToRemove)) { // Nodes can become invalid if the project was re-parsed while the dialog was open if (!ProjectTree::hasNode(file.first)) { QMessageBox::warning(ICore::dialogParent(), tr("Removing File Failed"), @@ -3997,7 +3997,7 @@ void ProjectExplorerPluginPrivate::removeFile() std::vector<std::unique_ptr<FileChangeBlocker>> changeGuards; FilePaths pathList; - for (const NodeAndPath &file : qAsConst(filesToRemove)) { + for (const NodeAndPath &file : std::as_const(filesToRemove)) { pathList << file.second; changeGuards.emplace_back(std::make_unique<FileChangeBlocker>(file.second)); } diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp index 12f59deb171..dbedd856088 100644 --- a/src/plugins/projectexplorer/projectimporter.cpp +++ b/src/plugins/projectexplorer/projectimporter.cpp @@ -113,7 +113,7 @@ const QList<BuildInfo> ProjectImporter::import(const Utils::FilePath &importPath } qCDebug(log) << "Looking for kits"; - for (void *data : qAsConst(dataList)) { + for (void *data : std::as_const(dataList)) { QTC_ASSERT(data, continue); QList<Kit *> kitList; const QList<Kit *> tmp @@ -128,7 +128,7 @@ const QList<BuildInfo> ProjectImporter::import(const Utils::FilePath &importPath qCDebug(log) << " " << tmp.count() << "matching kits found."; } - for (Kit *k : qAsConst(kitList)) { + for (Kit *k : std::as_const(kitList)) { qCDebug(log) << "Creating buildinfos for kit" << k->displayName(); const QList<BuildInfo> infoList = buildInfoList(data); if (infoList.isEmpty()) { @@ -146,7 +146,7 @@ const QList<BuildInfo> ProjectImporter::import(const Utils::FilePath &importPath } } - for (void *dd : qAsConst(dataList)) + for (void *dd : std::as_const(dataList)) deleteDirectoryData(dd); dataList.clear(); @@ -213,7 +213,7 @@ void ProjectImporter::makePersistent(Kit *k) const k->removeKey(KIT_TEMPORARY_NAME); k->removeKey(KIT_FINAL_NAME); - for (const TemporaryInformationHandler &tih : qAsConst(m_temporaryHandlers)) { + for (const TemporaryInformationHandler &tih : std::as_const(m_temporaryHandlers)) { const Utils::Id fid = fullId(tih.id); const QVariantList temporaryValues = k->value(fid).toList(); @@ -238,7 +238,7 @@ void ProjectImporter::makePersistent(Kit *k) const void ProjectImporter::cleanupKit(Kit *k) const { QTC_ASSERT(k, return); - for (const TemporaryInformationHandler &tih : qAsConst(m_temporaryHandlers)) { + for (const TemporaryInformationHandler &tih : std::as_const(m_temporaryHandlers)) { const Utils::Id fid = fullId(tih.id); const QVariantList temporaryValues = Utils::filtered(k->value(fid).toList(), [fid, k](const QVariant &v) { @@ -377,7 +377,7 @@ static ProjectImporter::ToolChainData createToolChains(const ToolChainDescriptio if (data.tcs.isEmpty()) continue; - for (ToolChain *tc : qAsConst(data.tcs)) + for (ToolChain *tc : std::as_const(data.tcs)) ToolChainManager::registerToolChain(tc); data.areTemporary = true; @@ -394,7 +394,7 @@ ProjectImporter::findOrCreateToolChains(const ToolChainDescription &tcd) const result.tcs = ToolChainManager::toolchains([&tcd](const ToolChain *tc) { return tc->language() == tcd.language && tc->matchesCompilerCommand(tcd.compilerPath); }); - for (const ToolChain *tc : qAsConst(result.tcs)) { + for (const ToolChain *tc : std::as_const(result.tcs)) { const QByteArray tcId = tc->id(); result.areTemporary = result.areTemporary ? true : hasKitWithTemporaryData(ToolChainKitAspect::id(), tcId); } diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp index 86766a586c8..68d482264af 100644 --- a/src/plugins/projectexplorer/projectnodes.cpp +++ b/src/plugins/projectexplorer/projectnodes.cpp @@ -66,7 +66,7 @@ static FolderNode *recursiveFindOrCreateFolderNode(FolderNode *folder, parts[0].prepend('/'); ProjectExplorer::FolderNode *parent = folder; - for (const QString &part : qAsConst(parts)) { + for (const QString &part : std::as_const(parts)) { path = path.pathAppended(part); // Find folder in subFolders FolderNode *next = parent->folderNode(path); diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp index b40c955d542..891d1bdf0c9 100644 --- a/src/plugins/projectexplorer/projecttree.cpp +++ b/src/plugins/projectexplorer/projecttree.cpp @@ -172,7 +172,7 @@ void ProjectTree::updateFromNode(Node *node) project = SessionManager::startupProject(); setCurrent(node, project); - for (ProjectTreeWidget *widget : qAsConst(m_projectTreeWidgets)) + for (ProjectTreeWidget *widget : std::as_const(m_projectTreeWidgets)) widget->sync(node); } diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp index e74e5c96382..c7b6910985d 100644 --- a/src/plugins/projectexplorer/projecttreewidget.cpp +++ b/src/plugins/projectexplorer/projecttreewidget.cpp @@ -304,7 +304,7 @@ int ProjectTreeWidget::expandedCount(Node *node) return 0; int count = 0; - for (ProjectTreeWidget *tree : qAsConst(m_projectTreeWidgets)) { + for (ProjectTreeWidget *tree : std::as_const(m_projectTreeWidgets)) { QModelIndex idx = index; while (idx.isValid() && idx != tree->m_view->rootIndex()) { if (!tree->m_view->isExpanded(idx)) diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp index 8da18e1fdf4..6a8dc6954d2 100644 --- a/src/plugins/projectexplorer/projectwizardpage.cpp +++ b/src/plugins/projectexplorer/projectwizardpage.cpp @@ -78,7 +78,7 @@ AddNewTree::AddNewTree(FolderNode *node, QList<AddNewTree *> children, const QSt { if (node) m_toolTip = node->directory().toString(); - for (AddNewTree *child : qAsConst(children)) + for (AddNewTree *child : std::as_const(children)) appendChild(child); } @@ -90,7 +90,7 @@ AddNewTree::AddNewTree(FolderNode *node, QList<AddNewTree *> children, { if (node) m_toolTip = node->directory().toString(); - for (AddNewTree *child : qAsConst(children)) + for (AddNewTree *child : std::as_const(children)) appendChild(child); } @@ -557,7 +557,7 @@ void ProjectWizardPage::setFiles(const FilePaths &files) return filePath1HasDir; }); - for (const QString &f : qAsConst(formattedFiles)) + for (const QString &f : std::as_const(formattedFiles)) str << QDir::toNativeSeparators(f) << '\n'; str << "</pre>"; diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 1b6fa0b8375..d4e6784dda5 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -218,7 +218,7 @@ bool RunConfiguration::isEnabled() const QWidget *RunConfiguration::createConfigurationWidget() { Layouting::Form builder; - for (BaseAspect *aspect : qAsConst(m_aspects)) { + for (BaseAspect *aspect : std::as_const(m_aspects)) { if (aspect->isVisible()) aspect->addToLayout(builder.finishRow()); } @@ -580,7 +580,7 @@ RunConfiguration *RunConfigurationCreationInfo::create(Target *target) const RunConfiguration *RunConfigurationFactory::restore(Target *parent, const QVariantMap &map) { - for (RunConfigurationFactory *factory : qAsConst(g_runConfigurationFactories)) { + for (RunConfigurationFactory *factory : std::as_const(g_runConfigurationFactories)) { if (factory->canHandle(parent)) { const Utils::Id id = idFromMap(map); if (id.name().startsWith(factory->m_runConfigurationId.name())) { @@ -605,7 +605,7 @@ RunConfiguration *RunConfigurationFactory::clone(Target *parent, RunConfiguratio const QList<RunConfigurationCreationInfo> RunConfigurationFactory::creatorsForTarget(Target *parent) { QList<RunConfigurationCreationInfo> items; - for (RunConfigurationFactory *factory : qAsConst(g_runConfigurationFactories)) { + for (RunConfigurationFactory *factory : std::as_const(g_runConfigurationFactories)) { if (factory->canHandle(parent)) items.append(factory->availableCreators(parent)); } diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp index ea701ae498f..9c845fd31c0 100644 --- a/src/plugins/projectexplorer/runconfigurationaspects.cpp +++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp @@ -854,7 +854,7 @@ void InterpreterAspect::updateComboBox() int defaultIndex = -1; const QString currentId = m_currentId; m_comboBox->clear(); - for (const Interpreter &interpreter : qAsConst(m_interpreters)) { + for (const Interpreter &interpreter : std::as_const(m_interpreters)) { int index = m_comboBox->count(); m_comboBox->addItem(interpreter.name); m_comboBox->setItemData(index, interpreter.command.toUserOutput(), Qt::ToolTipRole); diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp index 2c4ef43e4cd..0f24f238909 100644 --- a/src/plugins/projectexplorer/runcontrol.cpp +++ b/src/plugins/projectexplorer/runcontrol.cpp @@ -150,10 +150,10 @@ void RunWorkerFactory::dumpAll() const QList<Utils::Id> devices = Utils::transform(IDeviceFactory::allDeviceFactories(), &IDeviceFactory::deviceType); - for (Utils::Id runMode : qAsConst(g_runModes)) { + for (Utils::Id runMode : std::as_const(g_runModes)) { qDebug() << ""; for (Utils::Id device : devices) { - for (Utils::Id runConfig : qAsConst(g_runConfigs)) { + for (Utils::Id runConfig : std::as_const(g_runConfigs)) { const auto check = std::bind(&RunWorkerFactory::canRun, std::placeholders::_1, runMode, @@ -520,7 +520,7 @@ bool RunControl::createMainWorker() bool RunControl::canRun(Utils::Id runMode, Utils::Id deviceType, Utils::Id runConfigId) { - for (const RunWorkerFactory *factory : qAsConst(g_runWorkerFactories)) { + for (const RunWorkerFactory *factory : std::as_const(g_runWorkerFactories)) { if (factory->canRun(runMode, deviceType, runConfigId.toString())) return true; } @@ -541,7 +541,7 @@ void RunControlPrivate::initiateReStart() checkState(RunControlState::Stopped); // Re-set worked on re-runs. - for (RunWorker *worker : qAsConst(m_workers)) { + for (RunWorker *worker : std::as_const(m_workers)) { if (worker->d->state == RunWorkerState::Done) worker->d->state = RunWorkerState::Initialized; } @@ -557,7 +557,7 @@ void RunControlPrivate::continueStart() checkState(RunControlState::Starting); bool allDone = true; debugMessage("Looking for next worker"); - for (RunWorker *worker : qAsConst(m_workers)) { + for (RunWorker *worker : std::as_const(m_workers)) { if (worker) { const QString &workerId = worker->d->id; debugMessage(" Examining worker " + workerId); @@ -620,7 +620,7 @@ void RunControlPrivate::continueStopOrFinish() } }; - for (RunWorker *worker : qAsConst(m_workers)) { + for (RunWorker *worker : std::as_const(m_workers)) { if (worker) { const QString &workerId = worker->d->id; debugMessage(" Examining worker " + workerId); @@ -672,7 +672,7 @@ void RunControlPrivate::forceStop() debugMessage("Was finished, too late to force Stop"); return; } - for (RunWorker *worker : qAsConst(m_workers)) { + for (RunWorker *worker : std::as_const(m_workers)) { if (worker) { const QString &workerId = worker->d->id; debugMessage(" Examining worker " + workerId); @@ -788,7 +788,7 @@ void RunControlPrivate::onWorkerStopped(RunWorker *worker) return; } - for (RunWorker *dependent : qAsConst(worker->d->stopDependencies)) { + for (RunWorker *dependent : std::as_const(worker->d->stopDependencies)) { switch (dependent->d->state) { case RunWorkerState::Done: break; @@ -805,7 +805,7 @@ void RunControlPrivate::onWorkerStopped(RunWorker *worker) debugMessage("Checking whether all stopped"); bool allDone = true; - for (RunWorker *worker : qAsConst(m_workers)) { + for (RunWorker *worker : std::as_const(m_workers)) { if (worker) { const QString &workerId = worker->d->id; debugMessage(" Examining worker " + workerId); @@ -856,7 +856,7 @@ void RunControl::setupFormatter(OutputFormatter *formatter) const { QList<Utils::OutputLineParser *> parsers = OutputFormatterFactory::createFormatters(target()); if (const auto customParsersAspect = aspect<CustomParsersAspect>()) { - for (const Id id : qAsConst(customParsersAspect->parsers)) { + for (const Id id : std::as_const(customParsersAspect->parsers)) { if (CustomParser * const parser = CustomParser::createFromId(id)) parsers << parser; } @@ -1879,7 +1879,7 @@ OutputFormatterFactory::~OutputFormatterFactory() QList<OutputLineParser *> OutputFormatterFactory::createFormatters(Target *target) { QList<OutputLineParser *> formatters; - for (auto factory : qAsConst(g_outputFormatterFactories)) + for (auto factory : std::as_const(g_outputFormatterFactories)) formatters << factory->m_creator(target); return formatters; } diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp index 354440b4baf..c5573662e3e 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp @@ -491,7 +491,7 @@ void RunSettingsWidget::addSubWidget(QWidget *widget, QLabel *label) void RunSettingsWidget::removeSubWidgets() { - for (const RunConfigItem &item : qAsConst(m_subWidgets)) { + for (const RunConfigItem &item : std::as_const(m_subWidgets)) { delete item.first; delete item.second; } diff --git a/src/plugins/projectexplorer/selectablefilesmodel.cpp b/src/plugins/projectexplorer/selectablefilesmodel.cpp index 894874a89be..01d01bbda9d 100644 --- a/src/plugins/projectexplorer/selectablefilesmodel.cpp +++ b/src/plugins/projectexplorer/selectablefilesmodel.cpp @@ -293,7 +293,7 @@ void SelectableFilesModel::collectPaths(Tree *root, Utils::FilePaths *result) c if (root->checked == Qt::Unchecked) return; result->append(root->fullPath); - for (Tree *t : qAsConst(root->childDirectories)) + for (Tree *t : std::as_const(root->childDirectories)) collectPaths(t, result); } @@ -318,9 +318,9 @@ void SelectableFilesModel::collectFiles(Tree *root, Utils::FilePaths *result) co { if (root->checked == Qt::Unchecked) return; - for (Tree *t : qAsConst(root->childDirectories)) + for (Tree *t : std::as_const(root->childDirectories)) collectFiles(t, result); - for (Tree *t : qAsConst(root->visibleFiles)) + for (Tree *t : std::as_const(root->visibleFiles)) if (t->checked == Qt::Checked) result->append(t->fullPath); } @@ -372,10 +372,10 @@ void SelectableFilesModel::selectAllFiles(Tree *root) { root->checked = Qt::Checked; - for (Tree *t : qAsConst(root->childDirectories)) + for (Tree *t : std::as_const(root->childDirectories)) selectAllFiles(t); - for (Tree *t : qAsConst(root->visibleFiles)) + for (Tree *t : std::as_const(root->visibleFiles)) t->checked = Qt::Checked; emit checkedFilesChanged(); diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index 12a6bcf5452..2437b4389ee 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -489,7 +489,7 @@ bool SessionManager::save() FilePaths projectFiles = Utils::transform(projects(), &Project::projectFilePath); // Restore information on projects that failed to load: // don't read projects to the list, which the user loaded - for (const FilePath &failed : qAsConst(d->m_failedProjects)) { + for (const FilePath &failed : std::as_const(d->m_failedProjects)) { if (!projectFiles.contains(failed)) projectFiles << failed; } @@ -649,7 +649,7 @@ QStringList SessionManagerPrivate::dependenciesOrder() const // remove the handled projects from the dependency lists // of the remaining unordered projects for (int i = 0; i < unordered.count(); ++i) { - for (const QString &pro : qAsConst(ordered)) { + for (const QString &pro : std::as_const(ordered)) { QStringList depList = unordered.at(i).second; depList.removeAll(pro); unordered[i].second = depList; @@ -670,7 +670,7 @@ QList<Project *> SessionManager::projectOrder(const Project *project) else pros = d->dependenciesOrder(); - for (const QString &proFile : qAsConst(pros)) { + for (const QString &proFile : std::as_const(pros)) { for (Project *pro : projects()) { if (pro->projectFilePath().toString() == proFile) { result << pro; @@ -921,7 +921,7 @@ void SessionManagerPrivate::restoreStartupProject(const PersistentSettingsReader { const QString startupProject = reader.restoreValue(QLatin1String("StartupProject")).toString(); if (!startupProject.isEmpty()) { - for (Project *pro : qAsConst(m_projects)) { + for (Project *pro : std::as_const(m_projects)) { if (pro->projectFilePath().toString() == startupProject) { m_instance->setStartupProject(pro); break; diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index 6e09f0d0753..58533bbd6fb 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/src/plugins/projectexplorer/target.cpp @@ -619,7 +619,7 @@ void Target::updateDefaultDeployConfigurations() removeDeployConfiguration(dc); } - for (Utils::Id id : qAsConst(toCreate)) { + for (Utils::Id id : std::as_const(toCreate)) { for (DeployConfigurationFactory *dcFactory : dcFactories) { if (dcFactory->creationId() == id) { DeployConfiguration *dc = dcFactory->create(this); @@ -658,7 +658,7 @@ void Target::updateDefaultRunConfigurations() // that produce already existing RCs QList<RunConfiguration *> toRemove; QList<RunConfigurationCreationInfo> existing; - for (RunConfiguration *rc : qAsConst(existingConfigured)) { + for (RunConfiguration *rc : std::as_const(existingConfigured)) { bool present = false; for (const RunConfigurationCreationInfo &item : creators) { QString buildKey = rc->buildKey(); @@ -713,14 +713,14 @@ void Target::updateDefaultRunConfigurations() } // Do actual changes: - for (RunConfiguration *rc : qAsConst(newConfigured)) + for (RunConfiguration *rc : std::as_const(newConfigured)) addRunConfiguration(rc); - for (RunConfiguration *rc : qAsConst(newUnconfigured)) + for (RunConfiguration *rc : std::as_const(newUnconfigured)) addRunConfiguration(rc); // Generate complete list of RCs to remove later: QList<RunConfiguration *> removalList; - for (RunConfiguration *rc : qAsConst(toRemove)) { + for (RunConfiguration *rc : std::as_const(toRemove)) { removalList << rc; existingConfigured.removeOne(rc); // make sure to also remove them from existingConfigured! } @@ -756,7 +756,7 @@ void Target::updateDefaultRunConfigurations() } // Remove the RCs that are no longer needed: - for (RunConfiguration *rc : qAsConst(removalList)) + for (RunConfiguration *rc : std::as_const(removalList)) removeRunConfiguration(rc); } diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp index eeb57e6602c..9439d5cc730 100644 --- a/src/plugins/projectexplorer/targetsetuppage.cpp +++ b/src/plugins/projectexplorer/targetsetuppage.cpp @@ -187,7 +187,7 @@ TargetSetupPage::TargetSetupPage(QWidget *parent) setTitle(tr("Kit Selection")); - for (IPotentialKit *pk : qAsConst(g_potentialKits)) + for (IPotentialKit *pk : std::as_const(g_potentialKits)) if (pk->isEnabled()) m_potentialWidgets.append(pk->createWidget(this)); @@ -443,9 +443,9 @@ void TargetSetupPage::updateVisibility() void TargetSetupPage::reLayout() { removeAdditionalWidgets(); - for (TargetSetupWidget * const w : qAsConst(m_widgets)) + for (TargetSetupWidget * const w : std::as_const(m_widgets)) m_baseLayout->removeWidget(w); - for (TargetSetupWidget * const w : qAsConst(m_widgets)) + for (TargetSetupWidget * const w : std::as_const(m_widgets)) m_baseLayout->addWidget(w); addAdditionalWidgets(); } @@ -509,7 +509,7 @@ void TargetSetupPage::kitFilterChanged(const QString &filterText) setupWidgets(filterText); // Re-select kits: - for (TargetSetupWidget *w : qAsConst(m_widgets)) + for (TargetSetupWidget *w : std::as_const(m_widgets)) w->setKitSelected(selectedKitIds.contains(w->kit()->id())); emit completeChanged(); @@ -613,7 +613,7 @@ TargetSetupWidget *TargetSetupPage::addWidget(Kit *k) void TargetSetupPage::addAdditionalWidgets() { m_baseLayout->addWidget(m_importWidget); - for (QWidget * const widget : qAsConst(m_potentialWidgets)) + for (QWidget * const widget : std::as_const(m_potentialWidgets)) m_baseLayout->addWidget(widget); m_baseLayout->addItem(m_spacer); } @@ -621,7 +621,7 @@ void TargetSetupPage::addAdditionalWidgets() void TargetSetupPage::removeAdditionalWidgets(QLayout *layout) { layout->removeWidget(m_importWidget); - for (QWidget * const potentialWidget : qAsConst(m_potentialWidgets)) + for (QWidget * const potentialWidget : std::as_const(m_potentialWidgets)) layout->removeWidget(potentialWidget); layout->removeItem(m_spacer); } diff --git a/src/plugins/projectexplorer/targetsetupwidget.cpp b/src/plugins/projectexplorer/targetsetupwidget.cpp index 12c7880b65e..fcd9cc7996b 100644 --- a/src/plugins/projectexplorer/targetsetupwidget.cpp +++ b/src/plugins/projectexplorer/targetsetupwidget.cpp @@ -347,7 +347,7 @@ QPair<Task::TaskType, QString> TargetSetupWidget::findIssues(const BuildInfo &in QString text; Task::TaskType highestType = Task::Unknown; - for (const Task &t : qAsConst(issues)) { + for (const Task &t : std::as_const(issues)) { if (!text.isEmpty()) text.append(QLatin1String("<br>")); // set severity: diff --git a/src/plugins/projectexplorer/taskfile.cpp b/src/plugins/projectexplorer/taskfile.cpp index c144797242a..c3f89cfc3b1 100644 --- a/src/plugins/projectexplorer/taskfile.cpp +++ b/src/plugins/projectexplorer/taskfile.cpp @@ -161,7 +161,7 @@ void TaskFile::stopMonitoring() { SessionManager::setValue(Constants::SESSION_TASKFILE_KEY, {}); - for (TaskFile *document : qAsConst(openFiles)) + for (TaskFile *document : std::as_const(openFiles)) document->deleteLater(); openFiles.clear(); } diff --git a/src/plugins/projectexplorer/taskmodel.cpp b/src/plugins/projectexplorer/taskmodel.cpp index 632abfa3f70..387b9f13c13 100644 --- a/src/plugins/projectexplorer/taskmodel.cpp +++ b/src/plugins/projectexplorer/taskmodel.cpp @@ -75,7 +75,7 @@ Tasks TaskModel::tasks(Utils::Id categoryId) const return m_tasks; Tasks taskList; - for (const Task &t : qAsConst(m_tasks)) { + for (const Task &t : std::as_const(m_tasks)) { if (t.category == categoryId) taskList.append(t); } diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 977b494d525..86cb69d0d70 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -345,7 +345,7 @@ TaskWindow::TaskWindow() : d(std::make_unique<TaskWindowPrivate>()) connect(d->m_listview->selectionModel(), &QItemSelectionModel::selectionChanged, this, [this] { const Tasks tasks = d->m_filter->tasks(d->m_listview->selectionModel()->selectedIndexes()); - for (QAction * const action : qAsConst(d->m_actions)) { + for (QAction * const action : std::as_const(d->m_actions)) { ITaskHandler * const h = d->handler(action); action->setEnabled(h && h->canHandle(tasks)); } @@ -421,7 +421,7 @@ void TaskWindow::delayedInitialization() alreadyDone = true; - for (ITaskHandler *h : qAsConst(g_taskHandlers)) { + for (ITaskHandler *h : std::as_const(g_taskHandlers)) { if (h->isDefaultHandler() && !d->m_defaultHandler) d->m_defaultHandler = h; @@ -822,7 +822,7 @@ void TaskDelegate::currentChanged(const QModelIndex ¤t, const QModelIndex QString TaskDelegate::hrefForPos(const QPointF &pos) { - for (const auto &link : qAsConst(m_hrefs)) { + for (const auto &link : std::as_const(m_hrefs)) { if (link.first.contains(pos)) return link.second; } diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index d0b9d92e86f..cca95c8158a 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -217,7 +217,7 @@ bool ToolChain::operator == (const ToolChain &tc) const ToolChain *ToolChain::clone() const { - for (ToolChainFactory *f : qAsConst(Internal::g_toolChainFactories)) { + for (ToolChainFactory *f : std::as_const(Internal::g_toolChainFactories)) { if (f->supportedToolChainType() == d->m_typeId) { ToolChain *tc = f->create(); QTC_ASSERT(tc, return nullptr); @@ -616,7 +616,7 @@ void ToolChainFactory::autoDetectionToMap(QVariantMap &data, bool detected) ToolChain *ToolChainFactory::createToolChain(Utils::Id toolChainType) { - for (ToolChainFactory *factory : qAsConst(Internal::g_toolChainFactories)) { + for (ToolChainFactory *factory : std::as_const(Internal::g_toolChainFactories)) { if (factory->m_supportedToolChainType == toolChainType) { if (ToolChain *tc = factory->create()) { tc->d->m_typeId = toolChainType; diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index 57a8d777339..bdcb7149858 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -143,7 +143,7 @@ ToolChain *ToolChainManager::toolChain(const ToolChain::Predicate &predicate) Toolchains ToolChainManager::findToolChains(const Abi &abi) { Toolchains result; - for (ToolChain *tc : qAsConst(d->m_toolChains)) { + for (ToolChain *tc : std::as_const(d->m_toolChains)) { bool isCompatible = Utils::anyOf(tc->supportedAbis(), [abi](const Abi &supportedAbi) { return supportedAbi.isCompatibleWith(abi); }); @@ -198,7 +198,7 @@ bool ToolChainManager::registerToolChain(ToolChain *tc) if (d->m_toolChains.contains(tc)) return true; - for (const ToolChain *current : qAsConst(d->m_toolChains)) { + for (const ToolChain *current : std::as_const(d->m_toolChains)) { if (*tc == *current && !tc->isAutoDetected()) return false; QTC_ASSERT(current->id() != tc->id(), return false); diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index 33a564c8b88..9f8548aedb0 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -175,7 +175,7 @@ public: m_addButton = new QPushButton(ToolChainOptionsPage::tr("Add"), this); auto addMenu = new QMenu; - for (ToolChainFactory *factory : qAsConst(m_factories)) { + for (ToolChainFactory *factory : std::as_const(m_factories)) { QList<Utils::Id> languages = factory->supportedLanguages(); if (languages.isEmpty()) continue; @@ -187,7 +187,7 @@ public: return ToolChainManager::displayNameOfLanguageId(l1) < ToolChainManager::displayNameOfLanguageId(l2); }); auto subMenu = addMenu->addMenu(factory->displayName()); - for (const Utils::Id &l : qAsConst(languages)) + for (const Utils::Id &l : std::as_const(languages)) subMenu->addAction(createAction(ToolChainManager::displayNameOfLanguageId(l), factory, l)); } } @@ -209,7 +209,7 @@ public: if (!tcItem->toolChain->isSdkProvided()) itemsToRemove << tcItem; }); - for (ToolChainTreeItem * const tcItem : qAsConst(itemsToRemove)) + for (ToolChainTreeItem * const tcItem : std::as_const(itemsToRemove)) markForRemoval(tcItem); }); @@ -410,9 +410,9 @@ void ToolChainOptionsWidget::redetectToolchains() toAdd << tc; } } - for (ToolChainTreeItem * const tcItem : qAsConst(itemsToRemove)) + for (ToolChainTreeItem * const tcItem : std::as_const(itemsToRemove)) markForRemoval(tcItem); - for (ToolChain * const newTc : qAsConst(toAdd)) + for (ToolChain * const newTc : std::as_const(toAdd)) m_toAddList.append(insertToolChain(newTc, true)); qDeleteAll(toDelete); } @@ -432,7 +432,7 @@ void ToolChainOptionsWidget::apply() { // Remove unused tool chains: QList<ToolChainTreeItem *> nodes = m_toRemoveList; - for (const ToolChainTreeItem *n : qAsConst(nodes)) + for (const ToolChainTreeItem *n : std::as_const(nodes)) ToolChainManager::deregisterToolChain(n->toolChain); Q_ASSERT(m_toRemoveList.isEmpty()); @@ -456,7 +456,7 @@ void ToolChainOptionsWidget::apply() // Add new (and already updated) tool chains QStringList removedTcs; nodes = m_toAddList; - for (const ToolChainTreeItem *n : qAsConst(nodes)) { + for (const ToolChainTreeItem *n : std::as_const(nodes)) { if (!ToolChainManager::registerToolChain(n->toolChain)) removedTcs << n->toolChain->displayName(); } diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp index 86814054895..a82769b1634 100644 --- a/src/plugins/projectexplorer/userfileaccessor.cpp +++ b/src/plugins/projectexplorer/userfileaccessor.cpp @@ -680,8 +680,8 @@ QVariantMap UserFileVersion16Upgrader::upgrade(const QVariantMap &data) NamePolicy policy = oldSteps.size() > 1 ? RenameBuildConfiguration : KeepName; - for (const QVariantMap &oldBuildConfiguration : qAsConst(oldBuildConfigurations)) { - for (const OldStepMaps &oldStep : qAsConst(oldSteps)) { + for (const QVariantMap &oldBuildConfiguration : std::as_const(oldBuildConfigurations)) { + for (const OldStepMaps &oldStep : std::as_const(oldSteps)) { QVariantMap newBuildConfiguration = insertSteps(oldBuildConfiguration, oldStep, policy); if (!newBuildConfiguration.isEmpty()) newBuildConfigurations.append(newBuildConfiguration); diff --git a/src/plugins/projectexplorer/windebuginterface.cpp b/src/plugins/projectexplorer/windebuginterface.cpp index 64850090117..a27d3500959 100644 --- a/src/plugins/projectexplorer/windebuginterface.cpp +++ b/src/plugins/projectexplorer/windebuginterface.cpp @@ -170,7 +170,7 @@ void WinDebugInterface::dispatchDebugOutput() m_readySignalEmitted = false; m_outputMutex.unlock(); - for (const auto &p : qAsConst(output)) + for (const auto &p : std::as_const(output)) emit debugOutput(p.first, p.second); if (hasMoreOutput) emit _q_debugOutputReady(); diff --git a/src/plugins/python/pythonproject.cpp b/src/plugins/python/pythonproject.cpp index 7666100cd4b..70528b0c997 100644 --- a/src/plugins/python/pythonproject.cpp +++ b/src/plugins/python/pythonproject.cpp @@ -227,7 +227,7 @@ void PythonBuildSystem::triggerParsing() QList<BuildTargetInfo> appTargets; auto newRoot = std::make_unique<PythonProjectNode>(projectDirectory()); - for (const QString &f : qAsConst(m_files)) { + for (const QString &f : std::as_const(m_files)) { const QString displayName = baseDir.relativeFilePath(f); const FilePath filePath = FilePath::fromString(f); const FileType fileType = getFileType(filePath); @@ -252,7 +252,7 @@ void PythonBuildSystem::triggerParsing() if (modelManager) { auto projectInfo = modelManager->defaultProjectInfoForProject(project()); - for (const QString &importPath : qAsConst(m_qmlImportPaths)) { + for (const QString &importPath : std::as_const(m_qmlImportPaths)) { const FilePath filePath = FilePath::fromString(importPath); projectInfo.importPaths.maybeInsert(filePath, QmlJS::Dialect::Qml); } diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp index d3e843cf1d9..7a370f7517e 100644 --- a/src/plugins/python/pythonrunconfiguration.cpp +++ b/src/plugins/python/pythonrunconfiguration.cpp @@ -203,7 +203,7 @@ void PythonRunConfiguration::checkForPySide(const FilePath &python) const PipPackage pySide6Package("PySide6"); const PipPackageInfo info = pySide6Package.info(python); - for (const FilePath &file : qAsConst(info.files)) { + for (const FilePath &file : std::as_const(info.files)) { if (file.fileName() == HostOsInfo::withExecutableSuffix("pyside6-project")) { pySideProjectPath = info.location.resolvePath(file); pySideProjectPath = pySideProjectPath.cleanPath(); diff --git a/src/plugins/python/pythonsettings.cpp b/src/plugins/python/pythonsettings.cpp index db789d07a68..bc9a906e493 100644 --- a/src/plugins/python/pythonsettings.cpp +++ b/src/plugins/python/pythonsettings.cpp @@ -829,7 +829,7 @@ void PythonSettings::initFromSettings(QSettings *settings) m_interpreters << interpreter; } - for (const Interpreter &interpreter : qAsConst(oldSettings)) { + for (const Interpreter &interpreter : std::as_const(oldSettings)) { if (Utils::anyOf(m_interpreters, Utils::equal(&Interpreter::id, interpreter.id))) continue; m_interpreters << interpreter; diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 80c137ca449..5ac88bb4665 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -415,7 +415,7 @@ void QbsBuildStep::buildingDone(const ErrorInfo &error) m_session->disconnect(this); m_session = nullptr; m_lastWasSuccess = !error.hasError(); - for (const ErrorInfoItem &item : qAsConst(error.items)) { + for (const ErrorInfoItem &item : std::as_const(error.items)) { createTaskAndOutput( ProjectExplorer::Task::Error, item.description, @@ -809,7 +809,7 @@ void QbsBuildStepConfigWidget::applyCachedProperties() Constants::QBS_INSTALL_ROOT_KEY}); if (m_qbsStep->m_selectedAbis->isManagedByTarget()) additionalSpecialKeys << Constants::QBS_ARCHITECTURES; - for (const QString &key : qAsConst(additionalSpecialKeys)) { + for (const QString &key : std::as_const(additionalSpecialKeys)) { const auto it = tmp.constFind(key); if (it != tmp.cend()) data.insert(key, it.value()); diff --git a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp index ee5cd7fc51e..060c37eac99 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp @@ -155,7 +155,7 @@ void QbsProfileManager::addProfileFromKit(const ProjectExplorer::Kit *k) // set up properties: QVariantMap data = m_defaultPropertyProvider->properties(k, QVariantMap()); - for (PropertyProvider *provider : qAsConst(g_propertyProviders)) { + for (PropertyProvider *provider : std::as_const(g_propertyProviders)) { if (provider->canHandle(k)) data = provider->properties(k, data); } diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp index af8e7b15867..4d0fedf39b0 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp @@ -178,7 +178,7 @@ void QbsProfilesSettingsWidget::refreshKitsList() QList<Kit *> validKits = KitManager::kits(); Utils::erase(validKits, [](const Kit *k) { return !k->isValid(); }); const bool hasKits = !validKits.isEmpty(); - for (const Kit * const kit : qAsConst(validKits)) { + for (const Kit * const kit : std::as_const(validKits)) { if (kit->id() == currentId) newCurrentIndex = m_kitsComboBox->count(); m_kitsComboBox->addItem(kit->displayName(), kit->id().toSetting()); diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 60fe82b56e5..1249025387a 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -156,7 +156,7 @@ QbsBuildSystem::QbsBuildSystem(QbsBuildConfiguration *bc) { connect(m_session, &QbsSession::newGeneratedFilesForSources, this, [this](const QHash<QString, QStringList> &generatedFiles) { - for (ExtraCompiler * const ec : qAsConst(m_extraCompilers)) + for (ExtraCompiler * const ec : std::as_const(m_extraCompilers)) ec->deleteLater(); m_extraCompilers.clear(); for (auto it = m_sourcesForGeneratedFiles.cbegin(); @@ -906,17 +906,17 @@ static RawProjectParts generateProjectParts( ProjectExplorer::HeaderPaths grpHeaderPaths; QStringList list = arrayToStringList(props.value("cpp.includePaths")); list.removeDuplicates(); - for (const QString &p : qAsConst(list)) + for (const QString &p : std::as_const(list)) grpHeaderPaths += HeaderPath::makeUser(FilePath::fromUserInput(p)); list = arrayToStringList(props.value("cpp.distributionIncludePaths")) + arrayToStringList(props.value("cpp.systemIncludePaths")); list.removeDuplicates(); - for (const QString &p : qAsConst(list)) + for (const QString &p : std::as_const(list)) grpHeaderPaths += HeaderPath::makeSystem(FilePath::fromUserInput(p)); list = arrayToStringList(props.value("cpp.frameworkPaths")); list.append(arrayToStringList(props.value("cpp.systemFrameworkPaths"))); list.removeDuplicates(); - for (const QString &p : qAsConst(list)) + for (const QString &p : std::as_const(list)) grpHeaderPaths += HeaderPath::makeFramework(FilePath::fromUserInput(p)); rpp.setHeaderPaths(grpHeaderPaths); rpp.setDisplayName(groupName); diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp index c96d877c6ce..4b086ffb5f8 100644 --- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp @@ -192,7 +192,7 @@ void QmakeMakeStep::setupOutputFormatter(OutputFormatter *formatter) additionalParsers << new QMakeParser; if (xcodeBuildParser) { - for (OutputLineParser * const p : qAsConst(additionalParsers)) + for (OutputLineParser * const p : std::as_const(additionalParsers)) p->setRedirectionDetector(xcodeBuildParser); } formatter->addLineParsers(additionalParsers); diff --git a/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp b/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp index 0f77555f689..c790251e675 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp @@ -206,7 +206,7 @@ static void createTree(QmakeBuildSystem *buildSystem, auto genFolder = std::make_unique<VirtualFolderNode>(baseDir); genFolder->setDisplayName(Tr::tr("Generated Files")); genFolder->setIsGenerated(true); - for (const FilePath &fp : qAsConst(generatedFiles)) { + for (const FilePath &fp : std::as_const(generatedFiles)) { auto fileNode = std::make_unique<FileNode>(fp, FileNode::fileTypeForFileName(fp)); fileNode->setIsGenerated(true); genFolder->addNestedNode(std::move(fileNode)); diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index e8af0bef33e..100016cb021 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -172,7 +172,7 @@ QmakePriFile *QmakePriFile::findPriFile(const FilePath &fileName) { if (fileName == filePath()) return this; - for (QmakePriFile *n : qAsConst(m_children)) { + for (QmakePriFile *n : std::as_const(m_children)) { if (QmakePriFile *result = n->findPriFile(fileName)) return result; } @@ -183,7 +183,7 @@ const QmakePriFile *QmakePriFile::findPriFile(const FilePath &fileName) const { if (fileName == filePath()) return this; - for (const QmakePriFile *n : qAsConst(m_children)) { + for (const QmakePriFile *n : std::as_const(m_children)) { if (const QmakePriFile *result = n->findPriFile(fileName)) return result; } @@ -205,7 +205,7 @@ const QSet<FilePath> QmakePriFile::collectFiles(const FileType &type) const { QSet<FilePath> allFiles = transform(files(type), [](const SourceFile &sf) { return sf.first; }); - for (const QmakePriFile * const priFile : qAsConst(m_children)) { + for (const QmakePriFile * const priFile : std::as_const(m_children)) { if (!dynamic_cast<const QmakeProFile *>(priFile)) allFiles.unite(priFile->collectFiles(type)); } @@ -547,7 +547,7 @@ bool QmakePriFile::addFiles(const FilePaths &filePaths, FilePaths *notAdded) } FilePaths uniqueQrcFiles; - for (const FilePath &file : qAsConst(qrcFiles)) { + for (const FilePath &file : std::as_const(qrcFiles)) { if (!m_recursiveEnumerateFiles.contains(file)) uniqueQrcFiles.append(file); } @@ -1208,7 +1208,7 @@ QString QmakeProFile::displayName() const QList<QmakeProFile *> QmakeProFile::allProFiles() { QList<QmakeProFile *> result = { this }; - for (QmakePriFile *c : qAsConst(m_children)) { + for (QmakePriFile *c : std::as_const(m_children)) { auto proC = dynamic_cast<QmakeProFile *>(c); if (proC) result.append(proC->allProFiles()); @@ -1588,7 +1588,7 @@ QmakeEvalResultPtr QmakeProFile::evaluate(const QmakeEvalInput &input) toCompare.pop_front(); // Loop prevention: Make sure that exact same node is not in our parent chain - for (QmakeIncludedPriFile *priFile : qAsConst(tree->children)) { + for (QmakeIncludedPriFile *priFile : std::as_const(tree->children)) { bool loop = input.parentFilePaths.contains(priFile->name); for (const QmakePriFile *n = pn; n && !loop; n = n->parent()) { if (n->filePath() == priFile->name) @@ -1688,16 +1688,16 @@ void QmakeProFile::applyEvaluate(const QmakeEvalResultPtr &result) // FilePath buildDirectory = m_buildSystem->buildDir(m_filePath); makeEmpty(); - for (QmakePriFile * const toAdd : qAsConst(result->directChildren)) + for (QmakePriFile * const toAdd : std::as_const(result->directChildren)) addChild(toAdd); result->directChildren.clear(); - for (const auto &priFiles : qAsConst(result->priFiles)) { + for (const auto &priFiles : std::as_const(result->priFiles)) { priFiles.first->finishInitialization(m_buildSystem, this); priFiles.first->update(priFiles.second); } - for (QmakeProFile * const proFile : qAsConst(result->proFiles)) { + for (QmakeProFile * const proFile : std::as_const(result->proFiles)) { proFile->finishInitialization(m_buildSystem, proFile); proFile->asyncUpdate(); } @@ -1998,7 +1998,7 @@ InstallsList QmakeProFile::installsList(const QtSupport::ProFileReader *reader, } QString itemPath = itemPaths.last(); - for (const auto &prefixValuePair : qAsConst(installPrefixValues)) { + for (const auto &prefixValuePair : std::as_const(installPrefixValues)) { if (prefixValuePair.first == prefixValuePair.second || !itemPath.startsWith(prefixValuePair.first)) { continue; diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index ac886ee1797..f2fc741156c 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -703,7 +703,7 @@ void QmakeBuildSystem::asyncUpdate() }; if (m_asyncUpdateState != AsyncFullUpdatePending) { QSet<FilePath> projectFilePaths; - for (QmakeProFile * const file : qAsConst(m_partialEvaluate)) { + for (QmakeProFile * const file : std::as_const(m_partialEvaluate)) { QVector<QmakePriFile *> priFiles = file->children(); for (int i = 0; i < priFiles.count(); ++i) { const QmakePriFile * const priFile = priFiles.at(i); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 2eda6a97a27..f29e0abb64b 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -144,7 +144,7 @@ QString QMakeStep::allArguments(const QtVersion *v, ArgumentFlags flags) const QString args = ProcessArgs::joinArgs(arguments); // User arguments ProcessArgs::addArgs(&args, userArguments()); - for (QString arg : qAsConst(m_extraArgs)) + for (QString arg : std::as_const(m_extraArgs)) ProcessArgs::addArgs(&args, arg); return (flags & ArgumentFlag::Expand) ? bc->macroExpander()->expand(args) : args; } @@ -248,7 +248,7 @@ bool QMakeStep::init() if (!tasks.isEmpty()) { bool canContinue = true; - for (const Task &t : qAsConst(tasks)) { + for (const Task &t : std::as_const(tasks)) { emit addTask(t); if (t.type == Task::Error) canContinue = false; @@ -635,7 +635,7 @@ void QMakeStep::abisChanged() } } QStringList archs; - for (const QString &selectedAbi : qAsConst(m_selectedAbis)) { + for (const QString &selectedAbi : std::as_const(m_selectedAbis)) { const auto abi = Abi::abiFromTargetTriplet(selectedAbi); if (abi.architecture() == Abi::X86Architecture) archs << "x86_64"; diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp index 9201f16d639..552de545502 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp @@ -129,7 +129,7 @@ void AssetExporter::exportQml(const Utils::FilePaths &qmlFiles, const Utils::Fil void AssetExporter::beginExport() { - for (const Utils::FilePath &p : qAsConst(m_exportFiles)) { + for (const Utils::FilePath &p : std::as_const(m_exportFiles)) { if (m_cancelled) break; preprocessQmlFile(p); diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp index 4d5c0b2cd2c..5dbb7102f4d 100644 --- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp @@ -338,7 +338,7 @@ void AssetsLibraryWidget::addResources(const QStringList &files) QStringList filters { tr("All Files (%1)").arg("*.*") }; QString filterTemplate = "%1 (%2)"; - for (const QString &key : qAsConst(sortedKeys)) { + for (const QString &key : std::as_const(sortedKeys)) { const QStringList values = map.values(key); if (values.contains("*.png")) { // Avoid long filter for images by splitting const QHash<QByteArray, QStringList> imageFormats = allImageFormats(); @@ -373,7 +373,7 @@ void AssetsLibraryWidget::addResources(const QStringList &files) QMultiMap<QString, QString> categoryFileNames; // filenames grouped by category - for (const QString &fileName : qAsConst(fileNames)) { + for (const QString &fileName : std::as_const(fileNames)) { const QString suffix = "*." + QFileInfo(fileName).suffix().toLower(); const QString category = filterToCategory.value(suffix); categoryFileNames.insert(category, fileName); diff --git a/src/plugins/qmldesigner/components/bindingeditor/actioneditordialog.cpp b/src/plugins/qmldesigner/components/bindingeditor/actioneditordialog.cpp index 38026570bb8..227b82ecc73 100644 --- a/src/plugins/qmldesigner/components/bindingeditor/actioneditordialog.cpp +++ b/src/plugins/qmldesigner/components/bindingeditor/actioneditordialog.cpp @@ -433,7 +433,7 @@ void ActionEditorDialog::fillAndSetTargetItem(const QString &value, bool useDefa { if (m_comboBoxType->currentIndex() == ConnectionType::Action) { m_actionTargetItem->clear(); - for (const auto &connection : qAsConst(m_connections)) { + for (const auto &connection : std::as_const(m_connections)) { if (!connection.methods.isEmpty()) m_actionTargetItem->addItem(connection.item); } @@ -448,7 +448,7 @@ void ActionEditorDialog::fillAndSetTargetItem(const QString &value, bool useDefa } } else { // ConnectionType::Assignment m_assignmentTargetItem->clear(); - for (const auto &connection : qAsConst(m_connections)) { + for (const auto &connection : std::as_const(m_connections)) { if (!connection.properties.isEmpty() && connection.hasWriteableProperties()) m_assignmentTargetItem->addItem(connection.item); } @@ -493,7 +493,7 @@ void ActionEditorDialog::fillAndSetTargetProperty(const QString &value, bool use if (idx == -1) { insertAndSetUndefined(m_assignmentTargetProperty); } else { - for (const auto &property : qAsConst(m_connections[idx].properties)) { + for (const auto &property : std::as_const(m_connections[idx].properties)) { if (property.isWriteable) m_assignmentTargetProperty->addItem(property.name, property.type); } @@ -516,7 +516,7 @@ void ActionEditorDialog::fillAndSetSourceItem(const QString &value, bool useDefa const TypeName targetPropertyType = m_assignmentTargetProperty->currentData().value<TypeName>(); if (!targetPropertyType.isEmpty()) { - for (const ConnectionOption &connection : qAsConst(m_connections)) { + for (const ConnectionOption &connection : std::as_const(m_connections)) { if (!connection.containsType(targetPropertyType)) continue; @@ -524,7 +524,7 @@ void ActionEditorDialog::fillAndSetSourceItem(const QString &value, bool useDefa } // Add Constants - for (const SingletonOption &singleton : qAsConst(m_singletons)) { + for (const SingletonOption &singleton : std::as_const(m_singletons)) { if (!singleton.containsType(targetPropertyType)) continue; @@ -560,7 +560,7 @@ void ActionEditorDialog::fillAndSetSourceProperty(const QString &value, else insertAndSetUndefined(m_assignmentSourceProperty); } else if (targetProperty == "state") { - for (const auto &state : qAsConst(m_states)) + for (const auto &state : std::as_const(m_states)) m_assignmentSourceProperty->addItem(state, specificItem); if (m_assignmentSourceProperty->findText(value) != -1) @@ -589,7 +589,7 @@ void ActionEditorDialog::fillAndSetSourceProperty(const QString &value, m_assignmentSourceProperty->addItem("false", specificItem); specificsEnd = 2; } else if (targetProperty == "state") { - for (const auto &state : qAsConst(m_states)) + for (const auto &state : std::as_const(m_states)) m_assignmentSourceProperty->addItem(state, specificItem); specificsEnd = m_states.count(); @@ -599,14 +599,14 @@ void ActionEditorDialog::fillAndSetSourceProperty(const QString &value, m_assignmentSourceProperty->insertSeparator(specificsEnd); if (sourceItemType == singletonItem) { - for (const auto &property : qAsConst(m_singletons[idx].properties)) { + for (const auto &property : std::as_const(m_singletons[idx].properties)) { if (targetPropertyType.isEmpty() // TODO isEmpty correct?! || property.type == targetPropertyType || (isNumeric(property.type) && isNumeric(targetPropertyType))) m_assignmentSourceProperty->addItem(property.name, property.type); } } else { - for (const auto &property : qAsConst(m_connections[idx].properties)) { + for (const auto &property : std::as_const(m_connections[idx].properties)) { if (targetPropertyType.isEmpty() // TODO isEmpty correct?! || property.type == targetPropertyType || (isNumeric(property.type) && isNumeric(targetPropertyType))) diff --git a/src/plugins/qmldesigner/components/bindingeditor/bindingeditordialog.cpp b/src/plugins/qmldesigner/components/bindingeditor/bindingeditordialog.cpp index 92139c6816f..3aaaacc7d29 100644 --- a/src/plugins/qmldesigner/components/bindingeditor/bindingeditordialog.cpp +++ b/src/plugins/qmldesigner/components/bindingeditor/bindingeditordialog.cpp @@ -113,7 +113,7 @@ void BindingEditorDialog::setupComboBoxes() m_comboBoxItem->clear(); m_comboBoxProperty->clear(); - for (const auto &bind : qAsConst(m_bindings)) + for (const auto &bind : std::as_const(m_bindings)) m_comboBoxItem->addItem(bind.item); } diff --git a/src/plugins/qmldesigner/components/componentcore/addsignalhandlerdialog.cpp b/src/plugins/qmldesigner/components/componentcore/addsignalhandlerdialog.cpp index df391154030..1fdfcc0b6e4 100644 --- a/src/plugins/qmldesigner/components/componentcore/addsignalhandlerdialog.cpp +++ b/src/plugins/qmldesigner/components/componentcore/addsignalhandlerdialog.cpp @@ -51,7 +51,7 @@ bool checkForPropertyChanges(const QString &signal) void AddSignalHandlerDialog::updateComboBox() { m_ui->comboBox->clear(); - for (const QString &signal : qAsConst(m_signals)) { + for (const QString &signal : std::as_const(m_signals)) { if (m_ui->all->isChecked()) { m_ui->comboBox->addItem(signal); } else if (m_ui->properties->isChecked()) { diff --git a/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp b/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp index e57aa51e7f8..fe55ea76c1d 100644 --- a/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp +++ b/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp @@ -71,7 +71,7 @@ void ChangeStyleWidgetAction::changeStyle(const QString &style) int contains = -1; - for (const auto &item : qAsConst(items)) { + for (const auto &item : std::as_const(items)) { if (item.displayName == style) { contains = items.indexOf(item); break; @@ -106,7 +106,7 @@ QWidget *ChangeStyleWidgetAction::createWidget(QWidget *parent) auto comboBox = new QComboBox(parent); comboBox->setToolTip(tr(enabledTooltip)); - for (const auto &item : qAsConst(items)) + for (const auto &item : std::as_const(items)) comboBox->addItem(item.displayName); comboBox->setEditable(true); diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index 8245a2e94d4..2377a8d0e0c 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -75,7 +75,7 @@ DesignerActionToolBar *DesignerActionManager::createToolBar(QWidget *parent) con return l->priority() > r->priority(); }); - for (auto *categoryAction : qAsConst(categories)) { + for (auto *categoryAction : std::as_const(categories)) { QList<ActionInterface* > actions = Utils::filtered(designerActions(), [categoryAction](ActionInterface *action) { return action->category() == categoryAction->menuId(); }); @@ -86,7 +86,7 @@ DesignerActionToolBar *DesignerActionManager::createToolBar(QWidget *parent) con bool addSeparator = false; - for (auto *action : qAsConst(actions)) { + for (auto *action : std::as_const(actions)) { if ((action->type() == ActionInterface::Action || action->type() == ActionInterface::ToolBarAction) && action->action()) { toolBar->registerAction(action); @@ -151,7 +151,7 @@ QGraphicsWidget *DesignerActionManager::createFormEditorToolBar(QGraphicsItem *p layout->setSpacing(0); toolbar->setLayout(layout); - for (ActionInterface *action : qAsConst(actions)) { + for (ActionInterface *action : std::as_const(actions)) { auto button = new FormEditorToolButton(action->action(), toolbar); layout->addItem(button); } @@ -203,7 +203,7 @@ void DesignerActionManager::registerModelNodePreviewHandler(const ModelNodePrevi bool DesignerActionManager::hasModelNodePreviewHandler(const ModelNode &node) const { const bool isComponent = node.isComponent(); - for (const auto &handler : qAsConst(m_modelNodePreviewImageHandlers)) { + for (const auto &handler : std::as_const(m_modelNodePreviewImageHandlers)) { if ((isComponent || !handler.componentOnly)) { if (auto base = node.model()->metaInfo(handler.type); node.metaInfo().isBasedOn(base)) return true; @@ -217,7 +217,7 @@ ModelNodePreviewImageOperation DesignerActionManager::modelNodePreviewOperation( ModelNodePreviewImageOperation op = nullptr; int prio = -1; const bool isComponent = node.isComponent(); - for (const auto &handler : qAsConst(m_modelNodePreviewImageHandlers)) { + for (const auto &handler : std::as_const(m_modelNodePreviewImageHandlers)) { if ((isComponent || !handler.componentOnly) && handler.priority > prio) { if (auto base = node.model()->metaInfo(handler.type); node.metaInfo().isBasedOn(base)) { op = handler.operation; @@ -1922,7 +1922,7 @@ void DesignerActionManager::addCreatorCommand(Core::Command *command, const QByt QList<QSharedPointer<ActionInterface> > DesignerActionManager::actionsForTargetView(const ActionInterface::TargetView &target) { QList<QSharedPointer<ActionInterface> > out; - for (auto interface : qAsConst(m_designerActions)) + for (auto interface : std::as_const(m_designerActions)) if (interface->targetView() == target) out << interface; diff --git a/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp b/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp index 5d2b8570182..5941b92746d 100644 --- a/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp +++ b/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp @@ -248,7 +248,7 @@ void LayoutInGridLayout::collectItemNodes() void LayoutInGridLayout::collectOffsets() { //We collect all different x and y offsets that define the cells - for (const QmlItemNode &qmlItemNode : qAsConst(m_qmlItemNodes)) { + for (const QmlItemNode &qmlItemNode : std::as_const(m_qmlItemNodes)) { int x = qRound((qmlItemNode.instancePosition().x())); m_xTopOffsets.append(x); x = qRound((qmlItemNode.instancePosition().x() + lowerBound(qmlItemNode.instanceBoundingRect().width()))); @@ -284,7 +284,7 @@ void LayoutInGridLayout::calculateGridOffsets() int heightTolerance = defaultHeightTolerance; //The tolerance cannot be bigger then the size of an item - for (const auto &qmlItemNode : qAsConst(m_qmlItemNodes)) { + for (const auto &qmlItemNode : std::as_const(m_qmlItemNodes)) { widthTolerance = qMin(qmlItemNode.instanceSize().toSize().width() - 1, widthTolerance); heightTolerance = qMin(qmlItemNode.instanceSize().toSize().height() - 1, heightTolerance); } @@ -321,7 +321,7 @@ void LayoutInGridLayout::removeEmtpyRowsAndColumns() m_columns = QVector<bool>(columnCount()); m_columns.fill(false); - for (const auto &qmlItemNode : qAsConst(m_qmlItemNodes)) { + for (const auto &qmlItemNode : std::as_const(m_qmlItemNodes)) { int xCell = getCell(m_xTopOffsets, qmlItemNode.instancePosition().x()); int yCell = getCell(m_yTopOffsets, qmlItemNode.instancePosition().y()); @@ -353,7 +353,7 @@ void LayoutInGridLayout::initializeCells() void LayoutInGridLayout::markUsedCells() { //We mark cells which are covered by items with true - for (const auto &qmlItemNode : qAsConst(m_qmlItemNodes)) { + for (const auto &qmlItemNode : std::as_const(m_qmlItemNodes)) { int xCell = getCell(m_xTopOffsets, qmlItemNode.instancePosition().x()); int yCell = getCell(m_yTopOffsets, qmlItemNode.instancePosition().y()); @@ -372,7 +372,7 @@ void LayoutInGridLayout::fillEmptyCells() //Cells which are not covered by items and are not marked as true have to be filled with a "spacer" item m_layoutedNodes = m_selectionContext.selectedModelNodes(); - for (const auto &itemNode : qAsConst(m_qmlItemNodes)) { + for (const auto &itemNode : std::as_const(m_qmlItemNodes)) { m_layoutedNodes.append(itemNode); } @@ -414,7 +414,7 @@ void LayoutInGridLayout::setSpanning(const ModelNode &layoutNode) layoutNode.variantProperty("columns").setValue(columnCount()); layoutNode.variantProperty("rows").setValue(rowCount()); - for (const ModelNode &modelNode : qAsConst(m_layoutedNodes)) { + for (const ModelNode &modelNode : std::as_const(m_layoutedNodes)) { QmlItemNode qmlItemNode(modelNode); int xCell = getCell(m_xTopOffsets, qmlItemNode.instancePosition().x()); int yCell = getCell(m_yTopOffsets, qmlItemNode.instancePosition().y()); @@ -444,7 +444,7 @@ void LayoutInGridLayout::setSpanning(const ModelNode &layoutNode) void LayoutInGridLayout::removeSpacersBySpanning(QList<ModelNode> &nodes) { - for (const ModelNode &node : qAsConst(m_spacerNodes)) { + for (const ModelNode &node : std::as_const(m_spacerNodes)) { if (int index = nodes.indexOf(node)) { ModelNode before = nodes.at(index -1); if (m_spacerNodes.contains(before)) { diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp index 6d8065595b1..1b3fbac3f47 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp @@ -45,7 +45,7 @@ void populateMenu(QSet<ActionInterface* > &actionInterfaces, return l->priority() > r->priority(); }); - for (ActionInterface* actionInterface : qAsConst(matchingFactoriesList)) { + for (ActionInterface* actionInterface : std::as_const(matchingFactoriesList)) { if (actionInterface->type() == ActionInterface::ContextMenu) { actionInterface->currentContextChanged(selectionContext); QMenu *newMenu = actionInterface->action()->menu(); diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index 861397227e8..31c3303a54f 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -1052,10 +1052,10 @@ AddFilesResult addFilesToProject(const QStringList &fileNames, const QString &de } // Defer actual file operations after we have dealt with possible popup dialogs to avoid // unnecessarily refreshing file models multiple times during the operation - for (const auto &file : qAsConst(removeList)) + for (const auto &file : std::as_const(removeList)) QFile::remove(file); - for (const auto &filePair : qAsConst(copyList)) { + for (const auto &filePair : std::as_const(copyList)) { const bool success = QFile::copy(filePair.first, filePair.second); if (!success) return AddFilesResult::Failed; diff --git a/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp index 8951ffb6b82..0a5741e54cc 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp @@ -638,7 +638,7 @@ void DynamicPropertiesModel::addModelNode(const ModelNode &modelNode) return a.name() < b.name(); }); - for (const AbstractProperty &property : qAsConst(dynamicProperties)) { + for (const AbstractProperty &property : std::as_const(dynamicProperties)) { if (property.isBindingProperty()) addBindingProperty(property.toBindingProperty()); else if (property.isVariantProperty()) diff --git a/src/plugins/qmldesigner/components/curveeditor/animationcurve.cpp b/src/plugins/qmldesigner/components/curveeditor/animationcurve.cpp index 276c73d1dd3..b6277b5f859 100644 --- a/src/plugins/qmldesigner/components/curveeditor/animationcurve.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/animationcurve.cpp @@ -363,7 +363,7 @@ void AnimationCurve::analyze() m_maxY = e.y(); } - for (auto &frame : qAsConst(m_frames)) { + for (auto &frame : std::as_const(m_frames)) { if (frame.position().y() < m_minY) m_minY = frame.position().y(); diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.cpp index bbdaa47dc31..c6c66c03440 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/curveitem.cpp @@ -114,7 +114,7 @@ void CurveItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidg void CurveItem::lockedCallback() { - for (auto frame : qAsConst(m_keyframes)) + for (auto frame : std::as_const(m_keyframes)) frame->setLocked(locked()); setHandleVisibility(!locked()); @@ -355,7 +355,7 @@ void CurveItem::setDirty(bool dirty) void CurveItem::setHandleVisibility(bool visible) { - for (auto *frame : qAsConst(m_keyframes)) + for (auto *frame : std::as_const(m_keyframes)) frame->setHandleVisibility(visible); } @@ -390,7 +390,7 @@ QRectF CurveItem::setComponentTransform(const QTransform &transform) { prepareGeometryChange(); m_transform = transform; - for (auto *frame : qAsConst(m_keyframes)) + for (auto *frame : std::as_const(m_keyframes)) frame->setComponentTransform(transform); return boundingRect(); @@ -400,7 +400,7 @@ void CurveItem::setStyle(const CurveEditorStyle &style) { m_style = style.curveStyle; - for (auto *frame : qAsConst(m_keyframes)) + for (auto *frame : std::as_const(m_keyframes)) frame->setStyle(style); } @@ -441,7 +441,7 @@ void CurveItem::toggleUnified() if (m_keyframes.empty()) return; - for (auto *frame : qAsConst(m_keyframes)) { + for (auto *frame : std::as_const(m_keyframes)) { if (frame->selected()) frame->toggleUnified(); } @@ -489,7 +489,7 @@ void CurveItem::deleteSelectedKeyframes() void CurveItem::remapValue(double min, double max) { - for (auto *frameItem : qAsConst(m_keyframes)) { + for (auto *frameItem : std::as_const(m_keyframes)) { frameItem->remapValue(min, max); } } diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/graphicsscene.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/graphicsscene.cpp index 28c0f62f3aa..07a7786bb8b 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/graphicsscene.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/graphicsscene.cpp @@ -200,21 +200,21 @@ void GraphicsScene::reset() void GraphicsScene::deleteSelectedKeyframes() { m_dirty = true; - for (auto *curve : qAsConst(m_curves)) + for (auto *curve : std::as_const(m_curves)) curve->deleteSelectedKeyframes(); } void GraphicsScene::insertKeyframe(double time, bool all) { if (!all) { - for (auto *curve : qAsConst(m_curves)) { + for (auto *curve : std::as_const(m_curves)) { if (curve->isUnderMouse()) curve->insertKeyframeByTime(std::round(time)); } return; } - for (auto *curve : qAsConst(m_curves)) + for (auto *curve : std::as_const(m_curves)) curve->insertKeyframeByTime(std::round(time)); } @@ -226,7 +226,7 @@ void GraphicsScene::doNotMoveItems(bool val) void GraphicsScene::removeCurveItem(unsigned int id) { CurveItem *tmp = nullptr; - for (auto *curve : qAsConst(m_curves)) { + for (auto *curve : std::as_const(m_curves)) { if (curve->id() == id) { removeItem(curve); tmp = curve; @@ -244,7 +244,7 @@ void GraphicsScene::removeCurveItem(unsigned int id) void GraphicsScene::addCurveItem(CurveItem *item) { - for (auto *curve : qAsConst(m_curves)) { + for (auto *curve : std::as_const(m_curves)) { if (curve->id() == item->id()) { delete item; return; @@ -285,7 +285,7 @@ void GraphicsScene::setComponentTransform(const QTransform &transform) { QRectF bounds; - for (auto *curve : qAsConst(m_curves)) + for (auto *curve : std::as_const(m_curves)) bounds = bounds.united(curve->setComponentTransform(transform)); if (bounds.isNull()) { @@ -299,7 +299,7 @@ void GraphicsScene::setComponentTransform(const QTransform &transform) void GraphicsScene::keyframeMoved(KeyframeItem *movedItem, const QPointF &direction) { - for (auto *curve : qAsConst(m_curves)) { + for (auto *curve : std::as_const(m_curves)) { for (auto *keyframe : curve->keyframes()) { if (keyframe != movedItem && keyframe->selected()) keyframe->moveKeyframe(direction); @@ -309,7 +309,7 @@ void GraphicsScene::keyframeMoved(KeyframeItem *movedItem, const QPointF &direct void GraphicsScene::handleUnderMouse(HandleItem *handle) { - for (auto *curve : qAsConst(m_curves)) { + for (auto *curve : std::as_const(m_curves)) { for (auto *keyframe : curve->keyframes()) { if (keyframe->selected()) keyframe->setActivated(handle->isUnderMouse(), handle->slot()); @@ -334,7 +334,7 @@ void GraphicsScene::handleMoved(KeyframeItem *frame, } }; - for (auto *curve : qAsConst(m_curves)) { + for (auto *curve : std::as_const(m_curves)) { for (auto *keyframe : curve->keyframes()) { if (keyframe == frame) moveUnified(keyframe); @@ -355,7 +355,7 @@ void GraphicsScene::setPinned(uint id, bool pinned) std::vector<CurveItem *> GraphicsScene::takePinnedItems() { std::vector<CurveItem *> out; - for (auto *curve : qAsConst(m_curves)) { + for (auto *curve : std::as_const(m_curves)) { if (curve->pinned()) out.push_back(curve); } @@ -376,7 +376,7 @@ void GraphicsScene::mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent) QPointF mouse = mouseEvent->scenePos(); bool hasHandle = false; - for (auto *curve : qAsConst(m_curves)) { + for (auto *curve : std::as_const(m_curves)) { for (auto *handle : curve->handles()) { bool intersects = handle->contains(mouse); handle->setIsUnderMouse(intersects); @@ -386,10 +386,10 @@ void GraphicsScene::mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent) } if (hasHandle) { - for (auto *curve : qAsConst(m_curves)) + for (auto *curve : std::as_const(m_curves)) curve->setIsUnderMouse(false); } else { - for (auto *curve : qAsConst(m_curves)) + for (auto *curve : std::as_const(m_curves)) curve->setIsUnderMouse(curve->contains(mouseEvent->scenePos())); } } @@ -398,7 +398,7 @@ void GraphicsScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent) { QGraphicsScene::mouseReleaseEvent(mouseEvent); - for (auto *curve : qAsConst(m_curves)) { + for (auto *curve : std::as_const(m_curves)) { // CurveItems might become invalid after a keyframe-drag operation. curve->restore(); if (curve->isDirty()) { diff --git a/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp b/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp index d920ae34c90..2c1d7ebce14 100644 --- a/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp @@ -26,7 +26,7 @@ ContentNotEditableIndicator::~ContentNotEditableIndicator() void ContentNotEditableIndicator::clear() { - for (const EntryPair &entryPair : qAsConst(m_entryList)) { + for (const EntryPair &entryPair : std::as_const(m_entryList)) { delete entryPair.second; entryPair.first->blurContent(false); } @@ -52,8 +52,8 @@ void ContentNotEditableIndicator::updateItems(const QList<FormEditorItem *> &ite for (FormEditorItem *formEditorItem : itemList) affectedFormEditorItemItems.unite(Utils::toSet(formEditorItem->offspringFormEditorItems())); - for (const EntryPair &entryPair : qAsConst(m_entryList)) { - for (FormEditorItem *formEditorItem : qAsConst(affectedFormEditorItemItems)) { + for (const EntryPair &entryPair : std::as_const(m_entryList)) { + for (FormEditorItem *formEditorItem : std::as_const(affectedFormEditorItemItems)) { if (formEditorItem == entryPair.first) { QRectF boundingRectangleInSceneSpace = formEditorItem->qmlItemNode().instanceSceneTransform().mapRect( diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index b8721ec14ed..7377cbe6c1a 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -395,7 +395,7 @@ void DragTool::commitTransaction() void DragTool::handleView3dDrop() { // If a View3D is dropped, we need to assign material to the included model - for (const QmlItemNode &dragNode : qAsConst(m_dragNodes)) { + for (const QmlItemNode &dragNode : std::as_const(m_dragNodes)) { if (dragNode.modelNode().metaInfo().isQtQuick3DView3D()) { auto model = dragNode.model(); const QList<ModelNode> models = dragNode.modelNode().subModelNodesOfType( diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 225751dc71d..03138609565 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -551,7 +551,7 @@ void FormEditorView::changeToCustomTool() const ModelNode selectedModelNode = selectedModelNodes().constFirst(); - for (const auto &customTool : qAsConst(m_customTools)) { + for (const auto &customTool : std::as_const(m_customTools)) { if (customTool->wantHandleItem(selectedModelNode) > handlingRank) { handlingRank = customTool->wantHandleItem(selectedModelNode); selectedCustomTool = customTool.get(); diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp index d8ed860b196..b19bc1b7641 100644 --- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp @@ -89,7 +89,7 @@ void MoveManipulator::synchronizeInstanceParent(const QList<FormEditorItem*> &it bool MoveManipulator::itemsCanReparented() const { - for (FormEditorItem* item : qAsConst(m_itemList)) { + for (FormEditorItem* item : std::as_const(m_itemList)) { if (item && item->qmlItemNode().isValid() && !item->qmlItemNode().instanceCanReparent()) @@ -101,7 +101,7 @@ bool MoveManipulator::itemsCanReparented() const void MoveManipulator::setDirectUpdateInNodeInstances(bool directUpdate) { - for (FormEditorItem* item : qAsConst(m_itemList)) { + for (FormEditorItem* item : std::as_const(m_itemList)) { if (item && item->qmlItemNode().isValid()) item->qmlItemNode().nodeInstance().setDirectUpdate(directUpdate); } @@ -114,7 +114,7 @@ void MoveManipulator::begin(const QPointF &beginPoint) m_snapper.updateSnappingLines(m_itemList); - for (FormEditorItem* item : qAsConst(m_itemList)) { + for (FormEditorItem* item : std::as_const(m_itemList)) { if (item && item->qmlItemNode().isValid()) { QTransform fromItemToSceneTransform = item->qmlItemNode().instanceSceneTransform(); m_beginItemRectInSceneSpaceHash.insert(item, fromItemToSceneTransform.mapRect(item->qmlItemNode().instanceBoundingRect())); @@ -122,14 +122,14 @@ void MoveManipulator::begin(const QPointF &beginPoint) } QTransform fromContentItemToSceneTransform = m_snapper.containerFormEditorItem()->qmlItemNode().instanceSceneContentItemTransform(); - for (FormEditorItem* item : qAsConst(m_itemList)) { + for (FormEditorItem* item : std::as_const(m_itemList)) { if (item && item->qmlItemNode().isValid()) { QPointF positionInScenesSpace = fromContentItemToSceneTransform.map(item->instancePosition()); m_beginPositionInSceneSpaceHash.insert(item, positionInScenesSpace); } } - for (FormEditorItem* item : qAsConst(m_itemList)) { + for (FormEditorItem* item : std::as_const(m_itemList)) { if (item && item->qmlItemNode().isValid()) { QmlAnchors anchors(item->qmlItemNode().anchors()); m_beginTopMarginHash.insert(item, anchors.instanceMargin(AnchorLineTop)); @@ -256,7 +256,7 @@ void MoveManipulator::update(const QPointF& updatePoint, Snapper::Snapping useSn generateSnappingLines(tanslatedBoundingRects(m_beginItemRectInSceneSpaceHash, offsetVector, fromSceneToItemTransform)); } - for (FormEditorItem* item : qAsConst(m_itemList)) { + for (FormEditorItem* item : std::as_const(m_itemList)) { QPointF positionInContainerSpace(fromSceneToContentItemTransform.map(m_beginPositionInSceneSpaceHash.value(item)) + offsetVector); if (!item || !item->qmlItemNode().isValid()) @@ -341,7 +341,7 @@ void MoveManipulator::reparentTo(FormEditorItem *newParent, ReparentFlag flag) else parentProperty = parentItemNode.nodeAbstractProperty("data"); - for (FormEditorItem* item : qAsConst(m_itemList)) { + for (FormEditorItem* item : std::as_const(m_itemList)) { if (!item || !item->qmlItemNode().isValid()) continue; @@ -350,7 +350,7 @@ void MoveManipulator::reparentTo(FormEditorItem *newParent, ReparentFlag flag) } - for (const ModelNode &nodeToReparented : qAsConst(nodeReparentVector)) + for (const ModelNode &nodeToReparented : std::as_const(nodeReparentVector)) parentProperty.reparentHere(nodeToReparented); synchronizeParent(m_itemList, parentProperty.parentModelNode()); @@ -371,7 +371,7 @@ void MoveManipulator::end() void MoveManipulator::end(Snapper::Snapping useSnapping) { if (useSnapping == Snapper::UseSnappingAndAnchoring) { - for (FormEditorItem* formEditorItem : qAsConst(m_itemList)) + for (FormEditorItem* formEditorItem : std::as_const(m_itemList)) m_snapper.adjustAnchoringOfItem(formEditorItem); } @@ -380,7 +380,7 @@ void MoveManipulator::end(Snapper::Snapping useSnapping) void MoveManipulator::moveBy(double deltaX, double deltaY) { - for (FormEditorItem* item : qAsConst(m_itemList)) { + for (FormEditorItem* item : std::as_const(m_itemList)) { if (!item || !item->qmlItemNode().isValid()) continue; @@ -422,14 +422,14 @@ void MoveManipulator::endRewriterTransaction() void MoveManipulator::setOpacityForAllElements(qreal opacity) { - for (FormEditorItem* item : qAsConst(m_itemList)) + for (FormEditorItem* item : std::as_const(m_itemList)) item->setOpacity(opacity); } void MoveManipulator::deleteSnapLines() { if (m_layerItem) { - for (QGraphicsItem *item : qAsConst(m_graphicsLineList)) { + for (QGraphicsItem *item : std::as_const(m_graphicsLineList)) { m_layerItem->scene()->removeItem(item); delete item; } diff --git a/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp b/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp index 4dbd3cd290d..96b71086710 100644 --- a/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp +++ b/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp @@ -112,7 +112,7 @@ QList<double> OneDimensionalCluster::reduceLines(const QList<double> & oneDimens clusterList = reduceOneDimensionalClusterList(clusterList, maximumDistance); QList<double> lineList; - for (const OneDimensionalCluster &cluster : qAsConst(clusterList)) + for (const OneDimensionalCluster &cluster : std::as_const(clusterList)) lineList.append(cluster.constFirst()); return lineList; diff --git a/src/plugins/qmldesigner/components/formeditor/resizeindicator.cpp b/src/plugins/qmldesigner/components/formeditor/resizeindicator.cpp index 7d5df61ef94..09d6907c901 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizeindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizeindicator.cpp @@ -20,13 +20,13 @@ ResizeIndicator::~ResizeIndicator() void ResizeIndicator::show() { - for (ResizeController controller : qAsConst(m_itemControllerHash)) + for (ResizeController controller : std::as_const(m_itemControllerHash)) controller.show(); } void ResizeIndicator::hide() { - for (ResizeController controller : qAsConst(m_itemControllerHash)) + for (ResizeController controller : std::as_const(m_itemControllerHash)) controller.hide(); } diff --git a/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp index 8c4545ca2de..023da3b094f 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp @@ -606,7 +606,7 @@ bool ResizeManipulator::isInvalidSize(const QSizeF & size) void ResizeManipulator::deleteSnapLines() { if (m_layerItem) { - for (QGraphicsItem *item : qAsConst(m_graphicsLineList)) { + for (QGraphicsItem *item : std::as_const(m_graphicsLineList)) { m_layerItem->scene()->removeItem(item); delete item; } diff --git a/src/plugins/qmldesigner/components/formeditor/rotationindicator.cpp b/src/plugins/qmldesigner/components/formeditor/rotationindicator.cpp index c89d166d398..d3e311588d3 100644 --- a/src/plugins/qmldesigner/components/formeditor/rotationindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/rotationindicator.cpp @@ -24,13 +24,13 @@ RotationIndicator::~RotationIndicator() void RotationIndicator::show() { - for (RotationController controller : qAsConst(m_itemControllerHash)) + for (RotationController controller : std::as_const(m_itemControllerHash)) controller.show(); } void RotationIndicator::hide() { - for (RotationController controller : qAsConst(m_itemControllerHash)) + for (RotationController controller : std::as_const(m_itemControllerHash)) controller.hide(); } diff --git a/src/plugins/qmldesigner/components/formeditor/rotationmanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/rotationmanipulator.cpp index a170bb24cee..53fffbd534d 100644 --- a/src/plugins/qmldesigner/components/formeditor/rotationmanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/rotationmanipulator.cpp @@ -198,7 +198,7 @@ void RotationManipulator::end() void RotationManipulator::deleteSnapLines() { if (m_layerItem) { - for (QGraphicsItem *item : qAsConst(m_graphicsLineList)) { + for (QGraphicsItem *item : std::as_const(m_graphicsLineList)) { m_layerItem->scene()->removeItem(item); delete item; } diff --git a/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp b/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp index 80774414b66..cbcd64d6308 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp @@ -32,7 +32,7 @@ SelectionIndicator::~SelectionIndicator() void SelectionIndicator::show() { - for (QGraphicsPolygonItem *item : qAsConst(m_indicatorShapeHash)) + for (QGraphicsPolygonItem *item : std::as_const(m_indicatorShapeHash)) item->show(); if (m_labelItem) m_labelItem->show(); @@ -40,7 +40,7 @@ void SelectionIndicator::show() void SelectionIndicator::hide() { - for (QGraphicsPolygonItem *item : qAsConst(m_indicatorShapeHash)) + for (QGraphicsPolygonItem *item : std::as_const(m_indicatorShapeHash)) item->hide(); if (m_labelItem) m_labelItem->hide(); @@ -49,7 +49,7 @@ void SelectionIndicator::hide() void SelectionIndicator::clear() { if (m_layerItem) { - for (QGraphicsPolygonItem *item : qAsConst(m_indicatorShapeHash)) { + for (QGraphicsPolygonItem *item : std::as_const(m_indicatorShapeHash)) { m_layerItem->scene()->removeItem(item); delete item; } @@ -185,7 +185,7 @@ void SelectionIndicator::setCursor(const QCursor &cursor) { m_cursor = cursor; - for (QGraphicsItem *item : qAsConst(m_indicatorShapeHash)) + for (QGraphicsItem *item : std::as_const(m_indicatorShapeHash)) item->setCursor(cursor); } diff --git a/src/plugins/qmldesigner/components/formeditor/snapper.cpp b/src/plugins/qmldesigner/components/formeditor/snapper.cpp index 1a7f2459f7d..cb3e93d109e 100644 --- a/src/plugins/qmldesigner/components/formeditor/snapper.cpp +++ b/src/plugins/qmldesigner/components/formeditor/snapper.cpp @@ -689,7 +689,7 @@ QList<QGraphicsItem*> Snapper::generateSnappingLines(const QList<QRectF> &boundi lineList += mergedVerticalLines(verticalSnappedLines(boundingRect, &snappedBoundingRectList)); } - for (const QLineF &line : qAsConst(lineList)) { + for (const QLineF &line : std::as_const(lineList)) { QLineF lineInTransformationSpace = transform.map(line); auto lineItem = new QGraphicsLineItem(lineInTransformationSpace, layerItem); lineItem->setZValue(40); diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index 97cc756697e..05c0b1ba972 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -447,7 +447,7 @@ void DesignDocument::deleteSelected() Utils::sort(lockedNodes); QString detailedText = QString("<b>" + tr("Locked items:") + "</b><br>"); - for (const auto &id : qAsConst(lockedNodes)) + for (const auto &id : std::as_const(lockedNodes)) detailedText.append("- " + id + "<br>"); detailedText.chop(QString("<br>").size()); @@ -586,8 +586,8 @@ void DesignDocument::paste() if (!targetNode.isValid()) targetNode = view.rootModelNode(); - for (const ModelNode &node : qAsConst(selectedNodes)) { - for (const ModelNode &node2 : qAsConst(selectedNodes)) { + for (const ModelNode &node : std::as_const(selectedNodes)) { + for (const ModelNode &node2 : std::as_const(selectedNodes)) { if (node.isAncestorOf(node2)) selectedNodes.removeAll(node2); } @@ -601,7 +601,7 @@ void DesignDocument::paste() const auto defaultPropertyName = targetNode.metaInfo().defaultPropertyName(); auto parentProperty = targetNode.nodeListProperty(defaultPropertyName); - for (const ModelNode &node : qAsConst(selectedNodes)) { + for (const ModelNode &node : std::as_const(selectedNodes)) { ModelNode pastedNode(view.insertModel(node)); pastedNodeList.append(pastedNode); scatterItem(pastedNode, targetNode, offset); diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp index c217bda183b..47451b76a68 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp @@ -223,7 +223,7 @@ void DesignDocumentView::copyModelNodes(const QList<ModelNode> &nodesToCopy) view.changeRootNodeType("QtQuick.Rectangle", 2, 0); view.rootModelNode().setIdWithRefactoring("__multi__selection__"); - for (const ModelNode &selectedNode : qAsConst(selectedNodes)) { + for (const ModelNode &selectedNode : std::as_const(selectedNodes)) { ModelNode newNode(view.insertModel(selectedNode)); view.rootModelNode().nodeListProperty("data").reparentHere(newNode); } diff --git a/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreemodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreemodel.cpp index 52b07cf8685..8c473349d8e 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreemodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreemodel.cpp @@ -181,7 +181,7 @@ void AssetImportUpdateTreeModel::createItems(const QList<QFileInfo> &infos, } } // Remove dir items that have no children from the model - for (auto dirItem : qAsConst(dirItems)) { + for (auto dirItem : std::as_const(dirItems)) { if (dirItem->childCount() == 0) delete dirItem; } @@ -220,7 +220,7 @@ QStringList AssetImportUpdateTreeModel::checkedFiles() const { QStringList retList; - for (const auto item : qAsConst(m_fileItems)) { + for (const auto item : std::as_const(m_fileItems)) { if (item->checkState() == Qt::Checked) retList.append(item->fileInfo().absoluteFilePath()); } diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp index 0f53839126f..b3b06f9dc42 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp @@ -135,7 +135,7 @@ ItemLibraryAssetImportDialog::ItemLibraryAssetImportDialog( QString candidatePath = targetDir + defaultAssetFolder + quick3DFolder; int candidatePriority = 5; - for (const auto &importPath : qAsConst(importPaths)) { + for (const auto &importPath : std::as_const(importPaths)) { if (importPath.startsWith(targetDir)) { const bool isDefaultFolder = importPath.endsWith(defaultAssetFolder); const QString assetFolder = importPath + quick3DFolder; @@ -197,7 +197,7 @@ ItemLibraryAssetImportDialog::ItemLibraryAssetImportDialog( // Create tab for each supported extension group that also has files included in the import QMap<QString, int> tabMap; // QMap used for alphabetical order - for (const auto &file : qAsConst(m_quick3DFiles)) { + for (const auto &file : std::as_const(m_quick3DFiles)) { auto extIt = supportedExts.constBegin(); QString ext = QFileInfo(file).suffix().toLower(); while (extIt != supportedExts.constEnd()) { @@ -252,7 +252,7 @@ ItemLibraryAssetImportDialog::ItemLibraryAssetImportDialog( this, &ItemLibraryAssetImportDialog::setImportProgress); addInfo(tr("Select import options and press \"Import\" to import the following files:")); - for (const auto &file : qAsConst(m_quick3DFiles)) + for (const auto &file : std::as_const(m_quick3DFiles)) addInfo(file); connect(ui->advancedSettingsButton, &QPushButton::clicked, @@ -751,7 +751,7 @@ QGridLayout *ItemLibraryAssetImportDialog::createOptionsGrid( // Ungrouped options are spread evenly under the groups int totalRowCount = (rowIndex[0] + rowIndex[1] + widgets[0].size() + 1) / 2; - for (const auto &rowWidgets : qAsConst(widgets[0])) { + for (const auto &rowWidgets : std::as_const(widgets[0])) { int col = rowIndex[0] < totalRowCount ? 0 : 1; insertOptionToLayout(col, rowWidgets); } @@ -898,11 +898,11 @@ void ItemLibraryAssetImportDialog::onClose() void ItemLibraryAssetImportDialog::toggleAdvanced() { m_advancedMode = !m_advancedMode; - for (const auto &widget : qAsConst(m_simpleData.contentWidgets)) { + for (const auto &widget : std::as_const(m_simpleData.contentWidgets)) { if (widget) widget->setVisible(!m_advancedMode); } - for (const auto &widget : qAsConst(m_advancedData.contentWidgets)) { + for (const auto &widget : std::as_const(m_advancedData.contentWidgets)) { if (widget) widget->setVisible(m_advancedMode); } diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp index d7551626287..ecaeeb18de8 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp @@ -498,7 +498,7 @@ void ItemLibraryAssetImporter::copyImportedFiles() notifyProgress(0, progressTitle); int counter = 0; - for (const auto &assetFiles : qAsConst(m_importFiles)) { + for (const auto &assetFiles : std::as_const(m_importFiles)) { // Only increase progress between entire assets instead of individual files, because // progress notify leads to processEvents call, which can lead to various filesystem // watchers triggering while library is still incomplete, leading to inconsistent model. @@ -710,7 +710,7 @@ void ItemLibraryAssetImporter::finalizeQuick3DImport() const QList<Import> currentImports = model->imports(); QList<Import> newImportsToAdd; - for (auto &imp : qAsConst(m_requiredImports)) { + for (auto &imp : std::as_const(m_requiredImports)) { const bool isPos = Utils::contains(posImports, [imp](const Import &posImp) { return posImp.url() == imp.url(); }); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategoriesmodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategoriesmodel.cpp index fc687278dc5..cec9dda58bc 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategoriesmodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategoriesmodel.cpp @@ -112,7 +112,7 @@ void ItemLibraryCategoriesModel::sortCategorySections() std::sort(m_categoryList.begin(), m_categoryList.end(), categorySort); - for (const auto &category : qAsConst(m_categoryList)) + for (const auto &category : std::as_const(m_categoryList)) category->sortItems(); } diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp index 6e51d2aadbc..3ef77f52ca7 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp @@ -374,7 +374,7 @@ void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model) } } - for (const auto itemLibImport : qAsConst(importHash)) { + for (const auto itemLibImport : std::as_const(importHash)) { m_importList.append(itemLibImport); itemLibImport->setImportExpanded(loadExpandedState(itemLibImport->importUrl())); } @@ -588,7 +588,7 @@ void ItemLibraryModel::sortSections() std::sort(m_importList.begin(), m_importList.end(), sectionSort); - for (ItemLibraryImport *itemLibImport : qAsConst(m_importList)) + for (ItemLibraryImport *itemLibImport : std::as_const(m_importList)) itemLibImport->sortCategorySections(); } diff --git a/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp b/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp index 7dae1e900ff..62d122d14c0 100644 --- a/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp +++ b/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp @@ -74,7 +74,7 @@ QString BundleImporter::importComponent(const QString &qmlFile, if (!bundleImportPathExists && !bundleImportPath.createDir()) return QStringLiteral("Failed to create bundle import folder: '%1'").arg(bundleImportPath.toString()); - for (const QString &file : qAsConst(m_sharedFiles)) { + for (const QString &file : std::as_const(m_sharedFiles)) { FilePath target = bundleImportPath.resolvePath(file); if (!target.exists()) { FilePath parentDir = target.parentDir(); @@ -111,7 +111,7 @@ QString BundleImporter::importComponent(const QString &qmlFile, QStringList allFiles; allFiles.append(files); allFiles.append(qmlFile); - for (const QString &file : qAsConst(allFiles)) { + for (const QString &file : std::as_const(allFiles)) { FilePath target = bundleImportPath.resolvePath(file); FilePath parentDir = target.parentDir(); if (!parentDir.exists() && !parentDir.createDir()) diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp index f6f9bb498d5..feb38e1cff6 100644 --- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp +++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp @@ -90,7 +90,7 @@ WidgetInfo MaterialBrowserView::widgetInfo() propNames.append(changedProp.name()); } } - for (const PropertyName &propName : qAsConst(propNames)) { + for (const PropertyName &propName : std::as_const(propNames)) { if (propName != "objectName") mat.removeProperty(propName); } diff --git a/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp b/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp index 7bd8fab01cb..61de509af3d 100644 --- a/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp +++ b/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp @@ -170,7 +170,7 @@ void ChooseFromPropertyListDialog::fillList(const QStringList &propNames) QString defaultProp = propNames.first(); QStringList sortedNames = propNames; sortedNames.sort(); - for (const auto &propName : qAsConst(sortedNames)) { + for (const auto &propName : std::as_const(sortedNames)) { QListWidgetItem *newItem = new QListWidgetItem(propName); m_ui->listProps->addItem(newItem); } diff --git a/src/plugins/qmldesigner/components/pathtool/pathitem.cpp b/src/plugins/qmldesigner/components/pathtool/pathitem.cpp index 401affca13f..8f0b28e159a 100644 --- a/src/plugins/qmldesigner/components/pathtool/pathitem.cpp +++ b/src/plugins/qmldesigner/components/pathtool/pathitem.cpp @@ -122,7 +122,7 @@ void PathItem::writePathToProperty() pathNode.variantProperty("startX").setValue(m_cubicSegments.constFirst().firstControlPoint().coordinate().x()); pathNode.variantProperty("startY").setValue(m_cubicSegments.constFirst().firstControlPoint().coordinate().y()); - for (const CubicSegment &cubicSegment : qAsConst(m_cubicSegments)) { + for (const CubicSegment &cubicSegment : std::as_const(m_cubicSegments)) { writePathAttributes(pathNode, cubicSegment.attributes()); writePathPercent(pathNode, cubicSegment.percent()); @@ -157,7 +157,7 @@ void PathItem::writePathAsCubicSegmentsOnly() pathNode.variantProperty("startY").setValue(m_cubicSegments.constFirst().firstControlPoint().coordinate().y()); - for (const CubicSegment &cubicSegment : qAsConst(m_cubicSegments)) { + for (const CubicSegment &cubicSegment : std::as_const(m_cubicSegments)) { writePathAttributes(pathNode, cubicSegment.attributes()); writePathPercent(pathNode, cubicSegment.percent()); writeCubicPath(pathNode, cubicSegment); @@ -668,7 +668,7 @@ const QList<ControlPoint> PathItem::controlPoints() const if (!m_cubicSegments.isEmpty()) controlPointList.append(m_cubicSegments.constFirst().firstControlPoint()); - for (const CubicSegment &cubicSegment : qAsConst(m_cubicSegments)) { + for (const CubicSegment &cubicSegment : std::as_const(m_cubicSegments)) { controlPointList.append(cubicSegment.secondControlPoint()); controlPointList.append(cubicSegment.thirdControlPoint()); controlPointList.append(cubicSegment.fourthControlPoint()); diff --git a/src/plugins/qmldesigner/components/pathtool/pathselectionmanipulator.cpp b/src/plugins/qmldesigner/components/pathtool/pathselectionmanipulator.cpp index 54f5a82edb8..2308beba9bd 100644 --- a/src/plugins/qmldesigner/components/pathtool/pathselectionmanipulator.cpp +++ b/src/plugins/qmldesigner/components/pathtool/pathselectionmanipulator.cpp @@ -97,13 +97,13 @@ QList<ControlPoint> PathSelectionManipulator::allControlPoints() { QList<ControlPoint> controlPoints; - for (const SelectionPoint &selectionPoint : qAsConst(m_singleSelectedPoints)) + for (const SelectionPoint &selectionPoint : std::as_const(m_singleSelectedPoints)) controlPoints.append(selectionPoint.controlPoint); - for (const SelectionPoint &selectionPoint : qAsConst(m_automaticallyAddedSinglePoints)) + for (const SelectionPoint &selectionPoint : std::as_const(m_automaticallyAddedSinglePoints)) controlPoints.append(selectionPoint.controlPoint); - for (const SelectionPoint &selectionPoint : qAsConst(m_multiSelectedPoints)) + for (const SelectionPoint &selectionPoint : std::as_const(m_multiSelectedPoints)) controlPoints.append(selectionPoint.controlPoint); return controlPoints; diff --git a/src/plugins/qmldesigner/components/propertyeditor/aligndistribute.cpp b/src/plugins/qmldesigner/components/propertyeditor/aligndistribute.cpp index 80ca4ab47fc..9365f825ef9 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/aligndistribute.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/aligndistribute.cpp @@ -309,7 +309,7 @@ void AlignDistribute::alignObjects(Target target, AlignTo alignTo, const QString }; view->executeInTransaction("DesignerActionManager|" + operationName, [&]() { - for (const ModelNode &modelNode : qAsConst(selectedNodes)) { + for (const ModelNode &modelNode : std::as_const(selectedNodes)) { QTC_ASSERT(!modelNode.isRootNode(), continue); if (QmlItemNode::isValidQmlItemNode(modelNode)) { QmlItemNode qmlItemNode(modelNode); @@ -434,7 +434,7 @@ void AlignDistribute::distributeObjects(Target target, AlignTo alignTo, const QS return; } - for (const ModelNode &modelNode : qAsConst(selectedNodes)) { + for (const ModelNode &modelNode : std::as_const(selectedNodes)) { if (QmlItemNode::isValidQmlItemNode(modelNode)) { QmlItemNode qmlItemNode(modelNode); qreal currentPosition; @@ -473,7 +473,7 @@ void AlignDistribute::distributeObjects(Target target, AlignTo alignTo, const QS const QByteArray operationName = "distribute" + QVariant::fromValue(target).toByteArray(); view->executeInTransaction("DesignerActionManager|" + operationName, [&]() { - for (const ModelNode &modelNode : qAsConst(selectedNodes)) { + for (const ModelNode &modelNode : std::as_const(selectedNodes)) { QTC_ASSERT(!modelNode.isRootNode(), continue); if (QmlItemNode::isValidQmlItemNode(modelNode)) { QmlItemNode qmlItemNode(modelNode); @@ -569,7 +569,7 @@ void AlignDistribute::distributeSpacing(Dimension dimension, } } - for (const ModelNode &modelNode : qAsConst(selectedNodes)) { + for (const ModelNode &modelNode : std::as_const(selectedNodes)) { if (QmlItemNode::isValidQmlItemNode(modelNode)) { const QmlItemNode qmlItemNode(modelNode); qreal currentPosition; @@ -606,7 +606,7 @@ void AlignDistribute::distributeSpacing(Dimension dimension, : "distributeSpacingVertical"; view->executeInTransaction("DesignerActionManager|" + operationName, [&]() { - for (const ModelNode &modelNode : qAsConst(selectedNodes)) { + for (const ModelNode &modelNode : std::as_const(selectedNodes)) { QTC_ASSERT(!modelNode.isRootNode(), continue); if (QmlItemNode::isValidQmlItemNode(modelNode)) { QmlItemNode qmlItemNode(modelNode); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp index 049985ddda8..10f08b542ae 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp @@ -243,7 +243,7 @@ void PropertyEditorContextObject::changeTypeName(const QString &typeName) if (!incompatibleProperties.empty()) { QString detailedText = QString("<b>Incompatible properties:</b><br>"); - for (const auto &p : qAsConst(incompatibleProperties)) + for (const auto &p : std::as_const(incompatibleProperties)) detailedText.append("- " + QString::fromUtf8(p) + "<br>"); detailedText.chop(QString("<br>").size()); @@ -263,7 +263,7 @@ void PropertyEditorContextObject::changeTypeName(const QString &typeName) if (msgBox.exec() == QMessageBox::Cancel) return; - for (const auto &p : qAsConst(incompatibleProperties)) + for (const auto &p : std::as_const(incompatibleProperties)) selectedNode.removeProperty(p); } diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp index 0cf8ebe9224..a609a3d5ccb 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp @@ -581,11 +581,11 @@ QStringList QmlAnchorBindingProxy::possibleTargetItems() const itemList.removeOne(m_qmlItemNode); //We currently have no instanceChildren(). //So we double check here if the instanceParents are equal. - for (const QmlItemNode &node : qAsConst(itemList)) + for (const QmlItemNode &node : std::as_const(itemList)) if (node.isValid() && (node.instanceParent().modelNode() != m_qmlItemNode.instanceParent().modelNode())) itemList.removeAll(node); - for (const QmlItemNode &itemNode : qAsConst(itemList)) { + for (const QmlItemNode &itemNode : std::as_const(itemList)) { if (itemNode.isValid() && !itemNode.id().isEmpty()) stringList.append(itemNode.id()); } diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp index f70789310cc..45c482c16d9 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp @@ -114,7 +114,7 @@ void StatesEditorView::removeState(int nodeId) Utils::sort(lockedTargets); QString detailedText = QString("<b>" + tr("Locked components:") + "</b><br>"); - for (const auto &id : qAsConst(lockedTargets)) + for (const auto &id : std::as_const(lockedTargets)) detailedText.append("- " + id + "<br>"); detailedText.chop(QString("<br>").size()); diff --git a/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp index a8e28f62e06..c2c8ec83882 100644 --- a/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp +++ b/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp @@ -312,7 +312,7 @@ void StatesEditorView::removeState(int nodeId) Utils::sort(lockedTargets); QString detailedText = QString("<b>" + tr("Locked components:") + "</b><br>"); - for (const auto &id : qAsConst(lockedTargets)) + for (const auto &id : std::as_const(lockedTargets)) detailedText.append("- " + id + "<br>"); detailedText.chop(QString("<br>").size()); diff --git a/src/plugins/qmldesigner/components/timelineeditor/easingcurvedialog.cpp b/src/plugins/qmldesigner/components/timelineeditor/easingcurvedialog.cpp index aafb7e8b18f..96e6140f618 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/easingcurvedialog.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/easingcurvedialog.cpp @@ -176,7 +176,7 @@ bool EasingCurveDialog::apply() return view->executeInTransaction("EasingCurveDialog::apply", [this](){ auto expression = m_splineEditor->easingCurve().toString(); - for (const auto &frame : qAsConst(m_frames)) + for (const auto &frame : std::as_const(m_frames)) frame.bindingProperty("easing.bezierCurve").setExpression(expression); }); } diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineactions.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineactions.cpp index 33c8424a0b0..70855241a55 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelineactions.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelineactions.cpp @@ -229,7 +229,7 @@ std::vector<std::tuple<ModelNode, qreal>> getFramesRelative(const ModelNode &par if (!sortedByTime.empty()) { qreal firstTime = getTime(sortedByTime.first()); - for (const ModelNode &keyframe : qAsConst(sortedByTime)) + for (const ModelNode &keyframe : std::as_const(sortedByTime)) result.emplace_back(keyframe, getTime(keyframe) - firstTime); } diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.cpp index dfa00985dd3..4493c0a2201 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.cpp @@ -537,7 +537,7 @@ void AbstractScrollGraphicsScene::selectKeyframes(const SelectionMode &mode, void AbstractScrollGraphicsScene::clearSelection() { - for (auto *keyframe : qAsConst(m_selectedKeyframes)) + for (auto *keyframe : std::as_const(m_selectedKeyframes)) if (keyframe) keyframe->setHighlighted(false); diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineselectiontool.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineselectiontool.cpp index b366d0822c7..ab0f52e7862 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelineselectiontool.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelineselectiontool.cpp @@ -113,7 +113,7 @@ void TimelineSelectionTool::reset() void TimelineSelectionTool::resetHighlights() { - for (auto *keyframe : qAsConst(m_aboutToSelectBuffer)) + for (auto *keyframe : std::as_const(m_aboutToSelectBuffer)) if (scene()->isKeyframeSelected(keyframe)) keyframe->setHighlighted(true); else diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp index a2fd0b8e558..09cdd75c9e9 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp @@ -478,7 +478,7 @@ void TimelineToolBar::resizeEvent([[maybe_unused]] QResizeEvent *event) { int width = 0; QWidget *spacer = nullptr; - for (auto *object : qAsConst(m_grp)) { + for (auto *object : std::as_const(m_grp)) { if (isSpacer(object)) spacer = qobject_cast<QWidget *>(object); else diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp index 383d313ffdf..d8f1741994b 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp +++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp @@ -292,7 +292,7 @@ void TransitionEditorToolBar::resizeEvent([[maybe_unused]] QResizeEvent *event) { int width = 0; QWidget *spacer = nullptr; - for (auto *object : qAsConst(m_grp)) { + for (auto *object : std::as_const(m_grp)) { if (isSpacer(object)) spacer = qobject_cast<QWidget *>(object); else diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp index 9bf04e8e0c5..a2af7ed0eea 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp +++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp @@ -194,7 +194,7 @@ ModelNode TransitionEditorView::addNewTransition() QHash<QString, QStringList> idPropertyList; - for (const QmlModelState &state : qAsConst(states)) { + for (const QmlModelState &state : std::as_const(states)) { for (const QmlPropertyChanges & change : state.propertyChanges()) { QStringList locList; const ModelNode target = change.target(); diff --git a/src/plugins/qmldesigner/designercore/include/forwardview.h b/src/plugins/qmldesigner/designercore/include/forwardview.h index a51c34dce42..9dbb1c934ab 100644 --- a/src/plugins/qmldesigner/designercore/include/forwardview.h +++ b/src/plugins/qmldesigner/designercore/include/forwardview.h @@ -70,14 +70,14 @@ template <class ViewType> void ForwardView<ViewType>::modelAttached(Model *model) { AbstractView::modelAttached(model); - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->modelAttached(model); } template <class ViewType> void ForwardView<ViewType>::modelAboutToBeDetached(Model *model) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->modelAboutToBeDetached(model); AbstractView::modelAboutToBeDetached(model); @@ -86,35 +86,35 @@ void ForwardView<ViewType>::modelAboutToBeDetached(Model *model) template <class ViewType> void ForwardView<ViewType>::nodeCreated(const ModelNode &createdNode) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->nodeCreated(ModelNode(createdNode, view.data())); } template <class ViewType> void ForwardView<ViewType>::nodeAboutToBeRemoved(const ModelNode &removedNode) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->nodeAboutToBeRemoved(ModelNode(removedNode, view.data())); } template <class ViewType> void ForwardView<ViewType>::nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->nodeRemoved(ModelNode(removedNode, view.data()), NodeAbstractProperty(parentProperty, view.data()), propertyChange); } template <class ViewType> void ForwardView<ViewType>::nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->nodeReparented(ModelNode(node, view.data()), NodeAbstractProperty(newPropertyParent, view.data()), NodeAbstractProperty(oldPropertyParent, view.data()), propertyChange); } template <class ViewType> void ForwardView<ViewType>::nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->nodeIdChanged(ModelNode(node, view.data()), newId, oldId); } @@ -134,41 +134,41 @@ static QList<T> adjustedList(const QList<T>& oldList, AbstractView *view) template <class ViewType> void ForwardView<ViewType>::propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->propertiesAboutToBeRemoved(adjustedList(propertyList, view.data())); } template <class ViewType> void ForwardView<ViewType>::propertiesRemoved(const QList<AbstractProperty>& propertyList) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->propertiesRemoved(adjustedList(propertyList, view.data())); } template <class ViewType> void ForwardView<ViewType>::variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->variantPropertiesChanged(adjustedList(propertyList, view.data()), propertyChange); } template <class ViewType> void ForwardView<ViewType>::bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->bindingPropertiesChanged(adjustedList(propertyList, view.data()), propertyChange); } void ForwardView::signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> &propertyList, AbstractView::PropertyChangeFlags propertyChange) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->signalHandlerPropertiesChanged(adjustedList(propertyList, view.data()), propertyChange); } template <class ViewType> void ForwardView<ViewType>::rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->rootNodeTypeChanged(type, majorVersion, minorVersion); } @@ -176,7 +176,7 @@ template <class ViewType> void ForwardView<ViewType>::selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->selectedNodesChanged(adjustedList(selectedNodeList, view.data()), adjustedList(lastSelectedNodeList, view.data())); } @@ -185,21 +185,21 @@ void ForwardView<ViewType>::fileUrlChanged(const QUrl &oldUrl, const QUrl &newUr { AbstractView::fileUrlChanged(oldUrl, newUrl); - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->fileUrlChanged(oldUrl, newUrl); } template<class ViewType> void ForwardView<ViewType>::nodeOrderChanged(const NodeListProperty &listProperty) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->nodeOrderChanged(NodeListProperty(listProperty, view.data())); } template <class ViewType> void ForwardView<ViewType>::importChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->importChanged(addedImport, removedImport); } @@ -208,7 +208,7 @@ void ForwardView<ViewType>::importRemoved(const Import &import) { AbstractView::importRemoved(import); - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->importRemoved(import); } @@ -217,14 +217,14 @@ void ForwardView<ViewType>::auxiliaryDataChanged(const ModelNode &node, const Pr { AbstractView::auxiliaryDataChanged(node, name, data); - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->auxiliaryDataChanged(ModelNode(node, view.data()), name, data); } template <class ViewType> void ForwardView<ViewType>::scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) { - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) view->scriptFunctionsChanged(node, scriptFunctionList); } @@ -245,7 +245,7 @@ QList<ViewType*> ForwardView<ViewType>::viewList() const { QList<ViewType*> newList; - for (const ViewTypePointer &view : qAsConst(m_targetViewList)) + for (const ViewTypePointer &view : std::as_const(m_targetViewList)) newList.append(view.data()); return newList; diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 7cf699c6176..dfc5667199b 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -146,7 +146,7 @@ NodeInstanceView::NodeInstanceView(ConnectionManagerInterface &connectionManager m_updateWatcherTimer.setSingleShot(true); m_updateWatcherTimer.setInterval(100); QObject::connect(&m_updateWatcherTimer, &QTimer::timeout, [this] { - for (const auto &path : qAsConst(m_pendingUpdateDirs)) + for (const auto &path : std::as_const(m_pendingUpdateDirs)) updateWatcher(path); m_pendingUpdateDirs.clear(); }); @@ -502,7 +502,7 @@ void NodeInstanceView::propertiesAboutToBeRemoved(const QList<AbstractProperty>& } } - for (const ModelNode &node : qAsConst(nodeList)) + for (const ModelNode &node : std::as_const(nodeList)) removeInstanceNodeRelationship(node); } @@ -2172,7 +2172,7 @@ void NodeInstanceView::handleShaderChanges() m_remainingQsbTargets += newShaders.size(); - for (const auto &shader : qAsConst(newShaders)) { + for (const auto &shader : std::as_const(newShaders)) { const Utils::FilePath srcFile = Utils::FilePath::fromString(shader); const Utils::FilePath srcPath = srcFile.absolutePath(); const Utils::FilePath outPath = Utils::FilePath::fromString(shader + ".qsb"); @@ -2237,7 +2237,7 @@ void NodeInstanceView::updateRotationBlocks() } } if (!qml3DNodes.isEmpty()) { - for (const auto &node : qAsConst(qml3DNodes)) { + for (const auto &node : std::as_const(qml3DNodes)) { if (rotationKeyframeTargets.contains(node)) node.setAuxiliaryData(rotBlockProperty, true); else diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp index 8fb3c4d59c9..a96fac3ad09 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp @@ -269,7 +269,7 @@ QList<ItemLibraryEntry> ItemLibraryInfo::entriesForType(const QByteArray &typeNa { QList<ItemLibraryEntry> entries; - for (const ItemLibraryEntry &entry : qAsConst(m_nameToEntryHash)) { + for (const ItemLibraryEntry &entry : std::as_const(m_nameToEntryHash)) { if (entry.typeName() == typeName) entries += entry; } diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp index 24b612d8088..ae8abef5a19 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp @@ -95,7 +95,7 @@ void MetaInfoPrivate::parseItemLibraryDescriptions() { #ifndef QMLDESIGNER_TEST Internal::WidgetPluginManager pluginManager; - for (const QString &pluginDir : qAsConst(m_q->s_pluginDirs)) + for (const QString &pluginDir : std::as_const(m_q->s_pluginDirs)) pluginManager.addPath(pluginDir); const QList<IWidgetPlugin *> widgetPluginList = pluginManager.instances(); for (IWidgetPlugin *plugin : widgetPluginList) { diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index c71bb6aa8b4..5d63b8bebc4 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -148,7 +148,7 @@ static QString qualifiedTypeNameForContext(const ObjectValue *objectValue, CoreImport cImport = dep.coreImport(objectValue->originId()); if (!cImport.valid()) break; - for (const Export &e : qAsConst(cImport.possibleExports)) { + for (const Export &e : std::as_const(cImport.possibleExports)) { if (e.pathRequired.isEmpty() || vContext.paths.contains(e.pathRequired)) { switch (e.exportName.type) { case ImportType::Library: @@ -173,7 +173,7 @@ static QString qualifiedTypeNameForContext(const ObjectValue *objectValue, // remove the search path prefix. // this means that the same relative path wrt. different import paths will clash QString filePath = e.exportName.path(); - for (const Utils::FilePath &path : qAsConst(vContext.paths)) { + for (const Utils::FilePath &path : std::as_const(vContext.paths)) { if (filePath.startsWith(path.path()) && filePath.size() > path.path().size() && filePath.at(path.path().size()) == QLatin1Char('/')) { filePath = filePath.mid(path.path().size() + 1); @@ -247,7 +247,7 @@ static QString qualifiedTypeNameForContext(const ObjectValue *objectValue, }; if (!possibleLibraries.isEmpty()) { if (hasQtQuick) { - for (const QString &libImport : qAsConst(possibleLibraries)) + for (const QString &libImport : std::as_const(possibleLibraries)) if (!libImport.startsWith(QLatin1String("QtQuick"))) possibleLibraries.removeAll(libImport); } @@ -284,7 +284,7 @@ public: const TypeName type = resolveTypeName(ref, m_context, dotProperties); m_properties.append({propertyName, type}); if (!dotProperties.isEmpty()) { - for (const PropertyInfo &propertyInfo : qAsConst(dotProperties)) { + for (const PropertyInfo &propertyInfo : std::as_const(dotProperties)) { PropertyName dotName = propertyInfo.first; TypeName type = propertyInfo.second; dotName = propertyName + '.' + dotName; @@ -1267,7 +1267,7 @@ void NodeMetaInfoPrivate::setupPrototypes() return; } - for (const ObjectValue *ov : qAsConst(objects)) { + for (const ObjectValue *ov : std::as_const(objects)) { TypeDescription description; description.className = ov->className(); description.minorVersion = -1; diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp index 3c58092416d..79961abfd7f 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp @@ -152,7 +152,7 @@ void SubComponentManager::parseDirectories() for (const auto &assetPath : assetPaths) parseDirectory(assetPath); - for (const Import &import : qAsConst(m_imports)) { + for (const Import &import : std::as_const(m_imports)) { if (import.isFileImport()) { QFileInfo dirInfo = QFileInfo(m_filePath.resolved(import.file()).toLocalFile()); if (dirInfo.exists() && dirInfo.isDir()) { @@ -389,7 +389,7 @@ void SubComponentManager::parseQuick3DAssetsDir(const QString &quick3DAssetsPath asset.prepend(QString(Constants::QUICK_3D_ASSETS_FOLDER).mid(1) + '.'); // Create item library entries for Quick3D assets that are imported by document - for (auto &import : qAsConst(m_imports)) { + for (auto &import : std::as_const(m_imports)) { if (import.isLibraryImport() && assets.contains(import.url())) { assets.removeOne(import.url()); parseQuick3DAssetsItem(import.url(), quick3DAssetsPath); diff --git a/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp index cfe5c800310..b4e6273870d 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp @@ -77,7 +77,7 @@ void InternalNodeListProperty::slide(int from, int to) QList<InternalNode::Pointer> InternalNodeListProperty::allSubNodes() const { QList<InternalNode::Pointer> nodeList; - for (const InternalNode::Pointer &childNode : qAsConst(m_nodeList)) { + for (const InternalNode::Pointer &childNode : std::as_const(m_nodeList)) { nodeList.append(childNode->allSubNodes()); nodeList.append(childNode); } diff --git a/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp b/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp index 8b1018bd633..71cc2da0425 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp @@ -24,7 +24,7 @@ void ModelNodePositionRecalculator::moved(const TextModifier::MoveInfo &moveInfo const int prefixLength = moveInfo.prefixToInsert.length(); const int suffixLength = moveInfo.suffixToInsert.length(); - for (const ModelNode &node : qAsConst(m_nodesToTrack)) { + for (const ModelNode &node : std::as_const(m_nodesToTrack)) { const int nodeLocation = m_positionStore->nodeOffset(node); if (nodeLocation == ModelNodePositionStorage::INVALID_LOCATION) @@ -67,7 +67,7 @@ void ModelNodePositionRecalculator::replaced(int offset, int oldLength, int newL if (growth == 0) return; - for (const ModelNode &node : qAsConst(m_nodesToTrack)) { + for (const ModelNode &node : std::as_const(m_nodesToTrack)) { const int nodeLocation = m_positionStore->nodeOffset(node); if (nodeLocation == ModelNodePositionStorage::INVALID_LOCATION) diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp index 9b368b0cdaf..588cab5d50a 100644 --- a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp @@ -237,7 +237,7 @@ void ModelToTextMerger::applyChanges() textModifier->deactivateChangeSignals(); textModifier->startGroup(); - for (auto action : qAsConst(m_rewriteActions)) { + for (auto action : std::as_const(m_rewriteActions)) { if (DebugRewriteActions) qDebug() << "Next rewrite action:" << qPrintable(action->info()); @@ -299,7 +299,7 @@ void ModelToTextMerger::reindent(const QMap<int, int> &dirtyAreas) const Utils::sort(offsets); TextModifier *textModifier = m_rewriterView->textModifier(); - for (const int offset : qAsConst(offsets)) { + for (const int offset : std::as_const(offsets)) { const int length = dirtyAreas[offset]; textModifier->indent(offset, length); } @@ -396,7 +396,7 @@ void ModelToTextMerger::dumpRewriteActions(const QString &msg) if (DebugRewriteActions) { qDebug() << "---->" << qPrintable(msg); - for (RewriteAction *action : qAsConst(m_rewriteActions)) { + for (RewriteAction *action : std::as_const(m_rewriteActions)) { qDebug() << "-----" << qPrintable(action->info()); } diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index 3bb73e586e8..d9f592e7499 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -431,7 +431,7 @@ void QmlObjectNode::destroy() } const auto subNodes = modelNode().allSubModelNodesAndThisNode(); - for (auto &timelineNode : qAsConst(timelineNodes)) { + for (auto &timelineNode : std::as_const(timelineNodes)) { QmlTimeline timeline(timelineNode); for (const auto &subNode : subNodes) timeline.destroyKeyframesForTarget(subNode); @@ -552,7 +552,7 @@ QList<QmlModelState> QmlObjectNode::allDefinedStates() const if (QmlVisualNode::isValidQmlVisualNode(view()->rootModelNode())) allVisualNodes.append(allQmlVisualNodesRecursive(view()->rootModelNode())); - for (const QmlVisualNode &node : qAsConst(allVisualNodes)) + for (const QmlVisualNode &node : std::as_const(allVisualNodes)) returnList.append(node.states().allStates()); const auto allNodes = view()->allModelNodes(); diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp index a3fa65d682f..27b452ae5ed 100644 --- a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp @@ -220,7 +220,7 @@ QString QmlTextGenerator::propertiesToQml(const ModelNode &node, int indentDepth PropertyNameList nodePropertyNames = node.propertyNames(); bool addToTop = true; - for (const PropertyName &propertyName : qAsConst(m_propertyOrder)) { + for (const PropertyName &propertyName : std::as_const(m_propertyOrder)) { if (propertyName == "id") { // the model handles the id property special, so: if (!node.id().isEmpty()) { @@ -246,7 +246,7 @@ QString QmlTextGenerator::propertiesToQml(const ModelNode &node, int indentDepth } } - for (const PropertyName &propertyName : qAsConst(nodePropertyNames)) { + for (const PropertyName &propertyName : std::as_const(nodePropertyNames)) { bottomPart.prepend(propertyToQml(node.property(propertyName), indentDepth)); } diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp index f7d5da29aba..e1d496fc061 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp @@ -80,7 +80,7 @@ void RewriteActionCompressor::compressImports(QList<RewriteAction *> &actions) c } } - for (RewriteAction *action : qAsConst(actionsToRemove)) { + for (RewriteAction *action : std::as_const(actionsToRemove)) { actions.removeOne(action); delete action; } @@ -106,7 +106,7 @@ void RewriteActionCompressor::compressRereparentActions(QList<RewriteAction *> & } } - for (RewriteAction *action : qAsConst(actionsToRemove)) { + for (RewriteAction *action : std::as_const(actionsToRemove)) { actions.removeOne(action); delete action; } @@ -125,7 +125,7 @@ void RewriteActionCompressor::compressReparentIntoSamePropertyActions(QList<Rewr } } - for (RewriteAction *action : qAsConst(actionsToRemove)) { + for (RewriteAction *action : std::as_const(actionsToRemove)) { actions.removeOne(action); delete action; } @@ -152,7 +152,7 @@ void RewriteActionCompressor::compressReparentIntoNewPropertyActions(QList<Rewri } } - for (RewriteAction *action : qAsConst(actionsToRemove)) { + for (RewriteAction *action : std::as_const(actionsToRemove)) { actions.removeOne(action); delete action; } @@ -209,7 +209,7 @@ void RewriteActionCompressor::compressAddEditRemoveNodeActions(QList<RewriteActi } } - for (RewriteAction *action : qAsConst(actionsToRemove)) { + for (RewriteAction *action : std::as_const(actionsToRemove)) { actions.removeOne(action); delete action; } @@ -256,7 +256,7 @@ void RewriteActionCompressor::compressPropertyActions(QList<RewriteAction *> &ac } } - for (RewriteAction *action : qAsConst(actionsToRemove)) { + for (RewriteAction *action : std::as_const(actionsToRemove)) { actions.removeOne(action); delete action; } @@ -269,7 +269,7 @@ void RewriteActionCompressor::compressAddEditActions( QSet<ModelNode> addedNodes; QSet<RewriteAction *> dirtyActions; - for (RewriteAction *action : qAsConst(actions)) { + for (RewriteAction *action : std::as_const(actions)) { if (action->asAddPropertyRewriteAction() || action->asChangePropertyRewriteAction()) { AbstractProperty property; ModelNode containedNode; @@ -305,13 +305,13 @@ void RewriteActionCompressor::compressAddEditActions( } } - for (RewriteAction *action : qAsConst(actionsToRemove)) { + for (RewriteAction *action : std::as_const(actionsToRemove)) { actions.removeOne(action); delete action; } QmlTextGenerator gen(m_propertyOrder, tabSettings); - for (RewriteAction *action : qAsConst(dirtyActions)) { + for (RewriteAction *action : std::as_const(dirtyActions)) { RewriteAction *newAction = nullptr; if (AddPropertyRewriteAction *addAction = action->asAddPropertyRewriteAction()) { newAction = new AddPropertyRewriteAction(addAction->property(), @@ -376,7 +376,7 @@ void RewriteActionCompressor::compressAddReparentActions(QList<RewriteAction *> } } - for (RewriteAction *action : qAsConst(actionsToRemove)) { + for (RewriteAction *action : std::as_const(actionsToRemove)) { actions.removeOne(action); delete action; } diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 65f1041fae0..656a772620b 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -838,7 +838,7 @@ void TextToModelMerger::setupImports(const Document::Ptr &doc, } } - for (const Import &import : qAsConst(existingImports)) + for (const Import &import : std::as_const(existingImports)) differenceHandler.importAbsentInQMl(import); } @@ -1412,7 +1412,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, } } - for (const PropertyName &modelPropertyName : qAsConst(modelPropertyNames)) { + for (const PropertyName &modelPropertyName : std::as_const(modelPropertyNames)) { AbstractProperty modelProperty = modelNode.property(modelPropertyName); // property deleted. diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 517e6d86e33..233c88a4b88 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -97,7 +97,7 @@ DesignModeWidget::DesignModeWidget() DesignModeWidget::~DesignModeWidget() { - for (QPointer<QWidget> widget : qAsConst(m_viewWidgets)) { + for (QPointer<QWidget> widget : std::as_const(m_viewWidgets)) { if (widget) widget.clear(); } @@ -464,7 +464,7 @@ void DesignModeWidget::aboutToShowWorkspaces() auto sortedWorkspaces = m_dockManager->workspaces(); Utils::sort(sortedWorkspaces); - for (const auto &workspace : qAsConst(sortedWorkspaces)) { + for (const auto &workspace : std::as_const(sortedWorkspaces)) { QAction *action = ag->addAction(workspace); action->setData(workspace); action->setCheckable(true); diff --git a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp index 313a3315bd1..70704ce9974 100644 --- a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp +++ b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp @@ -146,7 +146,7 @@ void FpsLabelAction::fpsHandler(quint16 fpsValues[8]) fpsText = fpsText.arg("--"); else fpsText = fpsText.arg(lastValidFrames); - for (const QPointer<QLabel> &label : qAsConst(fpsHandlerLabelList)) { + for (const QPointer<QLabel> &label : std::as_const(fpsHandlerLabelList)) { if (label) label->setText(fpsText); } @@ -175,7 +175,7 @@ QWidget *FpsLabelAction::createWidget(QWidget *parent) void FpsLabelAction::refreshFpsLabel(quint16 frames) { - for (const auto &labelPointer : qAsConst(fpsHandlerLabelList)) { + for (const auto &labelPointer : std::as_const(fpsHandlerLabelList)) { if (labelPointer) labelPointer->setText(QString("%1 FPS").arg(frames)); } diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp index 427bdc3e0db..2f9c21fcf70 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.cpp +++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp @@ -666,7 +666,7 @@ IAssistProposal *QmlJSCompletionAssistProcessor::perform(const AssistInterface * QStringList nCompletions; QString prefix(libVersion.left(toSkip)); nCompletions.reserve(completions.size()); - for (const QString &completion : qAsConst(completions)) + for (const QString &completion : std::as_const(completions)) if (completion.startsWith(prefix)) nCompletions.append(completion.right(completion.size()-toSkip)); completions = nCompletions; @@ -1031,7 +1031,7 @@ void QmlJSAssistProposalModel::filter(const QString &prefix) return; QList<AssistProposalItemInterface *> newCurrentItems; newCurrentItems.reserve(m_currentItems.size()); - for (AssistProposalItemInterface *item : qAsConst(m_currentItems)) + for (AssistProposalItemInterface *item : std::as_const(m_currentItems)) if (!item->text().startsWith(QLatin1String("__"))) newCurrentItems << item; m_currentItems = newCurrentItems; diff --git a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp index ea828dc73b7..33633e2f8ab 100644 --- a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp +++ b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp @@ -109,7 +109,7 @@ public: sortedPropertiesWithoutId.sort(); - for (const QString &property : qAsConst(sortedPropertiesWithoutId)) + for (const QString &property : std::as_const(sortedPropertiesWithoutId)) sourcePreview.append(QLatin1String(" ") + property + QLatin1String(": ") + propertyReader.readAstValue(property)); const bool confirm = ComponentNameDialog::go(&componentName, @@ -161,7 +161,7 @@ public: if (program->members) astRootNode = program->members->member; - for (const QString &property : qAsConst(result)) + for (const QString &property : std::as_const(result)) rewriter.removeBindingByName(initializerOfObject(astRootNode), property); } else { qWarning() << Q_FUNC_INFO << "parsing failed:" << newComponentSource; @@ -191,7 +191,7 @@ public: if (!m_idName.isEmpty()) replacement += QLatin1String("id: ") + m_idName + QLatin1Char('\n'); - for (const QString &property : qAsConst(result)) + for (const QString &property : std::as_const(result)) replacement += property + QLatin1String(": ") + propertyReader.readAstValue(property) + QLatin1Char('\n'); Utils::ChangeSet changes; diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 3db43211763..aa5494aa3da 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -357,7 +357,7 @@ void QmlJSEditorWidget::updateUses() Utils::sort(locations, [](const SourceLocation &lhs, const SourceLocation &rhs) { return lhs.begin() < rhs.begin(); }); - for (const SourceLocation &loc : qAsConst(locations)) { + for (const SourceLocation &loc : std::as_const(locations)) { if (! loc.isValid()) continue; diff --git a/src/plugins/qmljseditor/qmljseditordocument.cpp b/src/plugins/qmljseditor/qmljseditordocument.cpp index c71dd48975c..81f30c410a3 100644 --- a/src/plugins/qmljseditor/qmljseditordocument.cpp +++ b/src/plugins/qmljseditor/qmljseditordocument.cpp @@ -618,13 +618,13 @@ void QmlJSEditorDocumentPrivate::createTextMarks(const SemanticInfo &info) m_semanticMarks.removeAll(mark); delete mark; }; - for (const DiagnosticMessage &diagnostic : qAsConst(info.semanticMessages)) { + for (const DiagnosticMessage &diagnostic : std::as_const(info.semanticMessages)) { auto mark = new QmlJSTextMark(q->filePath(), diagnostic, onMarkRemoved); m_semanticMarks.append(mark); q->addMark(mark); } - for (const QmlJS::StaticAnalysis::Message &message : qAsConst(info.staticAnalysisMessages)) { + for (const QmlJS::StaticAnalysis::Message &message : std::as_const(info.staticAnalysisMessages)) { auto mark = new QmlJSTextMark(q->filePath(), message, onMarkRemoved); m_semanticMarks.append(mark); diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp index 4a58d6f2634..af4461b34a1 100644 --- a/src/plugins/qmljseditor/qmljsfindreferences.cpp +++ b/src/plugins/qmljseditor/qmljsfindreferences.cpp @@ -879,7 +879,7 @@ static void find_helper(QFutureInterface<FindReferences::Usage> &future, replacement = name; Utils::FilePaths files; - for (const Document::Ptr &doc : qAsConst(snapshot)) { + for (const Document::Ptr &doc : std::as_const(snapshot)) { // ### skip files that don't contain the name token files.append(modelManager->fileToSource(doc->fileName())); } @@ -965,7 +965,7 @@ QList<FindReferences::Usage> FindReferences::findUsageOfType(const Utils::FilePa QmlJS::Snapshot snapshot = modelManager->snapshot(); QSet<Utils::FilePath> docDone; - for (const QmlJS::Document::Ptr &doc : qAsConst(snapshot)) { + for (const QmlJS::Document::Ptr &doc : std::as_const(snapshot)) { Utils::FilePath sourceFile = modelManager->fileToSource(doc->fileName()); if (docDone.contains(sourceFile)) continue; diff --git a/src/plugins/qmljseditor/qmloutlinemodel.cpp b/src/plugins/qmljseditor/qmloutlinemodel.cpp index 696668df9ea..a8ce6a5b020 100644 --- a/src/plugins/qmljseditor/qmloutlinemodel.cpp +++ b/src/plugins/qmljseditor/qmloutlinemodel.cpp @@ -378,7 +378,7 @@ bool QmlOutlineModel::dropMimeData(const QMimeData *data, Qt::DropAction action, stream >> rowPath; QModelIndex index; - for (int row : qAsConst(rowPath)) { + for (int row : std::as_const(rowPath)) { index = this->index(row, 0, index); if (!index.isValid()) continue; @@ -860,7 +860,7 @@ void QmlOutlineModel::reparentNodes(QmlOutlineItem *targetItem, int row, QList<Q QmlJSRefactoringChanges refactoring(ModelManagerInterface::instance(), m_semanticInfo.snapshot); TextEditor::RefactoringFilePtr file = refactoring.file(m_semanticInfo.document->fileName()); file->setChangeSet(changeSet); - for (const Utils::ChangeSet::Range &range : qAsConst(changedRanges)) { + for (const Utils::ChangeSet::Range &range : std::as_const(changedRanges)) { file->appendIndentRange(range); } file->apply(); diff --git a/src/plugins/qmljseditor/qmltaskmanager.cpp b/src/plugins/qmljseditor/qmltaskmanager.cpp index 5e077ccc3cf..a5c89a946e6 100644 --- a/src/plugins/qmljseditor/qmltaskmanager.cpp +++ b/src/plugins/qmljseditor/qmltaskmanager.cpp @@ -71,7 +71,7 @@ void QmlTaskManager::collectMessages(QFutureInterface<FileErrorMessages> &future context = link(&linkMessages); } - for (const Utils::FilePath &fileName : qAsConst(info.sourceFiles)) { + for (const Utils::FilePath &fileName : std::as_const(info.sourceFiles)) { Document::Ptr document = snapshot.document(fileName); if (!document) continue; diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index af8c9117238..19fc3aa4a67 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -74,7 +74,7 @@ static void setupProjectInfoQmlBundles(ModelManagerInterface::ProjectInfo &proje for (const Target *t : targets) currentKits.insert(t->kit()); currentKits.remove(activeKit); - for (Kit *kit : qAsConst(currentKits)) { + for (Kit *kit : std::as_const(currentKits)) { for (IBundleProvider *bp : IBundleProvider::allBundleProviders()) bp->mergeBundlesForKit(kit, projectInfo.extendedBundle, replacements); } diff --git a/src/plugins/qmljstools/qmljssemanticinfo.cpp b/src/plugins/qmljstools/qmljssemanticinfo.cpp index eb5f9da25f7..4bc48b4af8e 100644 --- a/src/plugins/qmljstools/qmljssemanticinfo.cpp +++ b/src/plugins/qmljstools/qmljssemanticinfo.cpp @@ -169,7 +169,7 @@ QList<AST::Node *> SemanticInfo::rangePath(int cursorPosition) const { QList<AST::Node *> path; - for (const Range &range : qAsConst(ranges)) { + for (const Range &range : std::as_const(ranges)) { if (range.begin.isNull() || range.end.isNull()) continue; else if (cursorPosition >= range.begin.position() && cursorPosition <= range.end.position()) diff --git a/src/plugins/qmlprofiler/flamegraphmodel.cpp b/src/plugins/qmlprofiler/flamegraphmodel.cpp index 87b5947d89f..e9de9823c28 100644 --- a/src/plugins/qmlprofiler/flamegraphmodel.cpp +++ b/src/plugins/qmlprofiler/flamegraphmodel.cpp @@ -118,7 +118,7 @@ void FlameGraphModel::loadEvent(const QmlEvent &event, const QmlEventType &type) void FlameGraphModel::finalize() { - for (FlameGraphData *child : qAsConst(m_stackBottom.children)) + for (FlameGraphData *child : std::as_const(m_stackBottom.children)) m_stackBottom.duration += child->duration; loadNotes(-1, false); diff --git a/src/plugins/qmlprofiler/pixmapcachemodel.cpp b/src/plugins/qmlprofiler/pixmapcachemodel.cpp index 24ecf32f289..df1ae7fee50 100644 --- a/src/plugins/qmlprofiler/pixmapcachemodel.cpp +++ b/src/plugins/qmlprofiler/pixmapcachemodel.cpp @@ -411,7 +411,7 @@ QString PixmapCacheModel::fileName(int index) const void PixmapCacheModel::computeMaxCacheSize() { - for (const PixmapCacheModel::Item &event : qAsConst(m_data)) { + for (const PixmapCacheModel::Item &event : std::as_const(m_data)) { if (event.pixmapEventType == PixmapCacheModel::PixmapCacheCountChanged) { if (event.cacheSize > m_maxCacheSize) m_maxCacheSize = event.cacheSize; diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index 90619b61258..9dadf4ae37d 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -390,7 +390,7 @@ QmlProfilerModelManager::rangeFilter(qint64 rangeStart, qint64 rangeEnd) const } } else { if (!crossedRangeStart) { - for (auto stashed : qAsConst(stack)) { + for (auto stashed : std::as_const(stack)) { stashed.setTimestamp(rangeStart); loader(stashed, eventType(stashed.typeIndex())); } diff --git a/src/plugins/qmlprofiler/qmlprofilertextmark.cpp b/src/plugins/qmlprofiler/qmlprofilertextmark.cpp index 776e095cca5..c35a18a8926 100644 --- a/src/plugins/qmlprofiler/qmlprofilertextmark.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertextmark.cpp @@ -94,13 +94,13 @@ void QmlProfilerTextMarkModel::createMarks(QmlProfilerViewManager *viewManager, void QmlProfilerTextMarkModel::showTextMarks() { - for (QmlProfilerTextMark *mark : qAsConst(m_marks)) + for (QmlProfilerTextMark *mark : std::as_const(m_marks)) mark->setVisible(true); } void QmlProfilerTextMarkModel::hideTextMarks() { - for (QmlProfilerTextMark *mark : qAsConst(m_marks)) + for (QmlProfilerTextMark *mark : std::as_const(m_marks)) mark->setVisible(false); } diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp index 3b2a9df9924..2647e342822 100644 --- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp @@ -203,7 +203,7 @@ void FileFilterBaseItem::updateFileListNow() QSet<QString> dirsToBeWatched; QSet<QString> newFiles; - for (const QString &explicitPath : qAsConst(m_explicitFiles)) + for (const QString &explicitPath : std::as_const(m_explicitFiles)) newFiles << absolutePath(explicitPath); if ((!m_fileSuffixes.isEmpty() || !m_regExpList.isEmpty()) && m_explicitFiles.isEmpty()) @@ -236,12 +236,12 @@ void FileFilterBaseItem::updateFileListNow() bool FileFilterBaseItem::fileMatches(const QString &fileName) const { - for (const QString &suffix : qAsConst(m_fileSuffixes)) { + for (const QString &suffix : std::as_const(m_fileSuffixes)) { if (fileName.endsWith(suffix, Qt::CaseInsensitive)) return true; } - for (const QRegularExpression &filter : qAsConst(m_regExpList)) { + for (const QRegularExpression &filter : std::as_const(m_regExpList)) { if (filter.match(fileName).hasMatch()) return true; } @@ -279,7 +279,7 @@ ImageFileFilterItem::ImageFileFilterItem(QObject *parent) QList<QByteArray> extensions = QImageReader::supportedImageFormats(); extensions.append("hdr"); extensions.append("ktx"); - for (const QByteArray &extension : qAsConst(extensions)) + for (const QByteArray &extension : std::as_const(extensions)) filter.append(QString::fromLatin1("*.%1;").arg(QString::fromLatin1(extension))); setFilter(filter); } diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp index 20ea980a279..76a08172401 100644 --- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp @@ -110,7 +110,7 @@ void QmlMainFileAspect::updateFileComboBox() // make paths relative to project directory QStringList relativeFiles; - for (const QString &fn : qAsConst(sortedFiles)) + for (const QString &fn : std::as_const(sortedFiles)) relativeFiles += projectDir.relativeFilePath(fn); sortedFiles = relativeFiles; @@ -120,7 +120,7 @@ void QmlMainFileAspect::updateFileComboBox() if (mainScriptSource() != FileInEditor) mainScriptPath = projectDir.relativeFilePath(mainScript()); - for (const QString &fn : qAsConst(sortedFiles)) { + for (const QString &fn : std::as_const(sortedFiles)) { QFileInfo fileInfo(fn); if (fileInfo.suffix() != "qml") continue; diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp index b17c240a469..84ba0baa488 100644 --- a/src/plugins/qnx/qnxconfiguration.cpp +++ b/src/plugins/qnx/qnxconfiguration.cpp @@ -219,7 +219,7 @@ QList<ToolChain *> QnxConfiguration::autoDetect(const QList<ToolChain *> &alread { QList<ToolChain *> result; - for (const Target &target : qAsConst(m_targets)) + for (const Target &target : std::as_const(m_targets)) result += findToolChain(alreadyKnown, target.m_abi); return result; diff --git a/src/plugins/qnx/qnxconfigurationmanager.cpp b/src/plugins/qnx/qnxconfigurationmanager.cpp index e26641d9dde..d5be8267bdc 100644 --- a/src/plugins/qnx/qnxconfigurationmanager.cpp +++ b/src/plugins/qnx/qnxconfigurationmanager.cpp @@ -64,7 +64,7 @@ bool QnxConfigurationManager::addConfiguration(QnxConfiguration *config) if (!config || !config->isValid()) return false; - for (QnxConfiguration *c : qAsConst(m_configurations)) { + for (QnxConfiguration *c : std::as_const(m_configurations)) { if (c->envFile() == config->envFile()) return false; } @@ -90,7 +90,7 @@ void QnxConfigurationManager::saveConfigs() QVariantMap data; data.insert(QLatin1String(QNXConfigsFileVersionKey), 1); int count = 0; - for (QnxConfiguration *config : qAsConst(m_configurations)) { + for (QnxConfiguration *config : std::as_const(m_configurations)) { QVariantMap tmp = config->toMap(); if (tmp.isEmpty()) continue; diff --git a/src/plugins/qnx/qnxdeviceprocesslist.cpp b/src/plugins/qnx/qnxdeviceprocesslist.cpp index 3f6c885a663..ac2971334bf 100644 --- a/src/plugins/qnx/qnxdeviceprocesslist.cpp +++ b/src/plugins/qnx/qnxdeviceprocesslist.cpp @@ -36,7 +36,7 @@ QList<ProcessInfo> QnxDeviceProcessList::buildProcessList(const QString &listPro lines.pop_front(); // drop headers const QRegularExpression re("\\s*(\\d+)\\s+(.*){(.*)}"); - for (const QString &line : qAsConst(lines)) { + for (const QString &line : std::as_const(lines)) { const QRegularExpressionMatch match = re.match(line); if (match.hasMatch()) { const QStringList captures = match.capturedTexts(); diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp index 02228170f9d..d68c667a792 100644 --- a/src/plugins/qnx/qnxqtversion.cpp +++ b/src/plugins/qnx/qnxqtversion.cpp @@ -80,7 +80,7 @@ QString QnxQtVersion::qnxHost() const if (!m_environmentUpToDate) updateEnvironment(); - for (const EnvironmentItem &item : qAsConst(m_qnxEnv)) { + for (const EnvironmentItem &item : std::as_const(m_qnxEnv)) { if (item.name == QLatin1String(QNX_HOST_KEY)) return item.value; } diff --git a/src/plugins/qnx/qnxsettingspage.cpp b/src/plugins/qnx/qnxsettingspage.cpp index f6a29eddf09..35253ba956c 100644 --- a/src/plugins/qnx/qnxsettingspage.cpp +++ b/src/plugins/qnx/qnxsettingspage.cpp @@ -223,7 +223,7 @@ void QnxSettingsWidget::setConfigState(QnxConfiguration *config, State state) break; } - for (const ConfigState &configState : qAsConst(m_changedConfigs)) { + for (const ConfigState &configState : std::as_const(m_changedConfigs)) { if (configState.config == config && configState.state == stateToRemove) m_changedConfigs.removeAll(configState); } @@ -233,7 +233,7 @@ void QnxSettingsWidget::setConfigState(QnxConfiguration *config, State state) void QnxSettingsWidget::apply() { - for (const ConfigState &configState : qAsConst(m_changedConfigs)) { + for (const ConfigState &configState : std::as_const(m_changedConfigs)) { switch (configState.state) { case Activated : configState.config->activate(); diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 209376d7456..d550d4c9ccf 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1048,7 +1048,7 @@ FilePath QtVersionPrivate::findHostBinary(HostBinaries binary) const default: Q_ASSERT(false); } - for (const QString &possibleCommand : qAsConst(possibleCommands)) { + for (const QString &possibleCommand : std::as_const(possibleCommands)) { const FilePath fullPath = baseDir / possibleCommand; if (fullPath.isExecutableFile()) return fullPath; @@ -2341,7 +2341,7 @@ QtVersion *QtVersionFactory::create() const QtVersion *QtVersion::clone() const { - for (QtVersionFactory *factory : qAsConst(g_qtVersionFactories)) { + for (QtVersionFactory *factory : std::as_const(g_qtVersionFactories)) { if (factory->m_supportedType == d->m_type) { QtVersion *version = factory->create(); QTC_ASSERT(version, return nullptr); diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index dd39525d878..c00b5a846c2 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -242,7 +242,7 @@ void QtVersionManager::updateFromInstaller(bool emitSignal) if (log().isDebugEnabled()) { qCDebug(log) << "======= Existing Qt versions ======="; - for (QtVersion *version : qAsConst(m_versions)) { + for (QtVersion *version : std::as_const(m_versions)) { qCDebug(log) << version->qmakeFilePath().toUserOutput() << "id:"<<version->uniqueId(); qCDebug(log) << " autodetection source:" << version->detectionSource(); qCDebug(log) << ""; @@ -318,7 +318,7 @@ void QtVersionManager::updateFromInstaller(bool emitSignal) if (log().isDebugEnabled()) { qCDebug(log) << "======= Before removing outdated sdk versions ======="; - for (QtVersion *version : qAsConst(m_versions)) { + for (QtVersion *version : std::as_const(m_versions)) { qCDebug(log) << version->qmakeFilePath().toUserOutput() << "id:" << version->uniqueId(); qCDebug(log) << " autodetection source:" << version->detectionSource(); qCDebug(log) << ""; @@ -337,7 +337,7 @@ void QtVersionManager::updateFromInstaller(bool emitSignal) if (log().isDebugEnabled()) { qCDebug(log)<< "======= End result ======="; - for (QtVersion *version : qAsConst(m_versions)) { + for (QtVersion *version : std::as_const(m_versions)) { qCDebug(log) << version->qmakeFilePath().toUserOutput() << "id:" << version->uniqueId(); qCDebug(log) << " autodetection source:" << version->detectionSource(); qCDebug(log) << ""; @@ -356,7 +356,7 @@ static void saveQtVersions() data.insert(QTVERSION_FILE_VERSION_KEY, 1); int count = 0; - for (QtVersion *qtv : qAsConst(m_versions)) { + for (QtVersion *qtv : std::as_const(m_versions)) { QVariantMap tmp = qtv->toMap(); if (tmp.isEmpty()) continue; @@ -417,7 +417,7 @@ static void findSystemQt() FilePaths systemQMakes = BuildableHelperLibrary::findQtsInEnvironment(Environment::systemEnvironment()); systemQMakes.append(gatherQmakePathsFromQtChooser()); - for (const FilePath &qmakePath : qAsConst(systemQMakes)) { + for (const FilePath &qmakePath : std::as_const(systemQMakes)) { if (BuildableHelperLibrary::isQtChooser(qmakePath)) continue; const auto isSameQmake = [qmakePath](const QtVersion *version) { diff --git a/src/plugins/qtsupport/translationwizardpage.cpp b/src/plugins/qtsupport/translationwizardpage.cpp index 2e735ab12b3..224b14dfac3 100644 --- a/src/plugins/qtsupport/translationwizardpage.cpp +++ b/src/plugins/qtsupport/translationwizardpage.cpp @@ -92,7 +92,7 @@ TranslationWizardPage::TranslationWizardPage(const QString &enabledExpr) return l1.first < l2.first; }); localeStrings.erase(std::unique(localeStrings.begin(), localeStrings.end()), localeStrings.end()); - for (const LocalePair &lp : qAsConst(localeStrings)) + for (const LocalePair &lp : std::as_const(localeStrings)) m_languageComboBox.addItem(lp.first, lp.second); formLayout->addRow(Tr::tr("Language:"), &m_languageComboBox); const auto fileNameLayout = new QHBoxLayout; diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp index c7230005860..f109c2e5388 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.cpp +++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp @@ -278,7 +278,7 @@ void GenericDirectUploadService::uploadFiles() } emit progressMessage(Tr::tr("%n file(s) need to be uploaded.", "", d->filesToUpload.size())); FilesToTransfer files; - for (const DeployableFile &file : qAsConst(d->filesToUpload)) { + for (const DeployableFile &file : std::as_const(d->filesToUpload)) { if (!file.localFilePath().exists()) { const QString message = Tr::tr("Local file \"%1\" does not exist.") .arg(file.localFilePath().toUserOutput()); @@ -305,7 +305,7 @@ void GenericDirectUploadService::chmod() QTC_ASSERT(d->state == PostProcessing, return); if (!Utils::HostOsInfo::isWindowsHost()) return; - for (const DeployableFile &f : qAsConst(d->filesToUpload)) { + for (const DeployableFile &f : std::as_const(d->filesToUpload)) { if (!f.isExecutable()) continue; QtcProcess * const chmodProc = new QtcProcess(this); diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp index e137a420035..9b5d9c78f7a 100644 --- a/src/plugins/remotelinux/linuxdevice.cpp +++ b/src/plugins/remotelinux/linuxdevice.cpp @@ -833,7 +833,7 @@ public: // If displayless sshParameters don't match the old connections' sshParameters, then stale // old connections (don't delete, as the last deref() to each one will delete them). - for (SshSharedConnection *connection : qAsConst(m_connections)) + for (SshSharedConnection *connection : std::as_const(m_connections)) connection->makeStale(); m_connections.clear(); m_displaylessSshParameters = displaylessSshParameters; @@ -847,7 +847,7 @@ public: SshSharedConnection *matchingConnection = nullptr; // Find the matching connection - for (SshSharedConnection *connection : qAsConst(m_connections)) { + for (SshSharedConnection *connection : std::as_const(m_connections)) { if (connection->sshParameters() == sshParameters) { matchingConnection = connection; break; diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp index 363ed7f7189..29985a1c3f6 100644 --- a/src/plugins/remotelinux/rsyncdeploystep.cpp +++ b/src/plugins/remotelinux/rsyncdeploystep.cpp @@ -109,7 +109,7 @@ void RsyncDeployService::doDeploy() void RsyncDeployService::createRemoteDirectories() { QStringList remoteDirs; - for (const FileToTransfer &file : qAsConst(m_files)) + for (const FileToTransfer &file : std::as_const(m_files)) remoteDirs << file.m_target.parentDir().path(); remoteDirs.sort(); remoteDirs.removeDuplicates(); diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp index ca9c0001a2a..9255c2e2287 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.cpp +++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp @@ -189,7 +189,7 @@ void TarPackageCreationStep::deployFinished(bool success) const Kit *kit = target()->kit(); // Store files that have been tar'd and successfully deployed - for (const DeployableFile &file : qAsConst(m_files)) + for (const DeployableFile &file : std::as_const(m_files)) m_deployTimes.saveDeploymentTimeStamp(file, kit, QDateTime()); } @@ -267,7 +267,7 @@ bool TarPackageCreationStep::doPackage() return false; } - for (const DeployableFile &d : qAsConst(m_files)) { + for (const DeployableFile &d : std::as_const(m_files)) { if (d.remoteDirectory().isEmpty()) { emit addOutput(Tr::tr("No remote path specified for file \"%1\", skipping.") .arg(d.localFilePath().toUserOutput()), OutputFormat::ErrorMessage); diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp index a937ce16740..04f55ec7d03 100644 --- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp +++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp @@ -432,7 +432,7 @@ QString ResourceFile::absolutePath(const QString &rel_path) const void ResourceFile::orderList() { - for (Prefix *p : qAsConst(m_prefix_list)) { + for (Prefix *p : std::as_const(m_prefix_list)) { std::sort(p->file_list.begin(), p->file_list.end(), [&](File *f1, File *f2) { return *f1 < *f2; }); diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp index 50686c094aa..ddfaa7d27a4 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.cpp +++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp @@ -234,7 +234,7 @@ void ResourceEditorPlugin::extensionsInitialized() }, {}, [](const FolderNode *fn) { return dynamic_cast<const ResourceTopLevelNode *>(fn) == nullptr; }); - for (FileNode *file : qAsConst(toReplace)) { + for (FileNode *file : std::as_const(toReplace)) { FolderNode *const pn = file->parentFolderNode(); QTC_ASSERT(pn, continue); const Utils::FilePath path = file->filePath(); diff --git a/src/plugins/scxmleditor/common/structure.cpp b/src/plugins/scxmleditor/common/structure.cpp index bf098c9ab30..5bfc51dfaf6 100644 --- a/src/plugins/scxmleditor/common/structure.cpp +++ b/src/plugins/scxmleditor/common/structure.cpp @@ -133,7 +133,7 @@ void Structure::addCheckbox(const QString &name, TagType type) void Structure::updateCheckBoxes() { QVector<TagType> visibleTags; - for (QCheckBox *box : qAsConst(m_checkboxes)) { + for (QCheckBox *box : std::as_const(m_checkboxes)) { if (box->isChecked()) { switch (TagType(box->property(Constants::C_SCXMLTAG_TAGTYPE).toInt())) { case State: diff --git a/src/plugins/scxmleditor/outputpane/warningmodel.cpp b/src/plugins/scxmleditor/outputpane/warningmodel.cpp index e88b0f234be..3339af067db 100644 --- a/src/plugins/scxmleditor/outputpane/warningmodel.cpp +++ b/src/plugins/scxmleditor/outputpane/warningmodel.cpp @@ -37,7 +37,7 @@ void WarningModel::clear(bool sendSignal) { emit modelAboutToBeClear(); - for (Warning *w : qAsConst(m_warnings)) + for (Warning *w : std::as_const(m_warnings)) w->disconnect(this); beginResetModel(); diff --git a/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp b/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp index 88dec58eaad..f00948cb21d 100644 --- a/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp @@ -270,7 +270,7 @@ void ConnectableItem::removeInputTransition(TransitionItem *transition) void ConnectableItem::updateInputTransitions() { - for (TransitionItem *transition : qAsConst(m_inputTransitions)) { + for (TransitionItem *transition : std::as_const(m_inputTransitions)) { transition->updateComponents(); transition->updateUIProperties(); } @@ -279,7 +279,7 @@ void ConnectableItem::updateInputTransitions() void ConnectableItem::updateOutputTransitions() { - for (TransitionItem *transition : qAsConst(m_outputTransitions)) { + for (TransitionItem *transition : std::as_const(m_outputTransitions)) { transition->updateComponents(); transition->updateUIProperties(); } @@ -303,10 +303,10 @@ void ConnectableItem::updateTransitions(bool allChildren) void ConnectableItem::updateTransitionAttributes(bool allChildren) { - for (TransitionItem *transition : qAsConst(m_outputTransitions)) + for (TransitionItem *transition : std::as_const(m_outputTransitions)) transition->updateTarget(); - for (TransitionItem *transition : qAsConst(m_inputTransitions)) + for (TransitionItem *transition : std::as_const(m_inputTransitions)) transition->updateTarget(); if (allChildren) { @@ -333,7 +333,7 @@ QPointF ConnectableItem::getInternalPosition(const TransitionItem *transition, T int ind = 0; if (type == TransitionItem::InternalNoTarget) { - for (TransitionItem *item : qAsConst(m_outputTransitions)) { + for (TransitionItem *item : std::as_const(m_outputTransitions)) { if (item->targetType() == TransitionItem::InternalSameTarget) ind++; } @@ -565,7 +565,7 @@ void ConnectableItem::updateAttributes() { BaseItem::updateAttributes(); - for (TransitionItem *transition : qAsConst(m_inputTransitions)) { + for (TransitionItem *transition : std::as_const(m_inputTransitions)) { if (transition->isEndItem(this)) transition->setTagValue("target", itemId()); } @@ -681,7 +681,7 @@ void ConnectableItem::finalizeCreation() bool ConnectableItem::hasInputTransitions(const ConnectableItem *parentItem, bool checkChildren) const { - for (const TransitionItem *it : qAsConst(m_inputTransitions)) + for (const TransitionItem *it : std::as_const(m_inputTransitions)) if (!SceneUtils::isChild(parentItem, it->connectedItem(this))) return true; @@ -701,7 +701,7 @@ bool ConnectableItem::hasInputTransitions(const ConnectableItem *parentItem, boo bool ConnectableItem::hasOutputTransitions(const ConnectableItem *parentItem, bool checkChildren) const { - for (TransitionItem *it : qAsConst(m_outputTransitions)) + for (TransitionItem *it : std::as_const(m_outputTransitions)) if (!SceneUtils::isChild(parentItem, it->connectedItem(this))) return true; @@ -754,7 +754,7 @@ void ConnectableItem::checkOverlapping() } // Add new overlapped items - for (ConnectableItem *it : qAsConst(overlappedItems)) { + for (ConnectableItem *it : std::as_const(overlappedItems)) { if (!m_overlappedItems.contains(it)) { m_overlappedItems << it; it->addOverlappingItem(this); diff --git a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp index 50edce3c12d..6a1f83a7f67 100644 --- a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp +++ b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp @@ -54,20 +54,20 @@ void GraphicsScene::unselectAll() void GraphicsScene::unhighlightAll() { - for (BaseItem *it : qAsConst(m_baseItems)) + for (BaseItem *it : std::as_const(m_baseItems)) it->setHighlight(false); } void GraphicsScene::highlightItems(const QVector<ScxmlTag*> &lstIds) { - for (BaseItem *it : qAsConst(m_baseItems)) + for (BaseItem *it : std::as_const(m_baseItems)) it->setHighlight(lstIds.contains(it->tag())); } QRectF GraphicsScene::selectedBoundingRect() const { QRectF r; - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->isSelected()) r = r.united(item->sceneBoundingRect()); } @@ -77,7 +77,7 @@ QRectF GraphicsScene::selectedBoundingRect() const qreal GraphicsScene::selectedMaxWidth() const { qreal maxw = 0; - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->isSelected() && item->type() >= InitialStateType) maxw = qMax(maxw, item->sceneBoundingRect().width()); } @@ -87,7 +87,7 @@ qreal GraphicsScene::selectedMaxWidth() const qreal GraphicsScene::selectedMaxHeight() const { qreal maxh = 0; - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->isSelected() && item->type() >= InitialStateType) maxh = qMax(maxh, item->sceneBoundingRect().height()); } @@ -103,37 +103,37 @@ void GraphicsScene::alignStates(int alignType) if (r.isValid()) { switch (alignType) { case ActionAlignLeft: - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->isSelected() && item->type() >= InitialStateType) item->moveStateBy(r.left() - item->sceneBoundingRect().left(), 0); } break; case ActionAlignRight: - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->isSelected() && item->type() >= InitialStateType) item->moveStateBy(r.right() - item->sceneBoundingRect().right(), 0); } break; case ActionAlignTop: - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->isSelected() && item->type() >= InitialStateType) item->moveStateBy(0, r.top() - item->sceneBoundingRect().top()); } break; case ActionAlignBottom: - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->isSelected() && item->type() >= InitialStateType) item->moveStateBy(0, r.bottom() - item->sceneBoundingRect().bottom()); } break; case ActionAlignHorizontal: - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->isSelected() && item->type() >= InitialStateType) item->moveStateBy(0, r.center().y() - item->sceneBoundingRect().center().y()); } break; case ActionAlignVertical: - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->isSelected() && item->type() >= InitialStateType) item->moveStateBy(r.center().x() - item->sceneBoundingRect().center().x(), 0); } @@ -154,7 +154,7 @@ void GraphicsScene::adjustStates(int adjustType) qreal maxw = selectedMaxWidth(); qreal maxh = selectedMaxHeight(); - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->isSelected() && item->type() >= InitialStateType) { QRectF rr = item->boundingRect(); if ((adjustType == ActionAdjustWidth || adjustType == ActionAdjustSize) && !qFuzzyCompare(rr.width(), maxw)) @@ -202,7 +202,7 @@ void GraphicsScene::copy() QVector<ScxmlTag*> tags; if (m_document->currentTag()->tagType() == Scxml) { QVector<BaseItem*> items; - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (!item->parentItem()) items << item; } @@ -220,7 +220,7 @@ void GraphicsScene::copy() mime->setText(QLatin1String(result)); mime->setData("StateChartEditor/StateData", result); QStringList strTypes; - for (const ScxmlTag *tag : qAsConst(tags)) + for (const ScxmlTag *tag : std::as_const(tags)) strTypes << tag->tagName(false); mime->setData("StateChartEditor/CopiedTagTypes", strTypes.join(",").toLocal8Bit()); @@ -246,7 +246,7 @@ void GraphicsScene::paste(const QPointF &targetPos) QPointF startPos(targetPos); BaseItem *targetItem = nullptr; - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->isSelected() && item->type() >= StateType) { targetItem = item; break; @@ -275,7 +275,7 @@ void GraphicsScene::paste(const QPointF &targetPos) void GraphicsScene::setEditorInfo(const QString &key, const QString &value) { - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->isSelected() && item->type() >= TransitionType) item->setEditorInfo(key, value); } @@ -350,7 +350,7 @@ void GraphicsScene::runLayoutToSelectedStates() m_document->undoStack()->beginMacro(Tr::tr("Re-layout")); QVector<BaseItem*> selectedItems; - for (BaseItem *node : qAsConst(m_baseItems)) { + for (BaseItem *node : std::as_const(m_baseItems)) { if (node->isSelected()) { int index = 0; for (int i = 0; i < selectedItems.count(); ++i) { @@ -370,19 +370,19 @@ void GraphicsScene::runLayoutToSelectedStates() // Layout scene items if necessary if (selectedItems.isEmpty()) { QList<QGraphicsItem*> sceneItems; - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->type() >= InitialStateType && !item->parentItem()) sceneItems << item; } SceneUtils::layout(sceneItems); - for (QGraphicsItem *item : qAsConst(sceneItems)) + for (QGraphicsItem *item : std::as_const(sceneItems)) if (item->type() >= StateType) static_cast<StateItem*>(item)->shrink(); } // Update properties - for (BaseItem *node : qAsConst(selectedItems)) + for (BaseItem *node : std::as_const(selectedItems)) node->updateUIProperties(); m_document->undoStack()->endMacro(); @@ -394,31 +394,31 @@ void GraphicsScene::runAutomaticLayout() // 1. Find max depth int maxDepth = 0; - for (BaseItem *node : qAsConst(m_baseItems)) { + for (BaseItem *node : std::as_const(m_baseItems)) { maxDepth = qMax(maxDepth, node->depth()); node->setBlockUpdates(true); } // 2. Layout every depth-level separately for (int d = (maxDepth + 1); d--;) { - for (BaseItem *node : qAsConst(m_baseItems)) + for (BaseItem *node : std::as_const(m_baseItems)) node->doLayout(d); } // 3. Layout scene items QList<QGraphicsItem*> sceneItems; - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->type() >= InitialStateType && !item->parentItem()) sceneItems << item; } SceneUtils::layout(sceneItems); - for (QGraphicsItem *item : qAsConst(sceneItems)) { + for (QGraphicsItem *item : std::as_const(sceneItems)) { if (item->type() >= StateType) static_cast<StateItem*>(item)->shrink(); } - for (BaseItem *node : qAsConst(m_baseItems)) { + for (BaseItem *node : std::as_const(m_baseItems)) { node->updateUIProperties(); node->setBlockUpdates(false); } @@ -445,21 +445,21 @@ void GraphicsScene::endTagChange(ScxmlDocument::TagChange change, ScxmlTag *tag, switch (change) { case ScxmlDocument::TagAttributesChanged: { - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->tag() == tag) item->updateAttributes(); } break; } case ScxmlDocument::TagEditorInfoChanged: { - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->tag() == tag) item->updateEditorInfo(); } break; } case ScxmlDocument::TagCurrentChanged: { - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (!item->isSelected() && item->tag() == tag) item->setSelected(true); } @@ -702,7 +702,7 @@ BaseItem *GraphicsScene::findItem(const ScxmlTag *tag) const if (!tag) return nullptr; - for (BaseItem *it : qAsConst(m_baseItems)) { + for (BaseItem *it : std::as_const(m_baseItems)) { if (it->tag() == tag) return it; } @@ -715,7 +715,7 @@ void GraphicsScene::removeItems(const ScxmlTag *tag) if (tag) { // Find right items QVector<BaseItem*> items; - for (BaseItem *it : qAsConst(m_baseItems)) { + for (BaseItem *it : std::as_const(m_baseItems)) { if (it->tag() == tag) items << it; } @@ -741,7 +741,7 @@ QPair<bool, bool> GraphicsScene::checkSnapToItem(BaseItem *item, const QPointF & qreal diffY = 8; qreal diffYdX = 2000; - for (BaseItem *it : qAsConst(m_baseItems)) { + for (BaseItem *it : std::as_const(m_baseItems)) { if (!it->isSelected() && it != item && it->parentItem() == parentItem && it->type() >= InitialStateType) { QPointF c = it->sceneCenter(); qreal dX = qAbs(c.x() - p.x()); @@ -779,7 +779,7 @@ void GraphicsScene::selectionChanged(bool para) int baseCount = 0; int stateTypeCount = 0; - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->isSelected()) { if (item->type() >= TransitionType) baseCount++; @@ -825,7 +825,7 @@ void GraphicsScene::removeWarningItem(WarningItem *item) void GraphicsScene::warningVisibilityChanged(int type, WarningItem *item) { if (!m_autoLayoutRunning && !m_initializing) { - for (WarningItem *it : qAsConst(m_allWarnings)) + for (WarningItem *it : std::as_const(m_allWarnings)) if (it != item && (type == 0 || it->type() == type)) it->check(); } @@ -834,7 +834,7 @@ void GraphicsScene::warningVisibilityChanged(int type, WarningItem *item) ScxmlTag *GraphicsScene::tagByWarning(const ScxmlEditor::OutputPane::Warning *w) const { ScxmlTag *tag = nullptr; - for (WarningItem *it : qAsConst(m_allWarnings)) + for (WarningItem *it : std::as_const(m_allWarnings)) if (it->warning() == w) { tag = it->tag(); break; @@ -896,7 +896,7 @@ void GraphicsScene::removeChild(BaseItem *item) void GraphicsScene::checkItemsVisibility(double scaleFactor) { - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { item->checkVisibility(scaleFactor); } } @@ -905,7 +905,7 @@ void GraphicsScene::checkInitialState() { if (m_document) { QList<QGraphicsItem*> sceneItems; - for (BaseItem *item : qAsConst(m_baseItems)) { + for (BaseItem *item : std::as_const(m_baseItems)) { if (item->type() >= InitialStateType && !item->parentItem()) sceneItems << item; } @@ -919,14 +919,14 @@ void GraphicsScene::checkInitialState() void GraphicsScene::clearAllTags() { - for (BaseItem *it : qAsConst(m_baseItems)) { + for (BaseItem *it : std::as_const(m_baseItems)) { it->setTag(nullptr); } } void GraphicsScene::setBlockUpdates(bool block) { - for (BaseItem *it : qAsConst(m_baseItems)) { + for (BaseItem *it : std::as_const(m_baseItems)) { it->setBlockUpdates(block); } } diff --git a/src/plugins/scxmleditor/plugin_interface/parallelitem.cpp b/src/plugins/scxmleditor/plugin_interface/parallelitem.cpp index 9ad154e730a..0c55a26ce24 100644 --- a/src/plugins/scxmleditor/plugin_interface/parallelitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/parallelitem.cpp @@ -51,16 +51,16 @@ void ParallelItem::doLayout(int d) } // 2. Adjust sizes - for (StateItem *itt : qAsConst(children)) + for (StateItem *itt : std::as_const(children)) itt->shrink(); qreal maxw = 0; - for (StateItem *itt : qAsConst(children)) { + for (StateItem *itt : std::as_const(children)) { QRectF rr = itt->boundingRect(); maxw = qMax(rr.width(), maxw); } - for (StateItem *itt : qAsConst(children)) { + for (StateItem *itt : std::as_const(children)) { QRectF rr = itt->boundingRect(); if (!qFuzzyCompare(rr.width(), maxw)) rr.setWidth(maxw); diff --git a/src/plugins/scxmleditor/plugin_interface/sceneutils.cpp b/src/plugins/scxmleditor/plugin_interface/sceneutils.cpp index 6441f8ffc2a..6facac57d07 100644 --- a/src/plugins/scxmleditor/plugin_interface/sceneutils.cpp +++ b/src/plugins/scxmleditor/plugin_interface/sceneutils.cpp @@ -295,7 +295,7 @@ void layout(const QList<QGraphicsItem*> &items) } // Finally set initial and final positions - for (ConnectableItem *item : qAsConst(childItems)) { + for (ConnectableItem *item : std::as_const(childItems)) { if (item == firstItem) initialItem->setPos(firstItem->pos() + firstItem->boundingRect().topLeft() - QPointF(50, 50)); diff --git a/src/plugins/scxmleditor/plugin_interface/sceneutils.h b/src/plugins/scxmleditor/plugin_interface/sceneutils.h index f6e58c3c47c..de1d3824206 100644 --- a/src/plugins/scxmleditor/plugin_interface/sceneutils.h +++ b/src/plugins/scxmleditor/plugin_interface/sceneutils.h @@ -54,7 +54,7 @@ bool hasSiblingStates(T *item) children << it; } - for (QGraphicsItem *it : qAsConst(children)) + for (QGraphicsItem *it : std::as_const(children)) if (it != item && it->type() == item->type()) return true; } diff --git a/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp b/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp index 1cfe0ba95ff..07bcf0b7050 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp @@ -112,7 +112,7 @@ void ScxmlDocument::addNamespace(ScxmlNamespace *ns) ScxmlTag *scxmlTag = scxmlRootTag(); if (scxmlTag) { - for (ScxmlNamespace *ns : qAsConst(m_namespaces)) { + for (ScxmlNamespace *ns : std::as_const(m_namespaces)) { QString prefix = ns->prefix(); if (prefix.isEmpty()) prefix = "xmlns"; @@ -149,7 +149,7 @@ bool ScxmlDocument::generateSCXML(QIODevice *io, ScxmlTag *tag) const ScxmlTag *ScxmlDocument::createScxmlTag() { auto tag = new ScxmlTag(Scxml, this); - for (ScxmlNamespace *ns : qAsConst(m_namespaces)) { + for (ScxmlNamespace *ns : std::as_const(m_namespaces)) { QString prefix = ns->prefix(); if (prefix.isEmpty()) prefix = "xmlns"; @@ -291,7 +291,7 @@ bool ScxmlDocument::pasteData(const QByteArray &data, const QPointF &minPos, con QBuffer buffer(&d); buffer.open(QIODevice::ReadOnly); QXmlStreamReader xml(&buffer); - for (ScxmlNamespace *ns : qAsConst(m_namespaces)) { + for (ScxmlNamespace *ns : std::as_const(m_namespaces)) { xml.addExtraNamespaceDeclaration(QXmlStreamNamespaceDeclaration(ns->prefix(), ns->name())); } @@ -576,7 +576,7 @@ QString ScxmlDocument::nextUniqueId(const QString &key) name = QString::fromLatin1("%1_%2").arg(key).arg(id); // Check duplicate - for (const ScxmlTag *tag : qAsConst(m_tags)) { + for (const ScxmlTag *tag : std::as_const(m_tags)) { if (tag->attribute("id") == name) { bFound = true; break; @@ -598,7 +598,7 @@ QString ScxmlDocument::getUniqueCopyId(const ScxmlTag *tag) while (true) { bFound = false; // Check duplicate - for (const ScxmlTag *t : qAsConst(m_tags)) { + for (const ScxmlTag *t : std::as_const(m_tags)) { if (t->attribute("id") == name && t != tag) { name = QString::fromLatin1("%1_Copy%2").arg(key).arg(counter); bFound = true; diff --git a/src/plugins/scxmleditor/plugin_interface/scxmltag.cpp b/src/plugins/scxmleditor/plugin_interface/scxmltag.cpp index e982f275c0d..283c07fa6d9 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmltag.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scxmltag.cpp @@ -251,7 +251,7 @@ bool ScxmlTag::hasData() const if (!m_attributeNames.isEmpty() || !m_content.isEmpty()) return true; - for (ScxmlTag *tag : qAsConst(m_childTags)) { + for (ScxmlTag *tag : std::as_const(m_childTags)) { if (tag->hasData()) return true; } @@ -261,7 +261,7 @@ bool ScxmlTag::hasData() const bool ScxmlTag::hasChild(TagType type) const { - for (ScxmlTag *tag : qAsConst(m_childTags)) { + for (ScxmlTag *tag : std::as_const(m_childTags)) { if (tag->tagType() == type) return true; } @@ -271,7 +271,7 @@ bool ScxmlTag::hasChild(TagType type) const bool ScxmlTag::hasChild(const QString &name) const { - for (ScxmlTag *tag : qAsConst(m_childTags)) { + for (ScxmlTag *tag : std::as_const(m_childTags)) { if (tag->tagName() == name) return true; } @@ -484,7 +484,7 @@ QVector<ScxmlTag*> ScxmlTag::allChildren() const QVector<ScxmlTag*> ScxmlTag::children(const QString &name) const { QVector<ScxmlTag*> children; - for (ScxmlTag *tag : qAsConst(m_childTags)) { + for (ScxmlTag *tag : std::as_const(m_childTags)) { if (tag->tagName() == name) children << tag; } @@ -494,7 +494,7 @@ QVector<ScxmlTag*> ScxmlTag::children(const QString &name) const ScxmlTag *ScxmlTag::child(const QString &name) const { - for (ScxmlTag *tag : qAsConst(m_childTags)) { + for (ScxmlTag *tag : std::as_const(m_childTags)) { if (tag->tagName() == name) return tag; } diff --git a/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp b/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp index cd2f44c2554..343352d11aa 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp @@ -36,7 +36,7 @@ bool checkPaste(const QString &copiedTagTypes, const ScxmlTag *currentTag) return false; QVector<TagType> childTags = allowedChildTypes(currentTag->tagType()); - for (const TagType &type : qAsConst(tagTypes)) { + for (const TagType &type : std::as_const(tagTypes)) { if (!childTags.contains(type)) return false; } diff --git a/src/plugins/scxmleditor/scxmleditorstack.cpp b/src/plugins/scxmleditor/scxmleditorstack.cpp index 58d88fe8123..f8f2eb00efd 100644 --- a/src/plugins/scxmleditor/scxmleditorstack.cpp +++ b/src/plugins/scxmleditor/scxmleditorstack.cpp @@ -67,7 +67,7 @@ void ScxmlEditorStack::modeAboutToChange(Utils::Id m) { // Sync the editor when entering edit mode if (m == Core::Constants::MODE_EDIT) { - for (auto editor: qAsConst(m_editors)) + for (auto editor: std::as_const(m_editors)) if (auto document = qobject_cast<ScxmlEditorDocument*>(editor->textDocument())) document->syncXmlFromDesignWidget(); } diff --git a/src/plugins/serialterminal/serialterminalsettings.cpp b/src/plugins/serialterminal/serialterminalsettings.cpp index d0d03bf8046..348b81fe072 100644 --- a/src/plugins/serialterminal/serialterminalsettings.cpp +++ b/src/plugins/serialterminal/serialterminalsettings.cpp @@ -132,7 +132,7 @@ void Settings::saveLineEndings(QSettings &settings) { settings.beginWriteArray(Constants::SETTINGS_LINE_ENDINGS, lineEndings.size()); int i = 0; - for (const QPair<QString, QByteArray>& value : qAsConst(lineEndings)) { + for (const QPair<QString, QByteArray>& value : std::as_const(lineEndings)) { settings.setArrayIndex(i++); settings.setValue(Constants::SETTINGS_LINE_ENDING_NAME, value.first); settings.setValue(Constants::SETTINGS_LINE_ENDING_VALUE, value.second); diff --git a/src/plugins/silversearcher/findinfilessilversearcher.cpp b/src/plugins/silversearcher/findinfilessilversearcher.cpp index 9e78b731095..c5a55575410 100644 --- a/src/plugins/silversearcher/findinfilessilversearcher.cpp +++ b/src/plugins/silversearcher/findinfilessilversearcher.cpp @@ -92,11 +92,11 @@ void runSilverSeacher(FutureInterfaceType &fi, FileFindParameters parameters) if (!(parameters.flags & FindRegularExpression)) arguments << "-Q"; - for (const QString &filter : qAsConst(parameters.exclusionFilters)) + for (const QString &filter : std::as_const(parameters.exclusionFilters)) arguments << "--ignore" << filter; QString nameFiltersAsRegex; - for (const QString &filter : qAsConst(parameters.nameFilters)) + for (const QString &filter : std::as_const(parameters.nameFilters)) nameFiltersAsRegex += QString("(%1)|").arg(convertWildcardToRegex(filter)); nameFiltersAsRegex.remove(nameFiltersAsRegex.length() - 1, 1); diff --git a/src/plugins/squish/objectsmapdocument.cpp b/src/plugins/squish/objectsmapdocument.cpp index 8c3b286121b..31958ba3003 100644 --- a/src/plugins/squish/objectsmapdocument.cpp +++ b/src/plugins/squish/objectsmapdocument.cpp @@ -122,7 +122,7 @@ bool ObjectsMapDocument::buildObjectsMapTree(const QByteArray &contents) ObjectsMapTreeItem *root = new ObjectsMapTreeItem(QString()); QMap<QString, ObjectsMapTreeItem *>::iterator end = itemForName.end(); - for (ObjectsMapTreeItem *item : qAsConst(itemForName)) { + for (ObjectsMapTreeItem *item : std::as_const(itemForName)) { const QString &parentName = item->parentName(); auto parent = itemForName.find(parentName); if (parent != end) diff --git a/src/plugins/squish/objectsmaptreeitem.cpp b/src/plugins/squish/objectsmaptreeitem.cpp index ac4442c1cc2..4338181be3b 100644 --- a/src/plugins/squish/objectsmaptreeitem.cpp +++ b/src/plugins/squish/objectsmaptreeitem.cpp @@ -90,7 +90,7 @@ QByteArray ObjectsMapTreeItem::propertiesToByteArray() const [](const Property &lhs, const Property &rhs) { return lhs.m_name < rhs.m_name; }); result.append('{'); - for (const Property &property : qAsConst(properties)) + for (const Property &property : std::as_const(properties)) result.append(property.toString().toUtf8()).append(' '); if (result.at(result.size() - 1) == ' ') result.chop(1); diff --git a/src/plugins/squish/squishsettings.cpp b/src/plugins/squish/squishsettings.cpp index fd063510e14..93f37e9d70c 100644 --- a/src/plugins/squish/squishsettings.cpp +++ b/src/plugins/squish/squishsettings.cpp @@ -415,7 +415,7 @@ void SquishServerSettingsWidget::repopulateApplicationView() SquishServerItem *autPaths = new SquishServerItem(Tr::tr("AUT Paths")); m_model.rootItem()->appendChild(autPaths); - for (const QString &path : qAsConst(m_serverSettings.autPaths)) + for (const QString &path : std::as_const(m_serverSettings.autPaths)) autPaths->appendChild(new SquishServerItem(path, "")); SquishServerItem *attachable = new SquishServerItem(Tr::tr("Attachable AUTs")); @@ -593,11 +593,11 @@ QList<QStringList> SquishServerSettingsWidget::toConfigChangeArguments() const result.append({"addAttachableAUT", it.key(), it.value()}); } - for (auto &path : qAsConst(m_originalSettings.autPaths)) { + for (auto &path : std::as_const(m_originalSettings.autPaths)) { if (!m_serverSettings.autPaths.contains(path)) result.append({"removeAppPath", path}); } - for (auto &path : qAsConst(m_serverSettings.autPaths)) { + for (auto &path : std::as_const(m_serverSettings.autPaths)) { if (!m_originalSettings.autPaths.contains(path)) result.append({"addAppPath", path}); } diff --git a/src/plugins/squish/squishtools.cpp b/src/plugins/squish/squishtools.cpp index b671606e3da..ca0a4ba600e 100644 --- a/src/plugins/squish/squishtools.cpp +++ b/src/plugins/squish/squishtools.cpp @@ -1157,7 +1157,7 @@ void SquishTools::minimizeQtCreatorWindows() void SquishTools::restoreQtCreatorWindows() { - for (QWindow *window : qAsConst(m_lastTopLevelWindows)) { + for (QWindow *window : std::as_const(m_lastTopLevelWindows)) { window->raise(); window->requestActivate(); window->showNormal(); diff --git a/src/plugins/squish/squishxmloutputhandler.cpp b/src/plugins/squish/squishxmloutputhandler.cpp index b628f205162..4c70f6e8761 100644 --- a/src/plugins/squish/squishxmloutputhandler.cpp +++ b/src/plugins/squish/squishxmloutputhandler.cpp @@ -282,7 +282,7 @@ void SquishXmlOutputHandler::outputAvailable(const QByteArray &output) } if (!logDetailsList.isEmpty()) { - for (const QString &detail : qAsConst(logDetailsList)) { + for (const QString &detail : std::as_const(logDetailsList)) { TestResult childResult(Result::Detail, detail); SquishResultItem *childItem = new SquishResultItem(childResult); item->appendChild(childItem); diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index da5f67e68cd..798a7781c96 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -1019,7 +1019,7 @@ QString SubversionPluginPrivate::monitorFile(const FilePath &repository) const { QTC_ASSERT(!repository.isEmpty(), return QString()); QDir repoDir(repository.toString()); - for (const QString &svnDir : qAsConst(m_svnDirectories)) { + for (const QString &svnDir : std::as_const(m_svnDirectories)) { if (repoDir.exists(svnDir)) { QFileInfo fi(repoDir.absoluteFilePath(svnDir + QLatin1String("/wc.db"))); if (fi.exists() && fi.isFile()) diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index a225479c69d..12c635a119e 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -397,7 +397,7 @@ void BaseFileFind::writeCommonSettings(QSettings *settings) settings->setValue("currentExclusionFilter", QDir::fromNativeSeparators(d->m_exclusionCombo->currentText())); - for (const SearchEngine *searchEngine : qAsConst(d->m_searchEngines)) + for (const SearchEngine *searchEngine : std::as_const(d->m_searchEngines)) searchEngine->writeSettings(settings); settings->setValue("currentSearchEngineIndex", d->m_currentSearchEngineIndex); } @@ -429,7 +429,7 @@ void BaseFileFind::readCommonSettings(QSettings *settings, const QString &defaul if (d->m_exclusionCombo) syncComboWithSettings(d->m_exclusionCombo, d->m_exclusionSetting); - for (SearchEngine* searchEngine : qAsConst(d->m_searchEngines)) + for (SearchEngine* searchEngine : std::as_const(d->m_searchEngines)) searchEngine->readSettings(settings); const int currentSearchEngineIndex = settings->value("currentSearchEngineIndex", 0).toInt(); syncSearchEngineCombo(currentSearchEngineIndex); diff --git a/src/plugins/texteditor/codeassist/genericproposalmodel.cpp b/src/plugins/texteditor/codeassist/genericproposalmodel.cpp index c5b6075e6ea..dcc2707212c 100644 --- a/src/plugins/texteditor/codeassist/genericproposalmodel.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalmodel.cpp @@ -283,7 +283,7 @@ void GenericProposalModel::filter(const QString &prefix) m_currentItems.clear(); const QString lowerPrefix = prefix.toLower(); const bool checkInfix = prefix.size() >= 3; - for (const auto &item : qAsConst(m_originalItems)) { + for (const auto &item : std::as_const(m_originalItems)) { const QString &text = item->filterText(); // Direct match? diff --git a/src/plugins/texteditor/codecchooser.cpp b/src/plugins/texteditor/codecchooser.cpp index e856515c41d..ae4ad07f554 100644 --- a/src/plugins/texteditor/codecchooser.cpp +++ b/src/plugins/texteditor/codecchooser.cpp @@ -28,7 +28,7 @@ CodecChooser::CodecChooser(Filter filter) std::find_if(mibs.begin(), mibs.end(), [](int n) { return n >=0; }); if (firstNonNegative != mibs.end()) std::rotate(mibs.begin(), firstNonNegative, mibs.end()); - for (int mib : qAsConst(mibs)) { + for (int mib : std::as_const(mibs)) { if (filter == Filter::SingleByte && !isSingleByte(mib)) continue; if (QTextCodec *codec = QTextCodec::codecForMib(mib)) { diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index bf1500d5eed..560c3435503 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -702,7 +702,7 @@ void FontSettingsPageWidget::refreshColorSchemeList() int selected = 0; - for (const FilePath &file : qAsConst(schemeList)) { + for (const FilePath &file : std::as_const(schemeList)) { if (m_value.colorSchemeFileName() == file) selected = colorSchemes.size(); colorSchemes.append(ColorSchemeEntry(file, true)); diff --git a/src/plugins/texteditor/formattexteditor.cpp b/src/plugins/texteditor/formattexteditor.cpp index 9594d0d4f33..d602ff3d652 100644 --- a/src/plugins/texteditor/formattexteditor.cpp +++ b/src/plugins/texteditor/formattexteditor.cpp @@ -240,7 +240,7 @@ static void updateEditorText(QPlainTextEdit *editor, const QString &text) + absoluteVerticalCursorOffset / fontHeight); // Restore folded blocks const QTextDocument *doc = editor->document(); - for (int blockId : qAsConst(foldedBlocks)) { + for (int blockId : std::as_const(foldedBlocks)) { const QTextBlock block = doc->findBlockByNumber(qMax(0, blockId)); if (block.isValid()) TextDocumentLayout::doFoldOrUnfold(block, false); diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp index 2c0c6a021de..dabf77e8b4c 100644 --- a/src/plugins/texteditor/outlinefactory.cpp +++ b/src/plugins/texteditor/outlinefactory.cpp @@ -166,7 +166,7 @@ void OutlineWidgetStack::updateEditor(Core::IEditor *editor) IOutlineWidget *newWidget = nullptr; if (editor) { - for (IOutlineWidgetFactory *widgetFactory : qAsConst(g_outlineWidgetFactories)) { + for (IOutlineWidgetFactory *widgetFactory : std::as_const(g_outlineWidgetFactories)) { if (widgetFactory->supportsEditor(editor)) { newWidget = widgetFactory->createWidget(editor); m_toggleSort->setVisible(widgetFactory->supportsSorting()); diff --git a/src/plugins/texteditor/refactoroverlay.cpp b/src/plugins/texteditor/refactoroverlay.cpp index a718d23be80..6626dbbcbf8 100644 --- a/src/plugins/texteditor/refactoroverlay.cpp +++ b/src/plugins/texteditor/refactoroverlay.cpp @@ -25,7 +25,7 @@ RefactorOverlay::RefactorOverlay(TextEditor::TextEditorWidget *editor) : void RefactorOverlay::paint(QPainter *painter, const QRect &clip) { m_maxWidth = 0; - for (auto &marker : qAsConst(m_markers)) { + for (auto &marker : std::as_const(m_markers)) { paintMarker(marker, painter, clip); } diff --git a/src/plugins/texteditor/snippets/snippetprovider.cpp b/src/plugins/texteditor/snippets/snippetprovider.cpp index 5dee0301c58..506276327a1 100644 --- a/src/plugins/texteditor/snippets/snippetprovider.cpp +++ b/src/plugins/texteditor/snippets/snippetprovider.cpp @@ -79,7 +79,7 @@ QString SnippetProvider::displayName() const */ void SnippetProvider::decorateEditor(TextEditorWidget *editor, const QString &groupId) { - for (const SnippetProvider &provider : qAsConst(g_snippetProviders)) { + for (const SnippetProvider &provider : std::as_const(g_snippetProviders)) { if (provider.m_groupId == groupId && provider.m_editorDecorator) provider.m_editorDecorator(editor); } diff --git a/src/plugins/texteditor/snippets/snippetscollection.cpp b/src/plugins/texteditor/snippets/snippetscollection.cpp index 12a3543193e..b6a45200dd6 100644 --- a/src/plugins/texteditor/snippets/snippetscollection.cpp +++ b/src/plugins/texteditor/snippets/snippetscollection.cpp @@ -229,7 +229,7 @@ void SnippetsCollection::restoreRemovedSnippets(const QString &groupId) const QVector<Snippet> toRestore = m_snippets[group].mid(m_activeSnippetsCount[group]); m_snippets[group].resize(m_activeSnippetsCount[group]); - for (Snippet snippet : qAsConst(toRestore)) { + for (Snippet snippet : std::as_const(toRestore)) { snippet.setIsRemoved(false); insertSnippet(snippet); } @@ -275,7 +275,7 @@ void SnippetsCollection::reload() insertSnippet(snippet); } - for (const Snippet &snippet : qAsConst(activeBuiltInSnippets)) + for (const Snippet &snippet : std::as_const(activeBuiltInSnippets)) insertSnippet(snippet); } diff --git a/src/plugins/texteditor/syntaxhighlighter.cpp b/src/plugins/texteditor/syntaxhighlighter.cpp index 5d98292f563..a54fcafbfdf 100644 --- a/src/plugins/texteditor/syntaxhighlighter.cpp +++ b/src/plugins/texteditor/syntaxhighlighter.cpp @@ -819,7 +819,7 @@ void SyntaxHighlighterPrivate::updateFormats(const FontSettings &fontSettings) this->fontSettings = fontSettings; // C_TEXT is handled by text editor's foreground and background color, // so use empty format for that - for (const auto &pair : qAsConst(formatCategories)) { + for (const auto &pair : std::as_const(formatCategories)) { formats[pair.first] = pair.second == C_TEXT ? QTextCharFormat() : fontSettings.toTextCharFormat(pair.second); } diff --git a/src/plugins/texteditor/tabsettings.cpp b/src/plugins/texteditor/tabsettings.cpp index 66c9f46f17d..1fddbc79919 100644 --- a/src/plugins/texteditor/tabsettings.cpp +++ b/src/plugins/texteditor/tabsettings.cpp @@ -251,7 +251,7 @@ bool TabSettings::guessSpacesForTabs(const QTextBlock &_block) const if (currentBlocks.at(1).isValid()) currentBlocks[1] = currentBlocks.at(1).next(); bool done = true; - for (const QTextBlock &block : qAsConst(currentBlocks)) { + for (const QTextBlock &block : std::as_const(currentBlocks)) { if (block.isValid()) done = false; if (!block.isValid() || block.length() == 0) diff --git a/src/plugins/texteditor/textdocument.cpp b/src/plugins/texteditor/textdocument.cpp index 6b221c310fa..ed7662cb66b 100644 --- a/src/plugins/texteditor/textdocument.cpp +++ b/src/plugins/texteditor/textdocument.cpp @@ -918,7 +918,7 @@ void TextDocument::cleanWhitespace(QTextCursor &cursor, bool inEntireDocument, const IndentationForBlock &indentations = d->m_indenter->indentationForBlocks(blocks, currentTabSettings); - for (QTextBlock block : qAsConst(blocks)) { + for (QTextBlock block : std::as_const(blocks)) { QString blockText = block.text(); if (removeTrailingWhitespace) diff --git a/src/plugins/texteditor/textdocumentlayout.cpp b/src/plugins/texteditor/textdocumentlayout.cpp index 037ec735c18..998ec1a3f6e 100644 --- a/src/plugins/texteditor/textdocumentlayout.cpp +++ b/src/plugins/texteditor/textdocumentlayout.cpp @@ -14,7 +14,7 @@ CodeFormatterData::~CodeFormatterData() = default; TextBlockUserData::~TextBlockUserData() { - for (TextMark *mrk : qAsConst(m_marks)) { + for (TextMark *mrk : std::as_const(m_marks)) { mrk->baseTextDocument()->removeMarkFromMarksCache(mrk); mrk->setBaseTextDocument(nullptr); mrk->removedFromEditor(); @@ -577,7 +577,7 @@ TextMarks TextDocumentLayout::documentClosing() void TextDocumentLayout::documentReloaded(TextMarks marks, TextDocument *baseTextDocument) { - for (TextMark *mark : qAsConst(marks)) { + for (TextMark *mark : std::as_const(marks)) { int blockNumber = mark->lineNumber() - 1; QTextBlock block = document()->findBlockByNumber(blockNumber); if (block.isValid()) { diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index aa542763e39..7c4a47870c0 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -1081,7 +1081,7 @@ void TextEditorWidgetPrivate::showTextMarksToolTip(const QPoint &pos, return mark1->priority() > mark2->priority(); }); - for (const TextMark *mark : qAsConst(allMarks)) { + for (const TextMark *mark : std::as_const(allMarks)) { if (mark != mainTextMark) mark->addToToolTipLayout(layout); } @@ -1549,7 +1549,7 @@ void TextEditorWidgetPrivate::updateAutoCompleteHighlight() const QTextCharFormat matchFormat = m_document->fontSettings().toTextCharFormat(C_AUTOCOMPLETE); QList<QTextEdit::ExtraSelection> extraSelections; - for (const QTextCursor &cursor : qAsConst(m_autoCompleteHighlightPos)) { + for (const QTextCursor &cursor : std::as_const(m_autoCompleteHighlightPos)) { QTextEdit::ExtraSelection sel; sel.cursor = cursor; sel.format.setBackground(matchFormat.background()); @@ -2873,7 +2873,7 @@ void TextEditorWidget::insertCodeSnippet(const QTextCursor &cursor_arg, d->m_snippetOverlay->accept(); QList<PositionedPart> positionedParts; - for (const ParsedSnippet::Part &part : qAsConst(data.parts)) { + for (const ParsedSnippet::Part &part : std::as_const(data.parts)) { if (part.variableIndex >= 0) { PositionedPart posPart(part); posPart.start = cursor.position(); @@ -3202,7 +3202,7 @@ void TextEditorWidget::restoreState(const QByteArray &state) stream >> collapsedBlocks; QTextDocument *doc = document(); bool layoutChanged = false; - for (const int blockNumber : qAsConst(collapsedBlocks)) { + for (const int blockNumber : std::as_const(collapsedBlocks)) { QTextBlock block = doc->findBlockByNumber(qMax(0, blockNumber)); if (block.isValid()) { TextDocumentLayout::doFoldOrUnfold(block, false); @@ -4070,7 +4070,7 @@ void TextEditorWidgetPrivate::updateLineAnnotation(const PaintEventData &data, } } - for (const TextMark *mark : qAsConst(marks)) { + for (const TextMark *mark : std::as_const(marks)) { boundingRect = QRectF(x, boundingRect.top(), q->viewport()->width() - x, boundingRect.height()); if (boundingRect.isEmpty()) break; @@ -5035,7 +5035,7 @@ void TextEditorWidgetPrivate::paintTextMarks(QPainter &painter, const ExtraAreaP return; } size = size / 2; - for (const QIcon &icon : qAsConst(icons)) { + for (const QIcon &icon : std::as_const(icons)) { const QRect r(xoffset, yoffset, size, size); icon.paint(&painter, r, Qt::AlignCenter); if (xoffset != 0) { @@ -7160,7 +7160,7 @@ QList<QTextEdit::ExtraSelection> TextEditorWidget::extraSelections(Id kind) cons QString TextEditorWidget::extraSelectionTooltip(int pos) const { - for (const QList<QTextEdit::ExtraSelection> &sel : qAsConst(d->m_extraSelections)) { + for (const QList<QTextEdit::ExtraSelection> &sel : std::as_const(d->m_extraSelections)) { for (const QTextEdit::ExtraSelection &s : sel) { if (s.cursor.selectionStart() <= pos && s.cursor.selectionEnd() >= pos @@ -7279,7 +7279,7 @@ void TextEditorWidget::rewrapParagraph() // keep the same indentation level as first line in paragraph. QString currentWord; - for (const QChar &ch : qAsConst(selectedText)) { + for (const QChar &ch : std::as_const(selectedText)) { if (ch.isSpace() && ch != QChar::Nbsp) { if (!currentWord.isEmpty()) { currentLength += currentWord.length() + 1; diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index 348b421be83..3f658f7bde1 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -445,7 +445,7 @@ void TextEditorActionHandlerPrivate::createActions() void TextEditorActionHandlerPrivate::updateActions() { bool isWritable = m_currentEditorWidget && !m_currentEditorWidget->isReadOnly(); - for (QAction *a : qAsConst(m_modifyingActions)) + for (QAction *a : std::as_const(m_modifyingActions)) a->setEnabled(isWritable); m_unCommentSelectionAction->setEnabled((m_optionalActions & TextEditorActionHandler::UnCommentSelection) && isWritable); m_visualizeWhitespaceAction->setEnabled(m_currentEditorWidget); diff --git a/src/plugins/texteditor/textmark.cpp b/src/plugins/texteditor/textmark.cpp index d74aa177593..4eadb4b4c63 100644 --- a/src/plugins/texteditor/textmark.cpp +++ b/src/plugins/texteditor/textmark.cpp @@ -292,7 +292,7 @@ void TextMark::addToToolTipLayout(QGridLayout *target) const QMargins margins = actionsLayout->contentsMargins(); margins.setLeft(margins.left() + 5); actionsLayout->setContentsMargins(margins); - for (QAction *action : qAsConst(actions)) { + for (QAction *action : std::as_const(actions)) { QTC_ASSERT(!action->icon().isNull(), delete action; continue); auto button = new QToolButton; button->setIcon(action->icon()); @@ -481,7 +481,7 @@ void TextMarkRegistry::documentRenamed(IDocument *document, m_marks[oldPath].subtract(toBeMoved); m_marks[newPath].unite(toBeMoved); - for (TextMark *mark : qAsConst(toBeMoved)) + for (TextMark *mark : std::as_const(toBeMoved)) mark->updateFileName(newPath); } diff --git a/src/plugins/todo/optionsdialog.cpp b/src/plugins/todo/optionsdialog.cpp index 65c2e3d83c3..522b052e648 100644 --- a/src/plugins/todo/optionsdialog.cpp +++ b/src/plugins/todo/optionsdialog.cpp @@ -198,7 +198,7 @@ void OptionsDialog::setSettings(const Settings &settings) m_scanInSubprojectRadioButton->setChecked(settings.scanningScope == ScanningScopeSubProject); m_keywordsList->clear(); - for (const Keyword &keyword : qAsConst(settings.keywords)) + for (const Keyword &keyword : std::as_const(settings.keywords)) addToKeywordsList(keyword); } diff --git a/src/plugins/todo/todooutputpane.cpp b/src/plugins/todo/todooutputpane.cpp index e20c68f5097..a3e6bed1702 100644 --- a/src/plugins/todo/todooutputpane.cpp +++ b/src/plugins/todo/todooutputpane.cpp @@ -168,7 +168,7 @@ void TodoOutputPane::updateTodoCount() void TodoOutputPane::updateKeywordFilter() { QStringList keywords; - for (const QToolButton *btn: qAsConst(m_filterButtons)) { + for (const QToolButton *btn: std::as_const(m_filterButtons)) { if (btn->isChecked()) keywords.append(btn->property(Constants::FILTER_KEYWORD_NAME).toString()); } @@ -185,7 +185,7 @@ void TodoOutputPane::updateKeywordFilter() void TodoOutputPane::clearKeywordFilter() { - for (QToolButton *btn: qAsConst(m_filterButtons)) + for (QToolButton *btn: std::as_const(m_filterButtons)) btn->setChecked(false); updateKeywordFilter(); diff --git a/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp b/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp index 61c09e7ca64..9b3b1759875 100644 --- a/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp +++ b/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp @@ -28,7 +28,7 @@ QVector<const Function *> CycleDetection::run(const QVector<const Function *> &i node->lowlink = -1; m_nodes.insert(function, node); } - for (Node *node : qAsConst(m_nodes)) { + for (Node *node : std::as_const(m_nodes)) { if (node->dfs == -1) tarjan(node); } diff --git a/src/plugins/valgrind/callgrind/callgrindfunction.cpp b/src/plugins/valgrind/callgrind/callgrindfunction.cpp index d6c18c21262..7cbad7d8a80 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunction.cpp +++ b/src/plugins/valgrind/callgrind/callgrindfunction.cpp @@ -153,7 +153,7 @@ void Function::setObject(qint64 id) QString Function::location() const { QString pos; - for (const CostItem *costItem : qAsConst(d->m_costItems)) { + for (const CostItem *costItem : std::as_const(d->m_costItems)) { if (costItem->differingFileId() != -1) { QTextStream stream(&pos); stream << '('; @@ -192,7 +192,7 @@ int Function::lineNumber() const if (lineIdx == -1) return -1; - for (const CostItem *costItem : qAsConst(d->m_costItems)) { + for (const CostItem *costItem : std::as_const(d->m_costItems)) { if (costItem->differingFileId() == -1) return costItem->position(lineIdx); } @@ -265,7 +265,7 @@ void Function::addCostItem(const CostItem *item) void Function::finalize() { bool recursive = false; - for (const FunctionCall *call : qAsConst(d->m_incomingCalls)) { + for (const FunctionCall *call : std::as_const(d->m_incomingCalls)) { if (call->caller() == this) { recursive = true; break; @@ -278,7 +278,7 @@ void Function::finalize() // e.g.: A -> B -> B ..., C -> B -> B ... // cost of B = cost of call to B in A + cost of call to B in C + ... d->m_inclusiveCost.fill(0); - for (const FunctionCall *call : qAsConst(d->m_incomingCalls)) { + for (const FunctionCall *call : std::as_const(d->m_incomingCalls)) { if (call->caller() != this) { const QVector<const CostItem *> costItems = call->caller()->costItems(); for (const CostItem *costItem : costItems) { diff --git a/src/plugins/valgrind/callgrind/callgrindparsedata.cpp b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp index b9d432e4fe7..b7a779b57fa 100644 --- a/src/plugins/valgrind/callgrind/callgrindparsedata.cpp +++ b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp @@ -69,7 +69,7 @@ ParseData::Private::~Private() void ParseData::Private::cleanupFunctionCycles() { m_cycleCacheValid = false; - for (const Function *func : qAsConst(m_cycleCache)) { + for (const Function *func : std::as_const(m_cycleCache)) { if (dynamic_cast<const FunctionCycle *>(func)) delete func; } diff --git a/src/plugins/valgrind/callgrind/callgrindparser.cpp b/src/plugins/valgrind/callgrind/callgrindparser.cpp index e012168001f..07a8d4f2bb1 100644 --- a/src/plugins/valgrind/callgrind/callgrindparser.cpp +++ b/src/plugins/valgrind/callgrind/callgrindparser.cpp @@ -204,7 +204,7 @@ void Parser::Private::parse(const FilePath &filePath) // functions that need to accumulate their calees QSet<Function *> pendingFunctions; - for (const CallData &callData : qAsConst(pendingCallees)) { + for (const CallData &callData : std::as_const(pendingCallees)) { Function *calledFunction = nullptr; QTC_ASSERT(callData.call, continue); QTC_ASSERT(callData.call->caller(), continue); @@ -243,7 +243,7 @@ void Parser::Private::parse(const FilePath &filePath) // lookup done // now accumulate callees - for (Function *func : qAsConst(pendingFunctions)) + for (Function *func : std::as_const(pendingFunctions)) func->finalize(); emit q->parserDataReady(); diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index e8cd33eb335..4609510fe2b 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -827,7 +827,7 @@ void CallgrindToolPrivate::editorOpened(IEditor *editor) void CallgrindToolPrivate::requestContextMenu(TextEditorWidget *widget, int line, QMenu *menu) { // Find callgrind text mark that corresponds to this editor's file and line number - for (CallgrindTextMark *textMark : qAsConst(m_textMarks)) { + for (CallgrindTextMark *textMark : std::as_const(m_textMarks)) { if (textMark->fileName() == widget->textDocument()->filePath() && textMark->lineNumber() == line) { const Function *func = textMark->function(); QAction *action = menu->addAction(Tr::tr("Select This Function in the Analyzer Output")); diff --git a/src/plugins/valgrind/callgrindvisualisation.cpp b/src/plugins/valgrind/callgrindvisualisation.cpp index 60fdc3ef130..c06664d3ab4 100644 --- a/src/plugins/valgrind/callgrindvisualisation.cpp +++ b/src/plugins/valgrind/callgrindvisualisation.cpp @@ -383,7 +383,7 @@ void Visualization::populateScene() // add the canvas elements to the scene qreal used = sceneHeight * 0.1; - for (const Pair &cost : qAsConst(costs)) { + for (const Pair &cost : std::as_const(costs)) { const QModelIndex &index = cost.first; const QString text = index.data().toString(); diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index a8c62b3e41f..b9789260e8d 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -359,7 +359,7 @@ bool MemcheckErrorFilterProxyModel::filterAcceptsRow(int sourceRow, const QModel bool inProject = false; for (int i = 0; i < framesToLookAt; ++i) { const Frame &frame = frames.at(i); - for (const QString &folder : qAsConst(validFolders)) { + for (const QString &folder : std::as_const(validFolders)) { if (frame.directory().startsWith(folder)) { inProject = true; break; @@ -609,7 +609,7 @@ MemcheckToolPrivate::MemcheckToolPrivate() filterButton->setProperty("noArrow", true); m_filterMenu = new QMenu(filterButton); - for (QAction *filterAction : qAsConst(m_errorFilterActions)) + for (QAction *filterAction : std::as_const(m_errorFilterActions)) m_filterMenu->addAction(filterAction); m_filterMenu->addSeparator(); m_filterMenu->addAction(m_filterProjectAction); @@ -908,7 +908,7 @@ void MemcheckToolPrivate::settingsDestroyed(QObject *settings) void MemcheckToolPrivate::updateFromSettings() { - for (QAction *action : qAsConst(m_errorFilterActions)) { + for (QAction *action : std::as_const(m_errorFilterActions)) { bool contained = true; const QList<QVariant> actions = action->data().toList(); for (const QVariant &v : actions) { @@ -1094,7 +1094,7 @@ void MemcheckToolPrivate::updateErrorFilter() m_settings->filterExternalIssues.setValue(!m_filterProjectAction->isChecked()); QList<int> errorKinds; - for (QAction *a : qAsConst(m_errorFilterActions)) { + for (QAction *a : std::as_const(m_errorFilterActions)) { if (!a->isChecked()) continue; const QList<QVariant> actions = a->data().toList(); @@ -1204,7 +1204,7 @@ HeobDialog::HeobDialog(QWidget *parent) : auto profilesLayout = new QHBoxLayout; m_profilesCombo = new QComboBox; - for (const auto &profile : qAsConst(m_profiles)) + for (const auto &profile : std::as_const(m_profiles)) m_profilesCombo->addItem(settings->value(profile + "/" + heobProfileNameC).toString()); if (hasSelProfile) { int selIdx = m_profiles.indexOf(selProfile); diff --git a/src/plugins/valgrind/suppressiondialog.cpp b/src/plugins/valgrind/suppressiondialog.cpp index 6330f665130..0d90ee58d86 100644 --- a/src/plugins/valgrind/suppressiondialog.cpp +++ b/src/plugins/valgrind/suppressiondialog.cpp @@ -130,7 +130,7 @@ SuppressionDialog::SuppressionDialog(MemcheckErrorView *view, const QList<Error> m_fileChooser->setPromptDialogTitle(Tr::tr("Select Suppression File")); QString suppressions; - for (const Error &error : qAsConst(m_errors)) + for (const Error &error : std::as_const(m_errors)) suppressions += suppressionText(error); m_suppressionEdit->setPlainText(suppressions); @@ -153,7 +153,7 @@ void SuppressionDialog::maybeShow(MemcheckErrorView *view) indices.append(view->selectionModel()->currentIndex()); QList<XmlProtocol::Error> errors; - for (const QModelIndex &index : qAsConst(indices)) { + for (const QModelIndex &index : std::as_const(indices)) { Error error = view->model()->data(index, ErrorListModel::ErrorRole).value<Error>(); if (!error.suppression().isNull()) errors.append(error); @@ -198,7 +198,7 @@ void SuppressionDialog::accept() return l.row() > r.row(); }); QAbstractItemModel *model = m_view->model(); - for (const QModelIndex &index : qAsConst(indices)) { + for (const QModelIndex &index : std::as_const(indices)) { bool removed = model->removeRow(index.row()); QTC_ASSERT(removed, qt_noop()); Q_UNUSED(removed) @@ -209,7 +209,7 @@ void SuppressionDialog::accept() const Error rowError = model->data( model->index(row, 0), ErrorListModel::ErrorRole).value<Error>(); - for (const Error &error : qAsConst(m_errors)) { + for (const Error &error : std::as_const(m_errors)) { if (equalSuppression(rowError, error)) { bool removed = model->removeRow(row); QTC_CHECK(removed); diff --git a/src/plugins/valgrind/valgrindsettings.cpp b/src/plugins/valgrind/valgrindsettings.cpp index be03ab07dba..106a5df7722 100644 --- a/src/plugins/valgrind/valgrindsettings.cpp +++ b/src/plugins/valgrind/valgrindsettings.cpp @@ -91,7 +91,7 @@ void SuppressionAspectPrivate::slotRemoveSuppression() Utils::sort(rows, std::greater<int>()); - for (int row : qAsConst(rows)) + for (int row : std::as_const(rows)) m_model.removeRow(row); if (!isGlobal) diff --git a/src/plugins/valgrind/xmlprotocol/error.cpp b/src/plugins/valgrind/xmlprotocol/error.cpp index 8691d7edec8..4a6e65132fe 100644 --- a/src/plugins/valgrind/xmlprotocol/error.cpp +++ b/src/plugins/valgrind/xmlprotocol/error.cpp @@ -182,7 +182,7 @@ QString Error::toXml() const stream << " <what>" << d->what << "</what>\n"; } - for (const Stack &stack : qAsConst(d->stacks)) { + for (const Stack &stack : std::as_const(d->stacks)) { if (!stack.auxWhat().isEmpty()) stream << " <auxwhat>" << stack.auxWhat() << "</auxwhat>\n"; stream << " <stack>\n"; diff --git a/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp b/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp index 5a9af364f9e..81c70206cf6 100644 --- a/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp +++ b/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp @@ -38,7 +38,7 @@ QString toolTipForFrame(const Frame &frame) "<style>dt { font-weight:bold; } dd { font-family: monospace; }</style>\n" "</head><body><dl>"; - for (const StringPair &pair : qAsConst(lines)) { + for (const StringPair &pair : std::as_const(lines)) { html += "<dt>"; html += pair.first; html += "</dt><dd>"; diff --git a/src/plugins/valgrind/xmlprotocol/suppression.cpp b/src/plugins/valgrind/xmlprotocol/suppression.cpp index d8e3903663b..7e3426d4292 100644 --- a/src/plugins/valgrind/xmlprotocol/suppression.cpp +++ b/src/plugins/valgrind/xmlprotocol/suppression.cpp @@ -185,7 +185,7 @@ QString Suppression::toString() const stream << "{\n"; stream << indent << d->name << '\n'; stream << indent << d->kind << '\n'; - for (const SuppressionFrame &frame : qAsConst(d->frames)) + for (const SuppressionFrame &frame : std::as_const(d->frames)) stream << indent << frame.toString() << '\n'; stream << "}\n"; return ret; diff --git a/src/plugins/vcsbase/submiteditorwidget.cpp b/src/plugins/vcsbase/submiteditorwidget.cpp index 6c0e2498a65..4d01d1f549f 100644 --- a/src/plugins/vcsbase/submiteditorwidget.cpp +++ b/src/plugins/vcsbase/submiteditorwidget.cpp @@ -621,7 +621,7 @@ void SubmitEditorWidget::descriptionTextChanged() wrapDescription(); trimDescription(); // append field entries - for (const SubmitFieldWidget *fw : qAsConst(d->m_fieldWidgets)) + for (const SubmitFieldWidget *fw : std::as_const(d->m_fieldWidgets)) d->m_description += fw->fieldValues(); updateSubmitAction(); } @@ -713,7 +713,7 @@ void SubmitEditorWidget::editorCustomContextMenuRequested(const QPoint &pos) QScopedPointer<QMenu> menu(d->description->createStandardContextMenu()); // Extend for (const SubmitEditorWidgetPrivate::AdditionalContextMenuAction &a : - qAsConst(d->descriptionEditContextMenuActions)) { + std::as_const(d->descriptionEditContextMenuActions)) { if (a.second) { if (a.first >= 0) menu->insertAction(menu->actions().at(a.first), a.second); diff --git a/src/plugins/vcsbase/submitfieldwidget.cpp b/src/plugins/vcsbase/submitfieldwidget.cpp index 102ca674351..4c90e6156de 100644 --- a/src/plugins/vcsbase/submitfieldwidget.cpp +++ b/src/plugins/vcsbase/submitfieldwidget.cpp @@ -185,7 +185,7 @@ void SubmitFieldWidget::setHasBrowseButton(bool on) if (d->hasBrowseButton == on) return; d->hasBrowseButton = on; - for (const FieldEntry &fe : qAsConst(d->fieldEntries)) + for (const FieldEntry &fe : std::as_const(d->fieldEntries)) fe.browseButton->setVisible(on); } @@ -209,7 +209,7 @@ void SubmitFieldWidget::setCompleter(QCompleter *c) if (c == d->completer) return; d->completer = c; - for (const FieldEntry &fe : qAsConst(d->fieldEntries)) + for (const FieldEntry &fe : std::as_const(d->fieldEntries)) fe.lineEdit->setCompleter(c); } @@ -229,7 +229,7 @@ QString SubmitFieldWidget::fieldValues() const const QChar newLine = QLatin1Char('\n'); // Format as "RevBy: value\nSigned-Off: value\n" QString rc; - for (const FieldEntry &fe : qAsConst(d->fieldEntries)) { + for (const FieldEntry &fe : std::as_const(d->fieldEntries)) { const QString value = fe.lineEdit->text().trimmed(); if (!value.isEmpty()) { rc += fe.combo->currentText(); diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index 59936e8d560..0ba1497cf1e 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -572,7 +572,7 @@ void VcsBaseClient::statusParser(const QString &text) QStringList rawStatusList = text.split(QLatin1Char('\n')); - for (const QString &string : qAsConst(rawStatusList)) { + for (const QString &string : std::as_const(rawStatusList)) { const VcsBaseClient::StatusItem lineInfo = parseStatusLine(string); if (!lineInfo.flags.isEmpty() && !lineInfo.file.isEmpty()) lineInfoList.append(lineInfo); diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index f6ecadc253b..82bdf893622 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -560,7 +560,7 @@ VcsBaseEditorWidgetPrivate::VcsBaseEditorWidgetPrivate(VcsBaseEditorWidget *edit AbstractTextCursorHandler *VcsBaseEditorWidgetPrivate::findTextCursorHandler(const QTextCursor &cursor) { - for (AbstractTextCursorHandler *handler : qAsConst(m_textCursorHandlers)) { + for (AbstractTextCursorHandler *handler : std::as_const(m_textCursorHandlers)) { if (handler->findContentsUnderCursor(cursor)) return handler; } diff --git a/src/plugins/vcsbase/wizard/vcscommandpage.cpp b/src/plugins/vcsbase/wizard/vcscommandpage.cpp index 476d2ab0b5d..d0290af8e82 100644 --- a/src/plugins/vcsbase/wizard/vcscommandpage.cpp +++ b/src/plugins/vcsbase/wizard/vcscommandpage.cpp @@ -310,7 +310,7 @@ void VcsCommandPage::delayedInitialize() m_startedStatus = runMessage; QStringList extraArgs; - for (const QString &in : qAsConst(m_arguments)) { + for (const QString &in : std::as_const(m_arguments)) { const QString tmp = wiz->expander()->expand(in); if (tmp.isEmpty()) continue; @@ -322,7 +322,7 @@ void VcsCommandPage::delayedInitialize() VcsCommand *command = vc->createInitialCheckoutCommand(repo, FilePath::fromString(base), name, extraArgs); - for (const JobData &job : qAsConst(m_additionalJobs)) { + for (const JobData &job : std::as_const(m_additionalJobs)) { QTC_ASSERT(!job.job.isEmpty(), continue); if (!JsonWizard::boolFromVariant(job.condition, wiz->expander())) diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 343853a01ae..bb2a820136b 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -465,7 +465,7 @@ void WelcomeMode::addPage(IWelcomePage *page) auto onClicked = [this, pageId, stackPage] { m_activePage = pageId; m_pageStack->setCurrentWidget(stackPage); - for (WelcomePageButton *pageButton : qAsConst(m_pageButtons)) + for (WelcomePageButton *pageButton : std::as_const(m_pageButtons)) pageButton->recheckActive(); }; diff --git a/src/shared/proparser/prowriter.cpp b/src/shared/proparser/prowriter.cpp index 13a9a1f09bb..2c7c8d54ff3 100644 --- a/src/shared/proparser/prowriter.cpp +++ b/src/shared/proparser/prowriter.cpp @@ -534,7 +534,7 @@ QList<int> ProWriter::removeVarValues(ProFile *profile, QStringList *lines, // Entries existed, but were all removed if (contCol < 0) { // This is the last line, so clear continuations leading to it - for (const ContPos &pos : qAsConst(contPos)) { + for (const ContPos &pos : std::as_const(contPos)) { QString &bline = (*lines)[pos.first]; bline.remove(pos.second, 1); if (pos.second == bline.length()) diff --git a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp index fc6514781e4..d87b61bdad0 100644 --- a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp +++ b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp @@ -75,7 +75,7 @@ public: typedef QPair<QByteArray, QByteArray> Pair; - for (const Pair &conn : qAsConst(_connections)) + for (const Pair &conn : std::as_const(_connections)) out << conn.first.constData() << " -> " << conn.second.constData() << std::endl; alignTerminals(); @@ -91,7 +91,7 @@ public: protected: void alignTerminals() { out<<"{ rank=same;" << std::endl; - for (const QByteArray &terminalShape : qAsConst(_terminalShapes)) { + for (const QByteArray &terminalShape : std::as_const(_terminalShapes)) { out << " " << std::string(terminalShape.constData(), terminalShape.size()).c_str() << ";" << std::endl; } out<<"}"<<std::endl; @@ -616,7 +616,7 @@ int main(int argc, char *argv[]) QString(fileName + QLatin1String(".ast.png")))); inputOutputFiles.append(qMakePair(QString(fileName + QLatin1String(".symbols.dot")), QString(fileName + QLatin1String(".symbols.png")))); - for (const Pair &pair : qAsConst(inputOutputFiles)) { + for (const Pair &pair : std::as_const(inputOutputFiles)) { createImageFromDot(pair.first, pair.second, optionVerbose); std::cout << qPrintable(QDir::toNativeSeparators(pair.second)) << std::endl; } diff --git a/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.cpp b/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.cpp index c202f9aaae9..bf0629ca605 100644 --- a/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.cpp +++ b/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.cpp @@ -104,7 +104,7 @@ public: << " Semantic(TranslationUnit *unit): ASTVisitor(unit) { translationUnit(unit->ast()->asTranslationUnit()); }" << std::endl << std::endl; - for (ClassOrNamespace *b : qAsConst(interfaces)) { + for (ClassOrNamespace *b : std::as_const(interfaces)) { Q_ASSERT(! b->symbols().isEmpty()); Class *klass = 0; @@ -136,7 +136,7 @@ public: << std::endl; QHash<ClassOrNamespace *, QList<ClassOrNamespace *> > implements; - for (ClassOrNamespace *b : qAsConst(nodes)) { + for (ClassOrNamespace *b : std::as_const(nodes)) { ClassOrNamespace *iface = 0; for (ClassOrNamespace *u : b->usings()) { if (interfaces.contains(u)) { @@ -148,7 +148,7 @@ public: implements[iface].append(b); } - for (ClassOrNamespace *iface : qAsConst(interfaces)) { + for (ClassOrNamespace *iface : std::as_const(interfaces)) { const QList<ClassOrNamespace *> values = implements.value(iface); for (ClassOrNamespace *b : values) { if (! isMiscNode(b)) @@ -169,7 +169,7 @@ public: std::cout << std::endl; - for (ClassOrNamespace *iface : qAsConst(interfaces)) { + for (ClassOrNamespace *iface : std::as_const(interfaces)) { std::cout << " // " << qPrintable(oo(iface->symbols().first()->name())) << std::endl; const QList<ClassOrNamespace *> values = implements.value(iface); for (ClassOrNamespace *b : values) { @@ -187,7 +187,7 @@ public: } std::cout << "private:" << std::endl; - for (ClassOrNamespace *b : qAsConst(interfaces)) { + for (ClassOrNamespace *b : std::as_const(interfaces)) { Q_ASSERT(! b->symbols().isEmpty()); Class *klass = 0; @@ -220,7 +220,7 @@ public: // implementation - for (ClassOrNamespace *b : qAsConst(interfaces)) { + for (ClassOrNamespace *b : std::as_const(interfaces)) { Q_ASSERT(! b->symbols().isEmpty()); Class *klass = 0; @@ -255,7 +255,7 @@ public: << std::endl; } - for (ClassOrNamespace *iface : qAsConst(interfaces)) { + for (ClassOrNamespace *iface : std::as_const(interfaces)) { std::cout << "// " << qPrintable(oo(iface->symbols().first()->name())) << std::endl; const QList<ClassOrNamespace *> values = implements.value(iface); for (ClassOrNamespace *b : values) { diff --git a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp index d4708356e5c..f9f9358b83c 100644 --- a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp +++ b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp @@ -1020,7 +1020,7 @@ void generateAST_cpp(const Snapshot &snapshot, const QDir &cplusplusDir) StringClassSpecifierASTMap classesNeedingLastToken; // find all classes with method declarations for firstToken/lastToken - for (ClassSpecifierAST *classAST : qAsConst(astNodes.deriveds)) { + for (ClassSpecifierAST *classAST : std::as_const(astNodes.deriveds)) { const QString className = oo(classAST->symbol->name()); if (className.isEmpty()) continue; @@ -1110,7 +1110,7 @@ void generateAST_cpp(const Snapshot &snapshot, const QDir &cplusplusDir) const int documentEnd = cpp_document.lastBlock().position() + cpp_document.lastBlock().length() - 1; Utils::ChangeSet changes; - for (GenInfo info : qAsConst(todo)) { + for (GenInfo info : std::as_const(todo)) { if (info.end > documentEnd) info.end = documentEnd; @@ -1318,7 +1318,7 @@ QStringList generateAST_H(const Snapshot &snapshot, const QDir &cplusplusDir, co Overview oo; QStringList castMethods; - for (ClassSpecifierAST *classAST : qAsConst(astNodes.deriveds)) { + for (ClassSpecifierAST *classAST : std::as_const(astNodes.deriveds)) { cursors[classAST] = removeCastMethods(classAST); const QString className = oo(classAST->symbol->name()); const QString methodName = QLatin1String("as") + className.mid(0, className.length() - 3); @@ -1485,7 +1485,7 @@ void generateASTPatternBuilder_h(const QDir &cplusplusDir) Control *control = AST_h_document->control(); QSet<QString> classesSet; - for (ClassSpecifierAST *classNode : qAsConst(astNodes.deriveds)) { + for (ClassSpecifierAST *classNode : std::as_const(astNodes.deriveds)) { Class *klass = classNode->symbol; const Identifier *match0_id = control->identifier("match0"); @@ -1540,7 +1540,7 @@ void generateASTPatternBuilder_h(const QDir &cplusplusDir) << " {" << Qt::endl << " " << className << " *ast = new (&pool) " << className << ';' << Qt::endl; - for (const StringPair &p : qAsConst(args)) + for (const StringPair &p : std::as_const(args)) out << " ast->" << p.second << " = " << p.second << ';' << Qt::endl; out << " return ast;" << Qt::endl << " }" << Qt::endl << Qt::endl; @@ -1548,7 +1548,7 @@ void generateASTPatternBuilder_h(const QDir &cplusplusDir) QStringList classesList = Utils::toList(classesSet); Utils::sort(classesList); - for (const QString &className : qAsConst(classesList)) { + for (const QString &className : std::as_const(classesList)) { const QString methodName = className.left(className.length() - 3); const QString elementName = className.left(className.length() - 7) + QLatin1String("AST"); out << " " << className << " *" << methodName << "(" << elementName << " *value, " diff --git a/src/tools/iostool/iosdevicemanager.cpp b/src/tools/iostool/iosdevicemanager.cpp index 90b620e9c38..d9c28c3532e 100644 --- a/src/tools/iostool/iosdevicemanager.cpp +++ b/src/tools/iostool/iosdevicemanager.cpp @@ -565,7 +565,7 @@ void IosDeviceManagerPrivate::addDevice(AMDeviceRef device) m_pendingLookups.remove(devId); devices << m_pendingLookups.values(QString()); m_pendingLookups.remove(QString()); - for (PendingDeviceLookup *devLookup : qAsConst(devices)) { + for (PendingDeviceLookup *devLookup : std::as_const(devices)) { qCDebug(loggingCategory) << "found pending op"; devLookup->timer.stop(); devLookup->callback(devId, device, devLookup->userData); @@ -1461,7 +1461,7 @@ void AppOpSession::deviceCallbackReturned() int AppOpSession::qmljsDebugPort() const { const QRegularExpression qmlPortRe(QLatin1String("-qmljsdebugger=port:([0-9]+)")); - for (const QString &arg : qAsConst(extraArgs)) { + for (const QString &arg : std::as_const(extraArgs)) { const QRegularExpressionMatch match = qmlPortRe.match(arg); if (match.hasMatch()) { bool ok; diff --git a/src/tools/qtcreatorcrashhandler/crashhandler.cpp b/src/tools/qtcreatorcrashhandler/crashhandler.cpp index 7762a0c3ee0..8ef5ce2b37c 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandler.cpp +++ b/src/tools/qtcreatorcrashhandler/crashhandler.cpp @@ -173,7 +173,7 @@ bool CrashHandler::collectRestartAppData() return false; } commandLine.removeLast(); - for (const QByteArray &item : qAsConst(commandLine)) + for (const QByteArray &item : std::as_const(commandLine)) d->restartAppCommandLine.append(QString::fromLatin1(item)); // Get environment. @@ -187,7 +187,7 @@ bool CrashHandler::collectRestartAppData() } if (environment.last().isEmpty()) environment.removeLast(); - for (const QByteArray &item : qAsConst(environment)) + for (const QByteArray &item : std::as_const(environment)) d->restartAppEnvironment.append(QString::fromLatin1(item)); return true; diff --git a/src/tools/qtpromaker/main.cpp b/src/tools/qtpromaker/main.cpp index 873f8c72583..7f042249a31 100644 --- a/src/tools/qtpromaker/main.cpp +++ b/src/tools/qtpromaker/main.cpp @@ -278,17 +278,17 @@ void Project::writeProFile() if (m_subdirs.isEmpty()) { ts << "TEMPLATE = app\n"; ts << "TARGET = " << QFileInfo(m_outputFileName).baseName() << "\n"; - for (const FileClass &fc : qAsConst(m_fileClasses)) + for (const FileClass &fc : std::as_const(m_fileClasses)) fc.writeProBlock(ts); ts << "\nPATHS *="; - for (const QDir dir : qAsConst(m_items)) + for (const QDir dir : std::as_const(m_items)) ts << " \\\n " << dir.path(); ts << "\n\nDEPENDPATH *= $$PATHS\n"; ts << "\nINCLUDEPATH *= $$PATHS\n"; } else { ts << "TEMPLATE = subdirs\n"; ts << "SUBDIRS = "; - for (const QString &subdir : qAsConst(m_subdirs)) + for (const QString &subdir : std::as_const(m_subdirs)) ts << " \\\n " << subdir; ts << "\n"; } diff --git a/src/tools/sdktool/addcmakeoperation.cpp b/src/tools/sdktool/addcmakeoperation.cpp index f58af800ec7..d1be67b1c36 100644 --- a/src/tools/sdktool/addcmakeoperation.cpp +++ b/src/tools/sdktool/addcmakeoperation.cpp @@ -207,7 +207,7 @@ QVariantMap AddCMakeData::addCMake(const QVariantMap &map) const data << KeyValuePair({cm, AUTODETECTED_KEY}, QVariant(true)); data << KeyValuePair({cm, PATH_KEY}, Utils::FilePath::fromUserInput(m_path).toVariant()); KeyValuePairList extraList; - for (const KeyValuePair &pair : qAsConst(m_extra)) + for (const KeyValuePair &pair : std::as_const(m_extra)) extraList << KeyValuePair(QStringList({cm}) << pair.key, pair.value); data.append(extraList); data << KeyValuePair(COUNT, QVariant(count + 1)); @@ -229,7 +229,7 @@ bool AddCMakeData::exists(const QVariantMap &map, const QString &id) // support old settings using QByteArray for id's valueKeys.append(FindValueOperation::findValue(map, id.toUtf8())); - for (const QString &k : qAsConst(valueKeys)) { + for (const QString &k : std::as_const(valueKeys)) { if (k.endsWith(QString('/') + ID_KEY)) { return true; } diff --git a/src/tools/sdktool/adddebuggeroperation.cpp b/src/tools/sdktool/adddebuggeroperation.cpp index a8c47e1d4cc..6fa6439637b 100644 --- a/src/tools/sdktool/adddebuggeroperation.cpp +++ b/src/tools/sdktool/adddebuggeroperation.cpp @@ -228,7 +228,7 @@ QVariantMap AddDebuggerData::addDebugger(const QVariantMap &map) const data << KeyValuePair(QStringList() << QLatin1String(COUNT), QVariant(count + 1)); KeyValuePairList qtExtraList; - for (const KeyValuePair &pair : qAsConst(m_extra)) + for (const KeyValuePair &pair : std::as_const(m_extra)) qtExtraList << KeyValuePair(QStringList() << debugger << pair.key, pair.value); data.append(qtExtraList); diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index ed616d2dc80..6af6b257792 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -715,7 +715,7 @@ QVariantMap AddKitData::addKit(const QVariantMap &map, data << KeyValuePair(COUNT, QVariant(count + 1)); KeyValuePairList qtExtraList; - for (const KeyValuePair &pair : qAsConst(m_extra)) + for (const KeyValuePair &pair : std::as_const(m_extra)) qtExtraList << KeyValuePair(QStringList() << kit << pair.key, pair.value); data.append(qtExtraList); diff --git a/src/tools/sdktool/addqtoperation.cpp b/src/tools/sdktool/addqtoperation.cpp index cdba206d132..c68b8aaecc0 100644 --- a/src/tools/sdktool/addqtoperation.cpp +++ b/src/tools/sdktool/addqtoperation.cpp @@ -296,7 +296,7 @@ QVariantMap AddQtData::addQt(const QVariantMap &map) const data << KeyValuePair(QStringList() << qt << ABIS, QVariant(m_abis)); KeyValuePairList qtExtraList; - for (const KeyValuePair &pair : qAsConst(m_extra)) + for (const KeyValuePair &pair : std::as_const(m_extra)) qtExtraList << KeyValuePair(QStringList() << qt << pair.key, pair.value); data.append(qtExtraList); diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp index 0d9e9139d65..47ef7b23238 100644 --- a/src/tools/sdktool/addtoolchainoperation.cpp +++ b/src/tools/sdktool/addtoolchainoperation.cpp @@ -291,7 +291,7 @@ QVariantMap AddToolChainData::addToolChain(const QVariantMap &map) const abis << QVariant(s); data << KeyValuePair({tc, SUPPORTED_ABIS}, QVariant(abis)); KeyValuePairList tcExtraList; - for (const KeyValuePair &pair : qAsConst(m_extra)) + for (const KeyValuePair &pair : std::as_const(m_extra)) tcExtraList << KeyValuePair(QStringList({tc}) << pair.key, pair.value); data.append(tcExtraList); data << KeyValuePair(COUNT, QVariant(count + 1)); @@ -313,7 +313,7 @@ bool AddToolChainData::exists(const QVariantMap &map, const QString &id) // support old settings using QByteArray for id's valueKeys.append(FindValueOperation::findValue(map, id.toUtf8())); - for (const QString &k : qAsConst(valueKeys)) { + for (const QString &k : std::as_const(valueKeys)) { if (k.endsWith(QString('/') + ID)) { return true; } diff --git a/src/tools/sdktool/findvalueoperation.cpp b/src/tools/sdktool/findvalueoperation.cpp index 66b2d667760..8369e87d2bf 100644 --- a/src/tools/sdktool/findvalueoperation.cpp +++ b/src/tools/sdktool/findvalueoperation.cpp @@ -60,7 +60,7 @@ int FindValueOperation::execute() const Q_ASSERT(!m_values.isEmpty()); QVariantMap map = load(m_file); - for (const QVariant &v : qAsConst(m_values)) { + for (const QVariant &v : std::as_const(m_values)) { const QStringList result = findValue(map, v); for (const QString &r : result) std::cout << qPrintable(r) << std::endl; diff --git a/src/tools/sdktool/getoperation.cpp b/src/tools/sdktool/getoperation.cpp index c116973210b..1d02b8ddfd8 100644 --- a/src/tools/sdktool/getoperation.cpp +++ b/src/tools/sdktool/getoperation.cpp @@ -86,7 +86,7 @@ int GetOperation::execute() const Q_ASSERT(!m_keys.isEmpty()); QVariantMap map = load(m_file); - for (const QString &key : qAsConst(m_keys)) { + for (const QString &key : std::as_const(m_keys)) { const QVariant result = get(map, key); if (!result.isValid()) std::cout << "<invalid>" << std::endl; diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 695ed6ac97f..a65f2158ea7 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -1711,12 +1711,12 @@ void tst_Dumpers::dumper() } }; collectExpandedINames(data.checks); - for (const auto &checkset : qAsConst(data.checksets)) + for (const auto &checkset : std::as_const(data.checksets)) collectExpandedINames(checkset.checks); QString expanded; QString expandedq; - for (const QString &iname : qAsConst(expandedINames)) { + for (const QString &iname : std::as_const(expandedINames)) { if (!expanded.isEmpty()) { expanded.append(','); expandedq.append(','); @@ -2005,7 +2005,7 @@ void tst_Dumpers::dumper() if (!data.checks.isEmpty()) { qCDebug(lcDumpers) << "SOME TESTS NOT EXECUTED: "; - for (const Check &check : qAsConst(data.checks)) { + for (const Check &check : std::as_const(data.checks)) { if (check.optionallyPresent) { qCDebug(lcDumpers) << " OPTIONAL TEST NOT FOUND: " << check << " IGNORED."; } else { diff --git a/tests/auto/utils/deviceshell/tst_deviceshell.cpp b/tests/auto/utils/deviceshell/tst_deviceshell.cpp index 5d550b2afa0..db4a18a6164 100644 --- a/tests/auto/utils/deviceshell/tst_deviceshell.cpp +++ b/tests/auto/utils/deviceshell/tst_deviceshell.cpp @@ -127,7 +127,7 @@ private slots: QTest::addColumn<CommandLine>("cmdLine"); QTest::addColumn<QString>("testData"); - for (const auto &cmdLine : qAsConst(m_availableShells)) { + for (const auto &cmdLine : std::as_const(m_availableShells)) { QTest::newRow((cmdLine.executable().baseName() + " : simple").toUtf8()) << cmdLine << "Hallo Welt!"; QTest::newRow((cmdLine.executable().baseName() + " : japanese").toUtf8()) @@ -175,7 +175,7 @@ private slots: QTest::addColumn<CommandLine>("cmdLine"); QTest::addColumn<QString>("testData"); - for (const auto &cmdLine : qAsConst(m_availableShells)) { + for (const auto &cmdLine : std::as_const(m_availableShells)) { QTest::newRow((cmdLine.executable().baseName() + " : simple").toUtf8()) << cmdLine << "Hallo Welt!"; QTest::newRow((cmdLine.executable().baseName() + " : japanese").toUtf8()) @@ -220,7 +220,7 @@ private slots: void testAscii_data() { QTest::addColumn<CommandLine>("cmdLine"); - for (const auto &cmdLine : qAsConst(m_availableShells)) { + for (const auto &cmdLine : std::as_const(m_availableShells)) { QTest::newRow(cmdLine.executable().baseName().toUtf8()) << cmdLine; } } |