feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Remove foreach / Q_FOREACH usage in designercore part 2

Browse Source 
Task-number: QTCREATORBUG-27464
Change-Id: I9cd42aca59406551611e55d47ed8366ee2d3d381
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Artem Sokolovskii
2022-05-09 13:23:04 +02:00
parent 6b8277fcd2
commit 639802efec
16 changed files with 124 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp
View File

@@ -99,7 +99,7 @@ void InternalNodeListProperty::slide(int from, int to)
QList<InternalNode::Pointer> InternalNodeListProperty::allSubNodes() const
{
QList<InternalNode::Pointer> nodeList;
foreach (const InternalNode::Pointer &childNode, m_nodeList) {
for (const InternalNode::Pointer &childNode : qAsConst(m_nodeList)) {
nodeList.append(childNode->allSubNodes());
nodeList.append(childNode);
}

26
src/plugins/qmldesigner/designercore/model/modelmerger.cpp
View File

@@ -62,7 +62,8 @@ static QString fixExpression(const QString &expression, const QHash<QString, QSt
static void syncVariantProperties(ModelNode &outputNode, const ModelNode &inputNode)
{
foreach (const VariantProperty &property, inputNode.variantProperties()) {
const QList<VariantProperty> propertyies = inputNode.variantProperties();
for (const VariantProperty &property : propertyies) {
if (property.isDynamic()) {
outputNode.variantProperty(property.name()).
setDynamicTypeNameAndValue(property.dynamicTypeName(), property.value());
@@ -81,14 +82,16 @@ static void syncAuxiliaryProperties(ModelNode &outputNode, const ModelNode &inpu
static void syncBindingProperties(ModelNode &outputNode, const ModelNode &inputNode, const QHash<QString, QString> &idRenamingHash)
{
foreach (const BindingProperty &bindingProperty, inputNode.bindingProperties()) {
const QList<BindingProperty> propertyies = inputNode.bindingProperties();
for (const BindingProperty &bindingProperty : propertyies) {
outputNode.bindingProperty(bindingProperty.name()).setExpression(fixExpression(bindingProperty.expression(), idRenamingHash));
}
}
static void syncSignalHandlerProperties(ModelNode &outputNode, const ModelNode &inputNode, const QHash<QString, QString> &idRenamingHash)
{
foreach (const SignalHandlerProperty &signalProperty, inputNode.signalProperties()) {
const QList<SignalHandlerProperty> propertyies = inputNode.signalProperties();
for (const SignalHandlerProperty &signalProperty : propertyies) {
outputNode.signalHandlerProperty(signalProperty.name()).setSource(fixExpression(signalProperty.source(), idRenamingHash));
}
}
@@ -119,7 +122,8 @@ static void splitIdInBaseNameAndNumber(const QString &id, QString *baseId, int *
static void setupIdRenamingHash(const ModelNode &modelNode, QHash<QString, QString> &idRenamingHash, AbstractView *view)
{
foreach (const ModelNode &node, modelNode.allSubModelNodesAndThisNode()) {
const QList<ModelNode> nodes = modelNode.allSubModelNodesAndThisNode();
for (const ModelNode &node : nodes) {
if (!node.id().isEmpty()) {
QString newId = node.id();
QString baseId;
@@ -141,7 +145,8 @@ static void syncNodeProperties(ModelNode &outputNode, const ModelNode &inputNode
const QHash<QString, QString> &idRenamingHash,
AbstractView *view, const MergePredicate &mergePredicate)
{
foreach (const NodeProperty &nodeProperty, inputNode.nodeProperties()) {
const QList<NodeProperty> propertyies = inputNode.nodeProperties();
for (const NodeProperty &nodeProperty : propertyies) {
ModelNode node = nodeProperty.modelNode();
if (!mergePredicate(node))
continue;
@@ -154,8 +159,10 @@ static void syncNodeListProperties(ModelNode &outputNode, const ModelNode &input
const QHash<QString, QString> &idRenamingHash,
AbstractView *view, const MergePredicate &mergePredicate)
{
foreach (const NodeListProperty &nodeListProperty, inputNode.nodeListProperties()) {
foreach (const ModelNode &node, nodeListProperty.toModelNodeList()) {
const QList<NodeListProperty> propertyies = inputNode.nodeListProperties();
for (const NodeListProperty &nodeListProperty : propertyies) {
const QList<ModelNode> nodes = nodeListProperty.toModelNodeList();
for (const ModelNode &node : nodes) {
if (!mergePredicate(node))
continue;
ModelNode newNode = createNodeFromNode(node, idRenamingHash, view, mergePredicate);
@@ -191,7 +198,7 @@ ModelNode ModelMerger::insertModel(const ModelNode &modelNode, const MergePredic
QList<Import> newImports;
foreach (const Import &import, modelNode.model()->imports()) {
for (const Import &import : modelNode.model()->imports()) {
if (!view()->model()->hasImport(import, true, true))
newImports.append(import);
}
@@ -216,7 +223,8 @@ void ModelMerger::replaceModel(const ModelNode &modelNode, const MergePredicate
view()->executeInTransaction("ModelMerger::replaceModel", [this, modelNode, &predicate](){
ModelNode rootNode(view()->rootModelNode());
foreach (const PropertyName &propertyName, rootNode.propertyNames())
const QList<PropertyName> propertyNames = rootNode.propertyNames();
for (const PropertyName &propertyName : propertyNames)
rootNode.removeProperty(propertyName);
QHash<QString, QString> idRenamingHash;

21
src/plugins/qmldesigner/designercore/model/modelnode.cpp
View File

@@ -595,7 +595,8 @@ QList<AbstractProperty> ModelNode::properties() const
QList<AbstractProperty> propertyList;
foreach (const PropertyName &propertyName, internalNode()->propertyNameList()) {
const QList<PropertyName> propertyNames = internalNode()->propertyNameList();
for (const PropertyName &propertyName : propertyNames) {
AbstractProperty property(propertyName, internalNode(), model(), view());
propertyList.append(property);
}
@@ -614,7 +615,8 @@ QList<VariantProperty> ModelNode::variantProperties() const
{
QList<VariantProperty> propertyList;
foreach (const AbstractProperty &abstractProperty, properties())
const QList<AbstractProperty> abstractProperties = properties();
for (const AbstractProperty &abstractProperty : abstractProperties)
if (abstractProperty.isVariantProperty())
propertyList.append(abstractProperty.toVariantProperty());
return propertyList;
@@ -624,7 +626,8 @@ QList<NodeAbstractProperty> ModelNode::nodeAbstractProperties() const
{
QList<NodeAbstractProperty> propertyList;
foreach (const AbstractProperty &nodeAbstractProperty, properties())
const QList<AbstractProperty> abstractProperties = properties();
for (const AbstractProperty &nodeAbstractProperty : abstractProperties)
if (nodeAbstractProperty.isNodeAbstractProperty())
propertyList.append(nodeAbstractProperty.toNodeAbstractProperty());
return propertyList;
@@ -634,7 +637,8 @@ QList<NodeProperty> ModelNode::nodeProperties() const
{
QList<NodeProperty> propertyList;
foreach (const AbstractProperty &nodeProperty, properties())
const QList<AbstractProperty> abstractProperties = properties();
for (const AbstractProperty &nodeProperty : abstractProperties)
if (nodeProperty.isNodeProperty())
propertyList.append(nodeProperty.toNodeProperty());
return propertyList;
@@ -644,7 +648,8 @@ QList<NodeListProperty> ModelNode::nodeListProperties() const
{
QList<NodeListProperty> propertyList;
foreach (const AbstractProperty &nodeListProperty, properties())
const QList<AbstractProperty> abstractProperties = properties();
for (const AbstractProperty &nodeListProperty : abstractProperties)
if (nodeListProperty.isNodeListProperty())
propertyList.append(nodeListProperty.toNodeListProperty());
return propertyList;
@@ -661,7 +666,8 @@ QList<BindingProperty> ModelNode::bindingProperties() const
{
QList<BindingProperty> propertyList;
foreach (const AbstractProperty &bindingProperty, properties())
const QList<AbstractProperty> abstractProperties = properties();
for (const AbstractProperty &bindingProperty : abstractProperties)
if (bindingProperty.isBindingProperty())
propertyList.append(bindingProperty.toBindingProperty());
return propertyList;
@@ -671,7 +677,8 @@ QList<SignalHandlerProperty> ModelNode::signalProperties() const
{
QList<SignalHandlerProperty> propertyList;
foreach (const AbstractProperty &property, properties())
const QList<AbstractProperty> abstractProperties = properties();
for (const AbstractProperty &property : abstractProperties)
if (property.isSignalHandlerProperty())
propertyList.append(property.toSignalHandlerProperty());
return propertyList;

4
src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp
View File

@@ -46,7 +46,7 @@ void ModelNodePositionRecalculator::moved(const TextModifier::MoveInfo &moveInfo
const int prefixLength = moveInfo.prefixToInsert.length();
const int suffixLength = moveInfo.suffixToInsert.length();
foreach (const ModelNode &node, m_nodesToTrack) {
for (const ModelNode &node : qAsConst(m_nodesToTrack)) {
const int nodeLocation = m_positionStore->nodeOffset(node);
if (nodeLocation == ModelNodePositionStorage::INVALID_LOCATION)
@@ -89,7 +89,7 @@ void ModelNodePositionRecalculator::replaced(int offset, int oldLength, int newL
if (growth == 0)
return;
foreach (const ModelNode &node, m_nodesToTrack) {
for (const ModelNode &node : qAsConst(m_nodesToTrack)) {
const int nodeLocation = m_positionStore->nodeOffset(node);
if (nodeLocation == ModelNodePositionStorage::INVALID_LOCATION)

8
src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
View File

@@ -73,7 +73,7 @@ void ModelToTextMerger::nodeRemoved(const ModelNode &removedNode, const NodeAbst
void ModelToTextMerger::propertiesRemoved(const QList<AbstractProperty>& propertyList)
{
foreach (const AbstractProperty &property, propertyList) {
for (const AbstractProperty &property : propertyList) {
// Default property that has actual binding/value should be removed
if (isInHierarchy(property) && (!property.isDefaultProperty()
|| property.isBindingProperty()
@@ -87,7 +87,7 @@ void ModelToTextMerger::propertiesRemoved(const QList<AbstractProperty>& propert
void ModelToTextMerger::propertiesChanged(const QList<AbstractProperty>& propertyList, PropertyChangeFlags propertyChange)
{
const TextEditor::TabSettings tabSettings = m_rewriterView->textModifier()->tabSettings();
foreach (const AbstractProperty &property, propertyList) {
for (const AbstractProperty &property : propertyList) {
ModelNode containedModelNode;
const QString propertyTextValue = QmlTextGenerator(propertyOrder(),
@@ -320,7 +320,7 @@ void ModelToTextMerger::reindent(const QMap<int, int> &dirtyAreas) const
Utils::sort(offsets);
TextModifier *textModifier = m_rewriterView->textModifier();
foreach (const int offset, offsets) {
for (const int offset : qAsConst(offsets)) {
const int length = dirtyAreas[offset];
textModifier->indent(offset, length);
}
@@ -415,7 +415,7 @@ void ModelToTextMerger::dumpRewriteActions(const QString &msg)
if (DebugRewriteActions) {
qDebug() << "---->" << qPrintable(msg);
foreach (RewriteAction *action, m_rewriteActions) {
for (RewriteAction *action : qAsConst(m_rewriteActions)) {
qDebug() << "-----" << qPrintable(action->info());
}

5
src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp
View File

@@ -76,7 +76,7 @@ Internal::InternalNodeListPropertyPointer &NodeListProperty::internalNodeListPro
static QList<ModelNode> internalNodesToModelNodes(const QList<Internal::InternalNode::Pointer> &inputList, Model* model, AbstractView *view)
{
QList<ModelNode> modelNodeList;
foreach (const Internal::InternalNode::Pointer &internalNode, inputList) {
for (const Internal::InternalNode::Pointer &internalNode : inputList) {
modelNodeList.append(ModelNode(internalNode, model, view));
}
return modelNodeList;
@@ -102,7 +102,8 @@ QList<QmlObjectNode> NodeListProperty::toQmlObjectNodeList() const
QList<QmlObjectNode> qmlObjectNodeList;
foreach (const ModelNode &modelNode, toModelNodeList())
const QList<ModelNode> modelNodeList = toModelNodeList();
for (const ModelNode &modelNode : modelNodeList)
qmlObjectNodeList.append(QmlObjectNode(modelNode));
return qmlObjectNodeList;

8
src/plugins/qmldesigner/designercore/model/qmlanchors.cpp
View File

@@ -190,7 +190,7 @@ bool detectHorizontalCycle(const ModelNode &node, QList<ModelNode> knownNodeList
static const PropertyNameList validAnchorLines({"right", "left", "horizontalCenter"});
static const PropertyNameList anchorNames({"anchors.right", "anchors.left", "anchors.horizontalCenter"});
foreach (const PropertyName &anchorName, anchorNames) {
for (const PropertyName &anchorName : anchorNames) {
if (node.hasBindingProperty(anchorName)) {
AbstractProperty targetProperty = node.bindingProperty(anchorName).resolveToProperty();
if (targetProperty.isValid()) {
@@ -205,7 +205,7 @@ bool detectHorizontalCycle(const ModelNode &node, QList<ModelNode> knownNodeList
}
static const PropertyNameList anchorShortcutNames({"anchors.fill", "anchors.centerIn"});
foreach (const PropertyName &anchorName, anchorShortcutNames) {
for (const PropertyName &anchorName : anchorShortcutNames) {
if (node.hasBindingProperty(anchorName)) {
ModelNode targetNode = node.bindingProperty(anchorName).resolveToModelNode();
@@ -230,7 +230,7 @@ bool detectVerticalCycle(const ModelNode &node, QList<ModelNode> knownNodeList)
static const PropertyNameList validAnchorLines({"top", "bottom", "verticalCenter", "baseline"});
static const PropertyNameList anchorNames({"anchors.top", "anchors.bottom", "anchors.verticalCenter", "anchors.baseline"});
foreach (const PropertyName &anchorName, anchorNames) {
for (const PropertyName &anchorName : anchorNames) {
if (node.hasBindingProperty(anchorName)) {
AbstractProperty targetProperty = node.bindingProperty(anchorName).resolveToProperty();
if (targetProperty.isValid()) {
@@ -245,7 +245,7 @@ bool detectVerticalCycle(const ModelNode &node, QList<ModelNode> knownNodeList)
}
static const PropertyNameList anchorShortcutNames({"anchors.fill", "anchors.centerIn"});
foreach (const PropertyName &anchorName, anchorShortcutNames) {
for (const PropertyName &anchorName : anchorShortcutNames) {
if (node.hasBindingProperty(anchorName)) {
ModelNode targetNode = node.bindingProperty(anchorName).resolveToModelNode();

8
src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
View File

@@ -201,7 +201,8 @@ QList<QmlItemNode> QmlItemNode::children() const
childrenList.append(modelNode().nodeListProperty("children").toModelNodeList());
if (modelNode().hasNodeListProperty("data")) {
foreach (const ModelNode &node, modelNode().nodeListProperty("data").toModelNodeList()) {
const QList<ModelNode> nodes = modelNode().nodeListProperty("data").toModelNodeList();
for (const ModelNode &node : nodes) {
if (QmlItemNode::isValidQmlItemNode(node))
childrenList.append(node);
}
@@ -221,7 +222,8 @@ QList<QmlObjectNode> QmlItemNode::resources() const
resourcesList.append(modelNode().nodeListProperty("resources").toModelNodeList());
if (modelNode().hasNodeListProperty("data")) {
foreach (const ModelNode &node, modelNode().nodeListProperty("data").toModelNodeList()) {
const QList<ModelNode> nodes = modelNode().nodeListProperty("data").toModelNodeList();
for (const ModelNode &node : nodes) {
if (!QmlItemNode::isValidQmlItemNode(node))
resourcesList.append(node);
}
@@ -489,7 +491,7 @@ QList<ModelNode> toModelNodeList(const QList<QmlItemNode> &qmlItemNodeList)
{
QList<ModelNode> modelNodeList;
foreach (const QmlItemNode &qmlItemNode, qmlItemNodeList)
for (const QmlItemNode &qmlItemNode : qmlItemNodeList)
modelNodeList.append(qmlItemNode.modelNode());
return modelNodeList;

17
src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
View File

@@ -394,7 +394,9 @@ static void removeAliasExports(const QmlObjectNode &node)
if (hasAliasExport)
rootNode.removeProperty(propertyName);
foreach (const ModelNode &childNode, node.modelNode().directSubModelNodes()) {
const QList<ModelNode> nodes = node.modelNode().directSubModelNodes();
for (const ModelNode &childNode : nodes) {
removeAliasExports(childNode);
}
@@ -508,7 +510,8 @@ QList<QmlModelState> QmlObjectNode::allAffectingStates() const
QList<QmlModelState> returnList;
foreach (const QmlModelState &state, allDefinedStates()) {
const QList<QmlModelState> states = allDefinedStates();
for (const QmlModelState &state : states) {
if (state.affectsModelNode(modelNode()))
returnList.append(state);
}
@@ -525,7 +528,8 @@ QList<QmlModelStateOperation> QmlObjectNode::allAffectingStatesOperations() cons
throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__);
QList<QmlModelStateOperation> returnList;
foreach (const QmlModelState &state, allDefinedStates()) {
const QList<QmlModelState> states = allDefinedStates();
for (const QmlModelState &state : states) {
if (state.affectsModelNode(modelNode()))
returnList.append(state.stateOperations(modelNode()));
}
@@ -540,7 +544,8 @@ static QList<QmlVisualNode> allQmlVisualNodesRecursive(const QmlItemNode &qmlIte
if (qmlItemNode.isValid()) {
qmlVisualNodeList.append(qmlItemNode);
foreach (const ModelNode &modelNode, qmlItemNode.modelNode().directSubModelNodes()) {
const QList<ModelNode> nodes = qmlItemNode.modelNode().directSubModelNodes();
for (const ModelNode &modelNode : nodes) {
if (QmlVisualNode::isValidQmlVisualNode(modelNode))
qmlVisualNodeList.append(allQmlVisualNodesRecursive(modelNode));
}
@@ -601,7 +606,7 @@ QList<ModelNode> toModelNodeList(const QList<QmlObjectNode> &qmlObjectNodeList)
{
QList<ModelNode> modelNodeList;
foreach (const QmlObjectNode &qmlObjectNode, qmlObjectNodeList)
for (const QmlObjectNode &qmlObjectNode : qmlObjectNodeList)
modelNodeList.append(qmlObjectNode.modelNode());
return modelNodeList;
@@ -611,7 +616,7 @@ QList<QmlObjectNode> toQmlObjectNodeList(const QList<ModelNode> &modelNodeList)
{
QList<QmlObjectNode> qmlObjectNodeList;
foreach (const ModelNode &modelNode, modelNodeList) {
for (const ModelNode &modelNode : modelNodeList) {
if (QmlObjectNode::isValidQmlObjectNode(modelNode))
qmlObjectNodeList.append(modelNode);
}

31
src/plugins/qmldesigner/designercore/model/qmlstate.cpp
View File

@@ -52,7 +52,9 @@ QmlPropertyChanges QmlModelState::propertyChanges(const ModelNode &node)
{
if (!isBaseState()) {
addChangeSetIfNotExists(node);
foreach (const ModelNode &childNode, modelNode().nodeListProperty("changes").toModelNodeList()) {
const QList<ModelNode> nodes = modelNode().nodeListProperty("changes").toModelNodeList();
for (const ModelNode &childNode : nodes) {
//### exception if not valid QmlModelStateOperation
if (QmlPropertyChanges::isValidQmlPropertyChanges(childNode)
&& QmlPropertyChanges(childNode).target().isValid()
@@ -69,7 +71,8 @@ QList<QmlModelStateOperation> QmlModelState::stateOperations(const ModelNode &no
QList<QmlModelStateOperation> returnList;
if (!isBaseState() && modelNode().hasNodeListProperty("changes")) {
foreach (const ModelNode &childNode, modelNode().nodeListProperty("changes").toModelNodeList()) {
const QList<ModelNode> nodes = modelNode().nodeListProperty("changes").toModelNodeList();
for (const ModelNode &childNode : nodes) {
if (QmlModelStateOperation::isValidQmlModelStateOperation(childNode)) {
QmlModelStateOperation stateOperation(childNode);
ModelNode targetNode = stateOperation.target();
@@ -87,7 +90,8 @@ QList<QmlPropertyChanges> QmlModelState::propertyChanges() const
QList<QmlPropertyChanges> returnList;
if (!isBaseState() && modelNode().hasNodeListProperty("changes")) {
foreach (const ModelNode &childNode, modelNode().nodeListProperty("changes").toModelNodeList()) {
const QList<ModelNode> nodes = modelNode().nodeListProperty("changes").toModelNodeList();
for (const ModelNode &childNode : nodes) {
//### exception if not valid QmlModelStateOperation
if (QmlPropertyChanges::isValidQmlPropertyChanges(childNode))
returnList.append(QmlPropertyChanges(childNode));
@@ -101,7 +105,8 @@ QList<QmlPropertyChanges> QmlModelState::propertyChanges() const
bool QmlModelState::hasPropertyChanges(const ModelNode &node) const
{
if (!isBaseState() && modelNode().hasNodeListProperty("changes")) {
foreach (const QmlPropertyChanges &changeSet, propertyChanges()) {
const QList<QmlPropertyChanges> changes = propertyChanges();
for (const QmlPropertyChanges &changeSet : changes) {
if (changeSet.target().isValid() && changeSet.target() == node)
return true;
}
@@ -113,7 +118,8 @@ bool QmlModelState::hasPropertyChanges(const ModelNode &node) const
bool QmlModelState::hasStateOperation(const ModelNode &node) const
{
if (!isBaseState()) {
foreach (const QmlModelStateOperation &stateOperation, stateOperations()) {
const QList<QmlModelStateOperation> operations = stateOperations();
for (const QmlModelStateOperation &stateOperation : operations) {
if (stateOperation.target() == node)
return true;
}
@@ -127,7 +133,8 @@ QList<QmlModelStateOperation> QmlModelState::stateOperations() const
QList<QmlModelStateOperation> returnList;
if (!isBaseState() && modelNode().hasNodeListProperty("changes")) {
foreach (const ModelNode &childNode, modelNode().nodeListProperty("changes").toModelNodeList()) {
const QList<ModelNode> nodes = modelNode().nodeListProperty("changes").toModelNodeList();
for (const ModelNode &childNode : nodes) {
//### exception if not valid QmlModelStateOperation
if (QmlModelStateOperation::isValidQmlModelStateOperation(childNode))
returnList.append(QmlModelStateOperation(childNode));
@@ -203,7 +210,8 @@ QList<QmlObjectNode> QmlModelState::allAffectedNodes() const
{
QList<QmlObjectNode> returnList;
foreach (const ModelNode &childNode, modelNode().nodeListProperty("changes").toModelNodeList()) {
const QList<ModelNode> nodes = modelNode().nodeListProperty("changes").toModelNodeList();
for (const ModelNode &childNode : nodes) {
if (QmlModelStateOperation::isValidQmlModelStateOperation(childNode) &&
!returnList.contains(QmlModelStateOperation(childNode).target()))
returnList.append(QmlModelStateOperation(childNode).target());
@@ -271,11 +279,14 @@ QmlModelState QmlModelState::duplicate(const QString &name) const
// QmlModelState newState(stateGroup().addState(name));
QmlModelState newState(createQmlState(view(), {{PropertyName("name"), QVariant(name)}}));
foreach (const ModelNode &childNode, modelNode().nodeListProperty("changes").toModelNodeList()) {
const QList<ModelNode> nodes = modelNode().nodeListProperty("changes").toModelNodeList();
for (const ModelNode &childNode : nodes) {
ModelNode newModelNode(view()->createModelNode(childNode.type(), childNode.majorVersion(), childNode.minorVersion()));
foreach (const BindingProperty &bindingProperty, childNode.bindingProperties())
const QList<BindingProperty> bindingProperties = childNode.bindingProperties();
for (const BindingProperty &bindingProperty : bindingProperties)
newModelNode.bindingProperty(bindingProperty.name()).setExpression(bindingProperty.expression());
foreach (const VariantProperty &variantProperty, childNode.variantProperties())
const QList<VariantProperty> variantProperties = childNode.variantProperties();
for (const VariantProperty &variantProperty : variantProperties)
newModelNode.variantProperty(variantProperty.name()).setValue(variantProperty.value());
newState.modelNode().nodeListProperty("changes").reparentHere(newModelNode);
}

6
src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
View File

@@ -200,7 +200,7 @@ QString QmlTextGenerator::toQml(const ModelNode &node, int indentDepth) const
QString alias;
if (!url.isEmpty()) {
foreach (const Import &import, node.model()->imports()) {
for (const Import &import : node.model()->imports()) {
if (import.url() == url) {
alias = import.alias();
break;
@@ -236,7 +236,7 @@ QString QmlTextGenerator::propertiesToQml(const ModelNode &node, int indentDepth
PropertyNameList nodePropertyNames = node.propertyNames();
bool addToTop = true;
foreach (const PropertyName &propertyName, m_propertyOrder) {
for (const PropertyName &propertyName : qAsConst(m_propertyOrder)) {
if (propertyName == "id") {
// the model handles the id property special, so:
if (!node.id().isEmpty()) {
@@ -262,7 +262,7 @@ QString QmlTextGenerator::propertiesToQml(const ModelNode &node, int indentDepth
}
}
foreach (const PropertyName &propertyName, nodePropertyNames) {
for (const PropertyName &propertyName : qAsConst(nodePropertyNames)) {
bottomPart.prepend(propertyToQml(node.property(propertyName), indentDepth));
}

16
src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
View File

@@ -101,7 +101,7 @@ void RewriteActionCompressor::compressImports(QList<RewriteAction *> &actions) c
}
}
foreach (RewriteAction *action, actionsToRemove) {
for (RewriteAction *action : qAsConst(actionsToRemove)) {
actions.removeOne(action);
delete action;
}
@@ -127,7 +127,7 @@ void RewriteActionCompressor::compressRereparentActions(QList<RewriteAction *> &
}
}
foreach (RewriteAction *action, actionsToRemove) {
for (RewriteAction *action : qAsConst(actionsToRemove)) {
actions.removeOne(action);
delete action;
}
@@ -146,7 +146,7 @@ void RewriteActionCompressor::compressReparentIntoSamePropertyActions(QList<Rewr
}
}
foreach (RewriteAction *action, actionsToRemove) {
for (RewriteAction *action : qAsConst(actionsToRemove)) {
actions.removeOne(action);
delete action;
}
@@ -201,7 +201,7 @@ void RewriteActionCompressor::compressAddEditRemoveNodeActions(QList<RewriteActi
}
}
foreach (RewriteAction *action, actionsToRemove) {
for (RewriteAction *action : qAsConst(actionsToRemove)) {
actions.removeOne(action);
delete action;
}
@@ -251,7 +251,7 @@ void RewriteActionCompressor::compressPropertyActions(QList<RewriteAction *> &ac
}
}
foreach (RewriteAction *action, actionsToRemove){
for (RewriteAction *action : qAsConst(actionsToRemove)) {
actions.removeOne(action);
delete action;
}
@@ -300,13 +300,13 @@ void RewriteActionCompressor::compressAddEditActions(
}
}
foreach (RewriteAction *action, actionsToRemove){
for (RewriteAction *action : qAsConst(actionsToRemove)) {
actions.removeOne(action);
delete action;
}
QmlTextGenerator gen(m_propertyOrder, tabSettings);
foreach (RewriteAction *action, dirtyActions) {
for (RewriteAction *action : qAsConst(dirtyActions)) {
RewriteAction *newAction = nullptr;
if (AddPropertyRewriteAction *addAction = action->asAddPropertyRewriteAction()) {
newAction = new AddPropertyRewriteAction(addAction->property(),
@@ -371,7 +371,7 @@ void RewriteActionCompressor::compressAddReparentActions(QList<RewriteAction *>
}
}
foreach (RewriteAction *action, actionsToRemove){
for (RewriteAction *action : qAsConst(actionsToRemove)) {
actions.removeOne(action);
delete action;
}

18
src/plugins/qmldesigner/designercore/model/rewriterview.cpp
View File

@@ -220,7 +220,7 @@ void RewriterView::variantPropertiesChanged(const QList<VariantProperty>& proper
return;
QList<AbstractProperty> usefulPropertyList;
foreach (const VariantProperty &property, propertyList)
for (const VariantProperty &property : propertyList)
usefulPropertyList.append(property);
modelToTextMerger()->propertiesChanged(usefulPropertyList, propertyChange);
@@ -236,7 +236,7 @@ void RewriterView::bindingPropertiesChanged(const QList<BindingProperty>& proper
return;
QList<AbstractProperty> usefulPropertyList;
foreach (const BindingProperty &property, propertyList)
for (const BindingProperty &property : propertyList)
usefulPropertyList.append(property);
modelToTextMerger()->propertiesChanged(usefulPropertyList, propertyChange);
@@ -252,7 +252,7 @@ void RewriterView::signalHandlerPropertiesChanged(const QVector<SignalHandlerPro
return;
QList<AbstractProperty> usefulPropertyList;
foreach (const SignalHandlerProperty &property, propertyList)
for (const SignalHandlerProperty &property : propertyList)
usefulPropertyList.append(property);
modelToTextMerger()->propertiesChanged(usefulPropertyList, propertyChange);
@@ -275,10 +275,10 @@ void RewriterView::nodeReparented(const ModelNode &node, const NodeAbstractPrope
void RewriterView::importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports)
{
foreach (const Import &import, addedImports)
for (const Import &import : addedImports)
importAdded(import);
foreach (const Import &import, removedImports)
for (const Import &import : removedImports)
importRemoved(import);
}
@@ -290,7 +290,7 @@ void RewriterView::importAdded(const Import &import)
return;
if (import.url() == QLatin1String("Qt")) {
foreach (const Import &import, model()->imports()) {
for (const Import &import : model()->imports()) {
if (import.url() == QLatin1String("QtQuick"))
return; //QtQuick magic we do not have to add an import for Qt
}
@@ -785,7 +785,7 @@ QMap<ModelNode, QString> RewriterView::extractText(const QList<ModelNode> &nodes
QmlDesigner::ASTObjectTextExtractor extract(m_textModifier->text());
QMap<ModelNode, QString> result;
foreach (const ModelNode &node, nodes) {
for (const ModelNode &node : nodes) {
const int nodeLocation = m_positionStorage->nodeOffset(node);
if (nodeLocation == ModelNodePositionStorage::INVALID_LOCATION)
@@ -981,7 +981,7 @@ QString RewriterView::convertTypeToImportAlias(const QString &type) const
QString alias;
if (!url.isEmpty()) {
foreach (const Import &import, model()->imports()) {
for (const Import &import : model()->imports()) {
if (import.url() == url) {
alias = import.alias();
break;
@@ -1011,7 +1011,7 @@ QString RewriterView::pathForImport(const Import &import)
QmlJS::ImportInfo importInfo;
foreach (const QmlJS::Import &qmljsImport, imports->all()) {
for (const QmlJS::Import &qmljsImport : imports->all()) {
if (qmljsImport.info.name() == importStr)
importInfo = qmljsImport.info;
}

34
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -840,7 +840,7 @@ void TextToModelMerger::setupImports(const Document::Ptr &doc,
}
}
foreach (const Import &import, existingImports)
for (const Import &import : qAsConst(existingImports))
differenceHandler.importAbsentInQMl(import);
}
@@ -894,7 +894,7 @@ static bool isBlacklistImport(const ImportKey &importKey, Model *model)
static QHash<QString, ImportKey> filterPossibleImportKeys(const QSet<ImportKey> &possibleImportKeys, Model *model)
{
QHash<QString, ImportKey> filteredPossibleImportKeys;
foreach (const ImportKey &importKey, possibleImportKeys) {
for (const ImportKey &importKey : possibleImportKeys) {
if (isLatestImportVersion(importKey, filteredPossibleImportKeys) && !isBlacklistImport(importKey, model))
filteredPossibleImportKeys.insert(importKey.path(), importKey);
}
@@ -904,7 +904,7 @@ static QHash<QString, ImportKey> filterPossibleImportKeys(const QSet<ImportKey>
static void removeUsedImports(QHash<QString, ImportKey> &filteredPossibleImportKeys, const QList<QmlJS::Import> &usedImports)
{
foreach (const QmlJS::Import &import, usedImports)
for (const QmlJS::Import &import : usedImports)
filteredPossibleImportKeys.remove(import.info.path());
}
@@ -1080,7 +1080,8 @@ Document::MutablePtr TextToModelMerger::createParsedDocument(const QUrl &url, co
if (!doc->isParsedCorrectly()) {
if (errors) {
foreach (const QmlJS::DiagnosticMessage &message, doc->diagnosticMessages())
const QList<QmlJS::DiagnosticMessage> messages = doc->diagnosticMessages();
for (const QmlJS::DiagnosticMessage &message : messages)
errors->append(DocumentMessage(message, QUrl::fromLocalFile(doc->fileName())));
}
return Document::MutablePtr();
@@ -1291,12 +1292,12 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
} else if (auto def = AST::cast<AST::UiObjectDefinition *>(member)) {
const QString &name = def->qualifiedTypeNameId->name.toString();
if (name.isEmpty() || !name.at(0).isUpper()) {
QStringList props = syncGroupedProperties(modelNode,
name,
def->initializer->members,
context,
differenceHandler);
foreach (const QString &prop, props)
const QStringList props = syncGroupedProperties(modelNode,
name,
def->initializer->members,
context,
differenceHandler);
for (const QString &prop : props)
modelPropertyNames.remove(prop.toUtf8());
} else {
defaultPropertyItems.append(member);
@@ -1386,7 +1387,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
}
}
foreach (const PropertyName &modelPropertyName, modelPropertyNames) {
for (const PropertyName &modelPropertyName : qAsConst(modelPropertyNames)) {
AbstractProperty modelProperty = modelNode.property(modelPropertyName);
// property deleted.
@@ -2166,7 +2167,8 @@ void TextToModelMerger::clearImplicitComponent(const ModelNode &node)
void TextToModelMerger::collectLinkErrors(QList<DocumentMessage> *errors, const ReadingContext &ctxt)
{
foreach (const QmlJS::DiagnosticMessage &diagnosticMessage, ctxt.diagnosticLinkMessages()) {
const QList<QmlJS::DiagnosticMessage> diagnosticMessages = ctxt.diagnosticLinkMessages();
for (const QmlJS::DiagnosticMessage &diagnosticMessage : diagnosticMessages) {
if (diagnosticMessage.kind == QmlJS::Severity::ReadingTypeInfoWarning)
m_rewriterView->setIncompleteTypeInformation(true);
@@ -2182,7 +2184,7 @@ void TextToModelMerger::collectImportErrors(QList<DocumentMessage> *errors)
}
bool hasQtQuick = false;
foreach (const QmlDesigner::Import &import, m_rewriterView->model()->imports()) {
for (const QmlDesigner::Import &import : m_rewriterView->model()->imports()) {
if (import.isLibraryImport() && import.url() == QStringLiteral("QtQuick")) {
if (supportedQtQuickVersion(import.version())) {
@@ -2245,7 +2247,8 @@ void TextToModelMerger::collectSemanticErrorsAndWarnings(QList<DocumentMessage>
check.disableMessage(StaticAnalysis::ErrCouldNotResolvePrototype);
check.disableMessage(StaticAnalysis::ErrCouldNotResolvePrototypeOf);
foreach (StaticAnalysis::Type type, StaticAnalysis::Message::allMessageTypes()) {
const QList<StaticAnalysis::Type> types = StaticAnalysis::Message::allMessageTypes();
for (StaticAnalysis::Type type : types) {
StaticAnalysis::PrototypeMessageData prototypeMessageData = StaticAnalysis::Message::prototypeForMessageType(type);
if (prototypeMessageData.severity == Severity::MaybeWarning
|| prototypeMessageData.severity == Severity::Warning) {
@@ -2256,7 +2259,8 @@ void TextToModelMerger::collectSemanticErrorsAndWarnings(QList<DocumentMessage>
check.enableQmlDesignerChecks();
QUrl fileNameUrl = QUrl::fromLocalFile(m_document->fileName());
foreach (const StaticAnalysis::Message &message, check()) {
const QList<StaticAnalysis::Message> messages = check();
for (const StaticAnalysis::Message &message : messages) {
if (message.severity == Severity::Error) {
if (message.type == StaticAnalysis::ErrUnknownComponent)
warnings->append(DocumentMessage(message.toDiagnosticMessage(), fileNameUrl));

3
src/plugins/qmldesigner/designercore/model/viewmanager.cpp
View File

@@ -334,7 +334,8 @@ QList<WidgetInfo> ViewManager::widgetInfos() const
QWidget *ViewManager::widget(const QString &uniqueId) const
{
foreach (const WidgetInfo &widgetInfo, widgetInfos()) {
const QList<WidgetInfo> widgetInfoList = widgetInfos();
for (const WidgetInfo &widgetInfo : widgetInfoList) {
if (widgetInfo.uniqueId == uniqueId)
return widgetInfo.widget;
}

2
src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
View File

@@ -162,7 +162,7 @@ void WidgetPluginPath::ensureLoaded()
const QStringList libraryFiles = libraryFilePaths(m_path);
if (debug)
qDebug() << "Checking " << libraryFiles.size() << " plugins " << m_path.absolutePath();
foreach (const QString &libFile, libraryFiles)
for (const QString &libFile : libraryFiles)
m_plugins.push_back(WidgetPluginData(libFile));
m_loaded = true;
}