From 0de18abbc2b7a355ea31b86c5fed0aa7eb467105 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 26 Apr 2017 14:32:02 +0200 Subject: QmlDesigner: use initializer lists Change-Id: Ibdc46d30ad3f2b703d4cbdd796a1032030bd17cd Reviewed-by: Thomas Hartmann --- .../components/componentcore/layoutingridlayout.cpp | 2 +- .../components/componentcore/modelnodeoperations.cpp | 2 +- .../components/formeditor/anchorindicatorgraphicsitem.cpp | 4 ++-- .../qmldesigner/components/formeditor/backgroundaction.cpp | 10 +++++----- src/plugins/qmldesigner/components/formeditor/dragtool.cpp | 2 +- .../components/importmanager/importmanagerview.cpp | 4 ++-- .../qmldesigner/components/integration/designdocument.cpp | 8 ++++---- .../components/integration/designdocumentview.cpp | 2 +- .../components/itemlibrary/itemlibrarywidget.cpp | 4 ++-- .../qmldesigner/components/navigator/navigatortreemodel.h | 4 ++-- .../components/stateseditor/stateseditorview.cpp | 7 ++++--- .../designercore/instances/nodeinstanceview.cpp | 14 +++++++------- .../qmldesigner/designercore/instances/puppetcreator.cpp | 4 ++-- .../qmldesigner/designercore/metainfo/nodemetainfo.cpp | 2 +- .../designercore/metainfo/subcomponentmanager.cpp | 2 +- src/plugins/qmldesigner/designercore/model/model.cpp | 10 +++++----- src/plugins/qmldesigner/designercore/model/modelmerger.cpp | 4 ++-- src/plugins/qmldesigner/designercore/model/qmlanchors.cpp | 4 ++-- .../qmldesigner/designercore/model/texttomodelmerger.cpp | 12 ++++++------ src/plugins/qmldesigner/designmodewidget.cpp | 2 +- src/plugins/qmldesigner/documentmanager.cpp | 2 +- .../qmldesignerextension/connectioneditor/backendmodel.cpp | 4 ++-- 22 files changed, 55 insertions(+), 54 deletions(-) diff --git a/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp b/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp index b52faf065a..39638e3fcb 100644 --- a/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp +++ b/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp @@ -227,7 +227,7 @@ void LayoutInGridLayout::ensureLayoutImport(const SelectionContext &context) { if (!hasQtQuickLayoutImport(context)) { Import layoutImport = Import::createLibraryImport("QtQuick.Layouts", "1.0"); - context.view()-> model()->changeImports(QList() << layoutImport, QList()); + context.view()-> model()->changeImports({layoutImport}, {}); } } diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index c26f970441..9d161ddba7 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -156,7 +156,7 @@ void goIntoComponent(const ModelNode &modelNode) void select(const SelectionContext &selectionState) { if (selectionState.view()) - selectionState.view()->setSelectedModelNodes(QList() << selectionState.targetNode()); + selectionState.view()->setSelectedModelNodes({selectionState.targetNode()}); } void deSelect(const SelectionContext &selectionState) diff --git a/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp b/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp index d199b9cd71..69958aaeae 100644 --- a/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp @@ -63,7 +63,7 @@ void AnchorIndicatorGraphicsItem::paint(QPainter *painter, const QStyleOptionGra QPen linePen(QColor(0, 0, 0, 150)); linePen.setCosmetic(true); - linePen.setDashPattern(QVector() << 3. << 2.); + linePen.setDashPattern({3., 2.}); painter->setPen(linePen); @@ -72,7 +72,7 @@ void AnchorIndicatorGraphicsItem::paint(QPainter *painter, const QStyleOptionGra painter->drawLine(m_secondControlPoint, m_endPoint); linePen.setColor(QColor(255, 255, 255, 150)); - linePen.setDashPattern(QVector() << 2. << 3.); + linePen.setDashPattern({2., 3.}); linePen.setDashOffset(2.); painter->setPen(linePen); diff --git a/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp b/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp index a4064d7a71..f763aa9b5a 100644 --- a/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp +++ b/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp @@ -81,11 +81,11 @@ void BackgroundAction::emitBackgroundChanged(int index) QList BackgroundAction::colors() { static QColor alphaZero(Qt::transparent); - static QList colorList = QList() << alphaZero - << QColor(Qt::black) - << QColor(Qt::darkGray) - << QColor(Qt::lightGray) - << QColor(Qt::white); + static QList colorList = {alphaZero, + QColor(Qt::black), + QColor(Qt::darkGray), + QColor(Qt::lightGray), + QColor(Qt::white)}; return colorList; diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index 1bd82326f5..1d6ca51a95 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -157,7 +157,7 @@ void DragTool::createQmlItemNodeFromImage(const QString &imageName, FormEditorItem* DragTool::targetContainerOrRootItem(const QList &itemList, FormEditorItem * currentItem) { - FormEditorItem *formEditorItem = containerFormEditorItem(itemList, QList() << currentItem); + FormEditorItem *formEditorItem = containerFormEditorItem(itemList, {currentItem}); if (!formEditorItem) formEditorItem = scene()->rootFormEditorItem(); diff --git a/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp b/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp index 6f4fa9bebb..94b1277a1c 100644 --- a/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp +++ b/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp @@ -109,7 +109,7 @@ void ImportManagerView::removeImport(const Import &import) { try { if (model()) - model()->changeImports(QList(), QList() << import); + model()->changeImports({}, {import}); } catch (const RewritingException &e) { e.showException(); @@ -120,7 +120,7 @@ void ImportManagerView::addImport(const Import &import) { try { if (model()) - model()->changeImports(QList() << import, QList()); + model()->changeImports({import}, {}); } catch (const RewritingException &e) { e.showException(); diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index c338a3b0c5..822156f53a 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -139,7 +139,7 @@ static ComponentTextModifier *createComponentTextModifier(TextModifier *original bool DesignDocument::loadInFileComponent(const ModelNode &componentNode) { - QString componentText = rewriterView()->extractText(QList() << componentNode).value(componentNode); + QString componentText = rewriterView()->extractText({componentNode}).value(componentNode); if (componentText.isEmpty()) return false; @@ -383,7 +383,7 @@ void DesignDocument::copySelected() { QScopedPointer copyModel(Model::create("QtQuick.Rectangle", 1, 0, currentModel())); copyModel->setFileUrl(currentModel()->fileUrl()); - copyModel->changeImports(currentModel()->imports(), QList()); + copyModel->changeImports(currentModel()->imports(), {}); Q_ASSERT(copyModel); @@ -480,7 +480,7 @@ void DesignDocument::paste() { QScopedPointer pasteModel(Model::create("empty", 1, 0, currentModel())); pasteModel->setFileUrl(currentModel()->fileUrl()); - pasteModel->changeImports(currentModel()->imports(), QList()); + pasteModel->changeImports(currentModel()->imports(), {}); Q_ASSERT(pasteModel); @@ -575,7 +575,7 @@ void DesignDocument::paste() transaction.commit(); NodeMetaInfo::clearCache(); - view.setSelectedModelNodes(QList() << pastedNode); + view.setSelectedModelNodes({pastedNode}); transaction.commit(); } catch (const RewritingException &e) { qWarning() << e.description(); //silent error diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp index 5092f5a07f..a69cd2dcdd 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp @@ -114,7 +114,7 @@ QString DesignDocumentView::toText() const ModelNode rewriterNode(rewriterView->rootModelNode()); //get the text of the root item without imports - return rewriterView->extractText(QList() << rewriterNode).value(rewriterNode); + return rewriterView->extractText({rewriterNode}).value(rewriterNode); } void DesignDocumentView::fromText(QString text) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index e9d1ab13ba..8e3ef4418a 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -293,14 +293,14 @@ void ItemLibraryWidget::removeImport(const QString &name) if (import.isLibraryImport() && import.url().compare(name, Qt::CaseInsensitive) == 0) toBeRemovedImportList.append(import); - m_model->changeImports(QList(), toBeRemovedImportList); + m_model->changeImports({}, toBeRemovedImportList); } void ItemLibraryWidget::addImport(const QString &name, const QString &version) { if (!m_model) return; - m_model->changeImports(QList() << Import::createLibraryImport(name, version), QList()); + m_model->changeImports({Import::createLibraryImport(name, version)}, {}); } } diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h index 1bd433d513..f5930c12c1 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h @@ -46,7 +46,7 @@ class ModelNode; : idItem(id), lockItem(lock), visibilityItem(visibility), propertyItems(properties) {} QList toList() const { - return QList() << idItem << lockItem << visibilityItem; + return {idItem, lockItem, visibilityItem}; } QStandardItem *idItem; @@ -62,7 +62,7 @@ class ModelNode; : idItem(id), exportItem(exportI), visibilityItem(visibility), propertyItems(properties) {} QList toList() const { - return QList() << idItem << exportItem << visibilityItem; + return {idItem, exportItem, visibilityItem}; } QStandardItem *idItem; diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp index b61ceb1d49..76613a3790 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp @@ -153,11 +153,12 @@ void StatesEditorView::addState() try { if ((rootStateGroup().allStates().count() < 1) && //QtQuick import might be missing - (!model()->hasImport(Import::createLibraryImport(QLatin1String("QtQuick"), QLatin1String("1.0")), true, true))) - model()->changeImports(QList() << Import::createLibraryImport(QLatin1String("QtQuick"), QLatin1String("1.0")), QList()); + (!model()->hasImport(Import::createLibraryImport("QtQuick", "1.0"), true, true))) { + model()->changeImports({Import::createLibraryImport("QtQuick", "1.0")}, {}); + } ModelNode newState = rootStateGroup().addState(newStateName); setCurrentState(newState); - } catch (const RewritingException &e) { + } catch (const RewritingException &e) { e.showException(); } } diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index a88184bbbd..1026de2287 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -244,9 +244,9 @@ void NodeInstanceView::nodeCreated(const ModelNode &createdNode) propertyList.append(createdNode.variantProperty("y")); updatePosition(propertyList); - nodeInstanceServer()->createInstances(createCreateInstancesCommand(QList() << instance)); + nodeInstanceServer()->createInstances(createCreateInstancesCommand({instance})); nodeInstanceServer()->changePropertyValues(createChangeValueCommand(createdNode.variantProperties())); - nodeInstanceServer()->completeComponent(createComponentCompleteCommand(QList() << instance)); + nodeInstanceServer()->completeComponent(createComponentCompleteCommand({instance})); } /*! Notifies the view that \a removedNode will be removed. @@ -420,7 +420,7 @@ void NodeInstanceView::nodeIdChanged(const ModelNode& node, const QString& /*new { if (hasInstanceForModelNode(node)) { NodeInstance instance = instanceForModelNode(node); - nodeInstanceServer()->changeIds(createChangeIdsCommand(QList() << instance)); + nodeInstanceServer()->changeIds(createChangeIdsCommand({instance})); } } @@ -459,16 +459,16 @@ void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node, const Propert QVariant value = data; if (value.isValid()) { PropertyValueContainer container(instance.instanceId(), name, value, TypeName()); - ChangeAuxiliaryCommand changeAuxiliaryCommand(QVector() << container); + ChangeAuxiliaryCommand changeAuxiliaryCommand({container}); nodeInstanceServer()->changeAuxiliaryValues(changeAuxiliaryCommand); } else { if (node.hasVariantProperty(name)) { PropertyValueContainer container(instance.instanceId(), name, node.variantProperty(name).value(), TypeName()); - ChangeValuesCommand changeValueCommand(QVector() << container); + ChangeValuesCommand changeValueCommand({container}); nodeInstanceServer()->changePropertyValues(changeValueCommand); } else if (node.hasBindingProperty(name)) { PropertyBindingContainer container(instance.instanceId(), name, node.bindingProperty(name).expression(), TypeName()); - ChangeBindingsCommand changeValueCommand(QVector() << container); + ChangeBindingsCommand changeValueCommand({container}); nodeInstanceServer()->changePropertyBindings(changeValueCommand); } } @@ -1082,7 +1082,7 @@ RemovePropertiesCommand NodeInstanceView::createRemovePropertiesCommand(const QL RemoveSharedMemoryCommand NodeInstanceView::createRemoveSharedMemoryCommand(const QString &sharedMemoryTypeName, quint32 keyNumber) { - return RemoveSharedMemoryCommand(sharedMemoryTypeName, QVector() << keyNumber); + return RemoveSharedMemoryCommand(sharedMemoryTypeName, {static_cast(keyNumber)}); } RemoveSharedMemoryCommand NodeInstanceView::createRemoveSharedMemoryCommand(const QString &sharedMemoryTypeName, const QList &nodeList) diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index eff35688c5..68bdf338c6 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -231,7 +231,7 @@ QProcess *PuppetCreator::puppetProcess(const QString &puppetPath, QObject::connect(puppetProcess, SIGNAL(readyRead()), handlerObject, outputSlot); } puppetProcess->setWorkingDirectory(workingDirectory); - puppetProcess->start(puppetPath, QStringList() << socketToken << puppetMode << QLatin1String("-graphicssystem raster")); + puppetProcess->start(puppetPath, {socketToken, puppetMode, "-graphicssystem raster"}); #ifndef QMLDESIGNER_TEST QString debugPuppet = m_designerSettings.value(DesignerSettingsKey:: @@ -621,7 +621,7 @@ bool PuppetCreator::checkPuppetVersion(const QString &qmlPuppetPath) { QProcess qmlPuppetVersionProcess; - qmlPuppetVersionProcess.start(qmlPuppetPath, QStringList() << QLatin1String("--version")); + qmlPuppetVersionProcess.start(qmlPuppetPath, {"--version"}); qmlPuppetVersionProcess.waitForReadyRead(6000); QByteArray versionString = qmlPuppetVersionProcess.readAll(); diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index f3953f1a63..800ffafdf5 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -1251,7 +1251,7 @@ void NodeMetaInfoPrivate::setupPrototypes() } m_prototypes.append(description); } else { - if (context()->lookupType(document(), QStringList() << ov->className())) { + if (context()->lookupType(document(), {ov->className()})) { const Imports *allImports = context()->imports(document()); ImportInfo importInfo = allImports->info(description.className, context().data()); diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp index 63fa98d539..9dfd1b3dc1 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp @@ -331,7 +331,7 @@ void SubComponentManager::registerQmlFile(const QFileInfo &fileInfo, const QStri } if (!model()->metaInfo().itemLibraryInfo()->containsEntry(itemLibraryEntry)) - model()->metaInfo().itemLibraryInfo()->addEntries(QList() << itemLibraryEntry); + model()->metaInfo().itemLibraryInfo()->addEntries({itemLibraryEntry}); } } diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp index f74ba13c45..54e63fae71 100644 --- a/src/plugins/qmldesigner/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/designercore/model/model.cpp @@ -1499,9 +1499,9 @@ static QList toPropertyPairList(const QList() << property); + notifyPropertiesAboutToBeRemoved({property}); - QList propertyPairList = toPropertyPairList(QList() << property); + const QList propertyPairList = toPropertyPairList({property}); removePropertyWithoutNotification(property); @@ -1518,7 +1518,7 @@ void ModelPrivate::setBindingProperty(const InternalNode::Pointer &internalNodeP InternalBindingProperty::Pointer bindingProperty = internalNodePointer->bindingProperty(name); bindingProperty->setExpression(expression); - notifyBindingPropertiesChanged(QList() << bindingProperty, propertyChange); + notifyBindingPropertiesChanged({bindingProperty}, propertyChange); } void ModelPrivate::setSignalHandlerProperty(const InternalNodePointer &internalNodePointer, const PropertyName &name, const QString &source) @@ -1531,7 +1531,7 @@ void ModelPrivate::setSignalHandlerProperty(const InternalNodePointer &internalN InternalSignalHandlerProperty::Pointer signalHandlerProperty = internalNodePointer->signalHandlerProperty(name); signalHandlerProperty->setSource(source); - notifySignalHandlerPropertiesChanged(QVector() << signalHandlerProperty, propertyChange); + notifySignalHandlerPropertiesChanged({signalHandlerProperty}, propertyChange); } void ModelPrivate::setVariantProperty(const InternalNode::Pointer &internalNodePointer, const PropertyName &name, const QVariant &value) @@ -1575,7 +1575,7 @@ void ModelPrivate::setDynamicBindingProperty(const InternalNodePointer &internal InternalBindingProperty::Pointer bindingProperty = internalNodePointer->bindingProperty(name); bindingProperty->setDynamicExpression(dynamicPropertyType, expression); - notifyBindingPropertiesChanged(QList() << bindingProperty, propertyChange); + notifyBindingPropertiesChanged({bindingProperty}, propertyChange); } void ModelPrivate::reparentNode(const InternalNode::Pointer &newParentNode, diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp index 35a3c54884..a156932237 100644 --- a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp @@ -157,7 +157,7 @@ ModelNode ModelMerger::insertModel(const ModelNode &modelNode) newImports.append(import); } - view()->model()->changeImports(newImports, QList()); + view()->model()->changeImports(newImports, {}); QHash idRenamingHash; setupIdRenamingHash(modelNode, idRenamingHash, view()); @@ -168,7 +168,7 @@ ModelNode ModelMerger::insertModel(const ModelNode &modelNode) void ModelMerger::replaceModel(const ModelNode &modelNode) { - view()->model()->changeImports(modelNode.model()->imports(), QList()); + view()->model()->changeImports(modelNode.model()->imports(), {}); view()->model()->setFileUrl(modelNode.model()->fileUrl()); try { diff --git a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp index 53a1e592fa..c7a9e5aa28 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp @@ -278,12 +278,12 @@ AnchorLineType QmlAnchors::possibleAnchorLines(AnchorLineType sourceAnchorLineTy return AnchorLineInvalid; if (AnchorLine::isHorizontalAnchorLine(sourceAnchorLineType)) { - if (!detectHorizontalCycle(targetQmlItemNode, QList() << qmlItemNode().modelNode())) + if (!detectHorizontalCycle(targetQmlItemNode, {qmlItemNode().modelNode()})) return AnchorLineHorizontalMask; } if (AnchorLine::isVerticalAnchorLine(sourceAnchorLineType)) { - if (!detectVerticalCycle(targetQmlItemNode, QList() << qmlItemNode().modelNode())) + if (!detectVerticalCycle(targetQmlItemNode, {qmlItemNode().modelNode()})) return AnchorLineVerticalMask; } diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 637e23ddc4..94a7f4efd7 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -868,7 +868,7 @@ void TextToModelMerger::setupPossibleImports(const QmlJS::Snapshot &snapshot, co void TextToModelMerger::setupUsedImports() { - QList allImports = m_scopeChain->context()->imports(m_document.data())->all(); + const QList allImports = m_scopeChain->context()->imports(m_document.data())->all(); QList usedImports; @@ -1110,7 +1110,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, || isConnectionsType(typeName)) { AbstractProperty modelProperty = modelNode.property(astPropertyName.toUtf8()); if (context->isArrayProperty(propertyType, containingObject, name)) - syncArrayProperty(modelProperty, QList() << member, context, differenceHandler); + syncArrayProperty(modelProperty, {member}, context, differenceHandler); else syncNodeProperty(modelProperty, binding, context, TypeName(), differenceHandler); modelPropertyNames.remove(astPropertyName.toUtf8()); @@ -1710,12 +1710,12 @@ void ModelValidator::idsDiffer(ModelNode &modelNode, const QString &qmlId) void ModelAmender::modelMissesImport(const QmlDesigner::Import &import) { - m_merger->view()->model()->changeImports(QList() << import, QList()); + m_merger->view()->model()->changeImports({import}, {}); } void ModelAmender::importAbsentInQMl(const QmlDesigner::Import &import) { - m_merger->view()->model()->changeImports(QList(), QList() << import); + m_merger->view()->model()->changeImports({}, {import}); } void ModelAmender::bindingExpressionsDiffer(BindingProperty &modelProperty, @@ -1937,7 +1937,7 @@ void TextToModelMerger::setupComponent(const ModelNode &node) if (!node.isValid()) return; - QString componentText = m_rewriterView->extractText(QList() << node).value(node); + QString componentText = m_rewriterView->extractText({node}).value(node); if (componentText.isEmpty()) return; @@ -2054,7 +2054,7 @@ void TextToModelMerger::setupCustomParserNode(const ModelNode &node) if (!node.isValid()) return; - QString modelText = m_rewriterView->extractText(QList() << node).value(node); + QString modelText = m_rewriterView->extractText({node}).value(node); if (modelText.isEmpty()) return; diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index e1bff9bfb6..01c93391e9 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -347,7 +347,7 @@ void DesignModeWidget::setup() // Finishing touches: m_mainSplitter->setStretchFactor(1, 1); - m_mainSplitter->setSizes(QList() << 150 << 300 << 150); + m_mainSplitter->setSizes({150, 300, 150}); QLayout *mainLayout = new QBoxLayout(QBoxLayout::RightToLeft, this); mainLayout->setMargin(0); diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp index abf45bfbb1..ad9f82814a 100644 --- a/src/plugins/qmldesigner/documentmanager.cpp +++ b/src/plugins/qmldesigner/documentmanager.cpp @@ -455,7 +455,7 @@ bool DocumentManager::addResourceFileToIsoProject(const QString &resourceFilePro if (!projectNode) return false; - if (!projectNode->addFiles(QStringList() << resourceFilePath)) { + if (!projectNode->addFiles({resourceFilePath})) { qCWarning(documentManagerLog) << "Failed to add resource file to" << projectNode->displayName(); return false; } diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/backendmodel.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/backendmodel.cpp index d8f27848e8..312f2d8327 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/backendmodel.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/backendmodel.cpp @@ -183,7 +183,7 @@ void BackendModel::deletePropertyByRow(int rowNumber) try { if (model->hasImport(import)) - model->changeImports(QList(), QList { import } ); + model->changeImports({}, {import}); } catch (const Exception &e) { e.showException(); } @@ -241,7 +241,7 @@ void BackendModel::addNewBackend() */ if (!model->hasImport(import)) - model->changeImports(QList { import }, QList()); + model->changeImports({import}, {}); QString propertyName = m_connectionView->generateNewId(typeName); -- cgit v1.2.3