diff options
Diffstat (limited to 'src/plugins/qmldesigner/components')
11 files changed, 25 insertions, 24 deletions
diff --git a/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp b/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp index b52faf065a5..39638e3fcba 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<Import>() << layoutImport, QList<Import>()); + context.view()-> model()->changeImports({layoutImport}, {}); } } diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index c26f9704411..9d161ddba78 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<ModelNode>() << 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 d199b9cd713..69958aaeaec 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<double>() << 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<double>() << 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 a4064d7a71d..f763aa9b5a2 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<QColor> BackgroundAction::colors() { static QColor alphaZero(Qt::transparent); - static QList<QColor> colorList = QList<QColor>() << alphaZero - << QColor(Qt::black) - << QColor(Qt::darkGray) - << QColor(Qt::lightGray) - << QColor(Qt::white); + static QList<QColor> 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 1bd82326f51..1d6ca51a957 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<QGraphicsItem*> &itemList, FormEditorItem * currentItem) { - FormEditorItem *formEditorItem = containerFormEditorItem(itemList, QList<FormEditorItem*>() << 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 6f4fa9bebb0..94b1277a1c6 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<Import>(), QList<Import>() << 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>() << import, QList<Import>()); + 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 c338a3b0c59..822156f53a8 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<ModelNode>() << componentNode).value(componentNode); + QString componentText = rewriterView()->extractText({componentNode}).value(componentNode); if (componentText.isEmpty()) return false; @@ -383,7 +383,7 @@ void DesignDocument::copySelected() { QScopedPointer<Model> copyModel(Model::create("QtQuick.Rectangle", 1, 0, currentModel())); copyModel->setFileUrl(currentModel()->fileUrl()); - copyModel->changeImports(currentModel()->imports(), QList<Import>()); + copyModel->changeImports(currentModel()->imports(), {}); Q_ASSERT(copyModel); @@ -480,7 +480,7 @@ void DesignDocument::paste() { QScopedPointer<Model> pasteModel(Model::create("empty", 1, 0, currentModel())); pasteModel->setFileUrl(currentModel()->fileUrl()); - pasteModel->changeImports(currentModel()->imports(), QList<Import>()); + pasteModel->changeImports(currentModel()->imports(), {}); Q_ASSERT(pasteModel); @@ -575,7 +575,7 @@ void DesignDocument::paste() transaction.commit(); NodeMetaInfo::clearCache(); - view.setSelectedModelNodes(QList<ModelNode>() << 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 5092f5a07f0..a69cd2dcdd6 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<ModelNode>() << 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 e9d1ab13ba7..8e3ef4418ac 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<Import>(), toBeRemovedImportList); + m_model->changeImports({}, toBeRemovedImportList); } void ItemLibraryWidget::addImport(const QString &name, const QString &version) { if (!m_model) return; - m_model->changeImports(QList<Import>() << Import::createLibraryImport(name, version), QList<Import>()); + 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 1bd433d5136..f5930c12c12 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<QStandardItem*> toList() const { - return QList<QStandardItem*>() << idItem << lockItem << visibilityItem; + return {idItem, lockItem, visibilityItem}; } QStandardItem *idItem; @@ -62,7 +62,7 @@ class ModelNode; : idItem(id), exportItem(exportI), visibilityItem(visibility), propertyItems(properties) {} QList<QStandardItem*> toList() const { - return QList<QStandardItem*>() << 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 b61ceb1d49a..76613a37909 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>() << Import::createLibraryImport(QLatin1String("QtQuick"), QLatin1String("1.0")), QList<Import>()); + (!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(); } } |