diff options
10 files changed, 32 insertions, 30 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp index 5630327eb9..0e360cb028 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp @@ -65,7 +65,7 @@ void BehaviorNodeInstance::resetProperty(const PropertyName &name) PropertyNameList BehaviorNodeInstance::ignoredProperties() const { - return PropertyNameList() << "enabled"; + return PropertyNameList({"enabled"}); } diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp index 40bea716ea..e92b6a9a51 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp @@ -70,7 +70,8 @@ void LayoutNodeInstance::refreshLayoutable() PropertyNameList LayoutNodeInstance::ignoredProperties() const { - return PropertyNameList() << "move" << "add" << "populate"; + static const PropertyNameList properties({"move", "add", "populate"}); + return properties; } } diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp index 4e222bcd14..1e58cdf55b 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp @@ -76,8 +76,8 @@ void PositionerNodeInstance::refreshLayoutable() PropertyNameList PositionerNodeInstance::ignoredProperties() const { - return PropertyNameList() << "move" << "add" << "populate"; -} - + static const PropertyNameList properties({"move", "add", "populate"}); + return properties; } +} // namespace Internal } // namespace QmlDesigner diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp index 12e6d5070a..ff94549b06 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp @@ -52,7 +52,8 @@ bool QmlTransitionNodeInstance::isTransition() const PropertyNameList QmlTransitionNodeInstance::ignoredProperties() const { - return PropertyNameList() << "from" << "to"; + static const PropertyNameList properties({"from", "to"}); + return properties; } } diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp index 8fb7cc3347..c84dcc468e 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp @@ -734,15 +734,15 @@ bool QuickItemNodeInstance::hasAnchor(const PropertyName &name) const static bool isValidAnchorName(const PropertyName &name) { - static PropertyNameList anchorNameList(PropertyNameList() << "anchors.top" - << "anchors.left" - << "anchors.right" - << "anchors.bottom" - << "anchors.verticalCenter" - << "anchors.horizontalCenter" - << "anchors.fill" - << "anchors.centerIn" - << "anchors.baseline"); + static PropertyNameList anchorNameList({"anchors.top", + "anchors.left", + "anchors.right", + "anchors.bottom", + "anchors.verticalCenter", + "anchors.horizontalCenter", + "anchors.fill", + "anchors.centerIn", + "anchors.baseline"}); return anchorNameList.contains(name); } diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 664be17399..1e3f09fac2 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -527,7 +527,7 @@ void FormEditorView::instancePropertyChange(const QList<QPair<ModelNode, Propert const QmlItemNode itemNode(nodePropertyPair.first); const PropertyName propertyName = nodePropertyPair.second; if (itemNode.isValid() && scene()->hasItemForQmlItemNode(itemNode)) { - static PropertyNameList skipList = PropertyNameList() << "x" << "y" << "width" << "height"; + static const PropertyNameList skipList({"x", "y", "width", "height"}); if (!skipList.contains(propertyName)) { m_scene->synchronizeOtherProperty(itemNode, propertyName); m_currentTool->formEditorItemsChanged(QList<FormEditorItem*>() << m_scene->itemForQmlItemNode(itemNode)); diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index d5bcfaff6b..1f5de33400 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -124,7 +124,7 @@ NodeInstanceView::~NodeInstanceView() bool isSkippedRootNode(const ModelNode &node) { - static PropertyNameList skipList = PropertyNameList() << "Qt.ListModel" << "QtQuick.ListModel" << "Qt.ListModel" << "QtQuick.ListModel"; + static const PropertyNameList skipList({"Qt.ListModel", "QtQuick.ListModel", "Qt.ListModel", "QtQuick.ListModel"}); if (skipList.contains(node.type())) return true; @@ -135,7 +135,7 @@ bool isSkippedRootNode(const ModelNode &node) bool isSkippedNode(const ModelNode &node) { - static PropertyNameList skipList = PropertyNameList() << "QtQuick.XmlRole" << "Qt.XmlRole" << "QtQuick.ListElement" << "Qt.ListElement"; + static const PropertyNameList skipList({"QtQuick.XmlRole", "Qt.XmlRole", "QtQuick.ListElement", "Qt.ListElement"}); if (skipList.contains(node.type())) return true; diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 66270c0dfe..67a6840d13 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -332,15 +332,15 @@ private: static inline bool isValueType(const TypeName &type) { - static PropertyTypeList objectValuesList(PropertyTypeList() - << "QFont" << "QPoint" << "QPointF" << "QSize" << "QSizeF" << "QVector3D" << "QVector2D"); + static const PropertyTypeList objectValuesList({"QFont", "QPoint", "QPointF", + "QSize", "QSizeF", "QVector3D", "QVector2D"}); return objectValuesList.contains(type); } static inline bool isValueType(const QString &type) { - static QStringList objectValuesList(QStringList() - << "QFont" << "QPoint" << "QPointF" << "QSize" << "QSizeF" << "QVector3D" << "QVector2D"); + static const QStringList objectValuesList({"QFont", "QPoint", "QPointF", + "QSize", "QSizeF", "QVector3D", "QVector2D"}); return objectValuesList.contains(type); } diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp index 7c65ccc67f..5470260c2d 100644 --- a/src/plugins/qmldesigner/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/designercore/model/model.cpp @@ -1488,7 +1488,7 @@ void ModelPrivate::setVariantProperty(const InternalNode::Pointer &internalNodeP internalNodePointer->variantProperty(name)->setValue(value); internalNodePointer->variantProperty(name)->resetDynamicTypeName(); - notifyVariantPropertiesChanged(internalNodePointer, PropertyNameList() << name, propertyChange); + notifyVariantPropertiesChanged(internalNodePointer, PropertyNameList({name}), propertyChange); } void ModelPrivate::setDynamicVariantProperty(const InternalNodePointer &internalNodePointer, @@ -1503,7 +1503,7 @@ void ModelPrivate::setDynamicVariantProperty(const InternalNodePointer &internal } internalNodePointer->variantProperty(name)->setDynamicValue(dynamicPropertyType, value); - notifyVariantPropertiesChanged(internalNodePointer, PropertyNameList() << name, propertyChange); + notifyVariantPropertiesChanged(internalNodePointer, PropertyNameList({name}), propertyChange); } void ModelPrivate::setDynamicBindingProperty(const InternalNodePointer &internalNodePointer, diff --git a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp index 4aad77f709..263cfb63a7 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp @@ -187,8 +187,8 @@ bool detectHorizontalCycle(const ModelNode &node, QList<ModelNode> knownNodeList knownNodeList.append(node); - static PropertyNameList validAnchorLines(PropertyNameList() << "right" << "left" << "horizontalCenter"); - static PropertyNameList anchorNames(PropertyNameList() << "anchors.right" << "anchors.left" << "anchors.horizontalCenter"); + static const PropertyNameList validAnchorLines({"right", "left", "horizontalCenter"}); + static const PropertyNameList anchorNames({"anchors.right", "anchors.left", "anchors.horizontalCenter"}); foreach (const PropertyName &anchorName, anchorNames) { if (node.hasBindingProperty(anchorName)) { @@ -204,7 +204,7 @@ bool detectHorizontalCycle(const ModelNode &node, QList<ModelNode> knownNodeList } - static PropertyNameList anchorShortcutNames(PropertyNameList() << "anchors.fill" << "anchors.centerIn"); + static const PropertyNameList anchorShortcutNames({"anchors.fill", "anchors.centerIn"}); foreach (const PropertyName &anchorName, anchorShortcutNames) { if (node.hasBindingProperty(anchorName)) { ModelNode targetNode = node.bindingProperty(anchorName).resolveToModelNode(); @@ -227,8 +227,8 @@ bool detectVerticalCycle(const ModelNode &node, QList<ModelNode> knownNodeList) knownNodeList.append(node); - static PropertyNameList validAnchorLines(PropertyNameList() << "top" << "bottom" << "verticalCenter" << "baseline"); - static PropertyNameList anchorNames(PropertyNameList() << "anchors.top" << "anchors.bottom" << "anchors.verticalCenter" << "anchors.baseline"); + 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) { if (node.hasBindingProperty(anchorName)) { @@ -244,7 +244,7 @@ bool detectVerticalCycle(const ModelNode &node, QList<ModelNode> knownNodeList) } - static PropertyNameList anchorShortcutNames(PropertyNameList() << "anchors.fill" << "anchors.centerIn"); + static const PropertyNameList anchorShortcutNames({"anchors.fill", "anchors.centerIn"}); foreach (const PropertyName &anchorName, anchorShortcutNames) { if (node.hasBindingProperty(anchorName)) { ModelNode targetNode = node.bindingProperty(anchorName).resolveToModelNode(); |