aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@theqtcompany.com>2016-06-20 14:36:52 +0200
committerTim Jenssen <tim.jenssen@theqtcompany.com>2016-06-22 13:16:33 +0000
commit5a11d5cd5ba46c7b077e470fa0be07ed1adc758a (patch)
treef43485bd17686f023aa83049f8a953747d56fc50 /share/qtcreator
parentb0320387817ab0b4f8c4edfa258414b72bfdb105 (diff)
QmlDesigner: use initializer lists
Change-Id: Ie93861c7d8a5b2863ec8b111afceacc2c163715b Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Diffstat (limited to 'share/qtcreator')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp2
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp3
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp6
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp3
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp18
5 files changed, 17 insertions, 15 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);
}