diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2017-04-26 13:17:14 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2017-04-28 08:58:19 +0000 |
| commit | a991ecec957ca4f3c8401af2e9d6c5013a9a0bd5 (patch) | |
| tree | 2aa903953e42c54db10a07849fa651d0649ead40 /src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | |
| parent | edbaea4f605cc48fabeb8d2ca4f8a1020d7aef5b (diff) | |
QmlDesigner: use initilizer_lists for pairs
Change-Id: I3a1ef67d8af255604494695807331576540b8afa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 800ffafdf5..a95c455134 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -286,13 +286,13 @@ public: if (ref) { QVector<PropertyInfo> dotProperties; const TypeName type = resolveTypeName(ref, m_context, dotProperties); - m_properties.append(qMakePair(propertyName, type)); + m_properties.append({propertyName, type}); if (!dotProperties.isEmpty()) { foreach (const PropertyInfo &propertyInfo, dotProperties) { PropertyName dotName = propertyInfo.first; TypeName type = propertyInfo.second; dotName = propertyName + '.' + dotName; - m_properties.append(qMakePair(dotName, type)); + m_properties.append({dotName, type}); } } } else { @@ -300,7 +300,7 @@ public: if (const CppComponentValue * cppComponentValue = value_cast<CppComponentValue>(value)) { TypeName qualifiedTypeName = qualifiedTypeNameForContext(cppComponentValue, m_context->viewerContext(), *m_context->snapshot().importDependencies()).toUtf8(); - m_properties.append(qMakePair(propertyName, qualifiedTypeName)); + m_properties.append({propertyName, qualifiedTypeName}); } else { TypeId typeId; TypeName typeName = typeId(value).toUtf8(); @@ -311,7 +311,7 @@ public: typeName = "real"; } } - m_properties.append(qMakePair(propertyName, typeName)); + m_properties.append({propertyName, typeName}); } } return true; @@ -424,7 +424,7 @@ QVector<PropertyInfo> getQmlTypes(const CppComponentValue *objectValue, const Co foreach (const PropertyInfo &propertyInfo, dotProperties) { const PropertyName dotName = name + '.' + propertyInfo.first; const TypeName type = propertyInfo.second; - propertyList.append(qMakePair(dotName, type)); + propertyList.append({dotName, type}); } } } @@ -435,7 +435,7 @@ QVector<PropertyInfo> getQmlTypes(const CppComponentValue *objectValue, const Co foreach (const PropertyInfo &propertyInfo, dotProperties) { const PropertyName dotName = name + '.' + propertyInfo.first; const TypeName type = propertyInfo.second; - propertyList.append(qMakePair(dotName, type)); + propertyList.append({dotName, type}); } } } @@ -446,7 +446,7 @@ QVector<PropertyInfo> getQmlTypes(const CppComponentValue *objectValue, const Co if (type == "unknown" && objectValue->hasProperty(nameAsString)) type = objectValue->propertyType(nameAsString).toUtf8(); - propertyList.append(qMakePair(name, type)); + propertyList.append({name, type}); } if (!local) |