diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp index 5d82561d68b..84908df7d05 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp @@ -541,13 +541,11 @@ void CMakeTool::parseFromCapabilities(const QString &input) const const QVariantMap object = r.toMap(); const QString kind = object.value("kind").toString(); const QVariantList versionList = object.value("version").toList(); - std::pair highestVersion = std::make_pair(-1, -1); + std::pair highestVersion{-1, -1}; for (const QVariant &v : versionList) { const QVariantMap versionObject = v.toMap(); - const std::pair version = std::make_pair(getVersion(versionObject, - "major"), - getVersion(versionObject, - "minor")); + const std::pair version{getVersion(versionObject, "major"), + getVersion(versionObject, "minor")}; if (version.first > highestVersion.first || (version.first == highestVersion.first && version.second > highestVersion.second)) @@ -566,9 +564,9 @@ void CMakeTool::parseFromCapabilities(const QString &input) const // Fix up fileapi support for cmake 3.14: if (m_introspection->m_version.major == 3 && m_introspection->m_version.minor == 14) { - m_introspection->m_fileApis.append({QString("codemodel"), std::make_pair(2, 0)}); - m_introspection->m_fileApis.append({QString("cache"), std::make_pair(2, 0)}); - m_introspection->m_fileApis.append({QString("cmakefiles"), std::make_pair(1, 0)}); + m_introspection->m_fileApis.append({QString("codemodel"), {2, 0}}); + m_introspection->m_fileApis.append({QString("cache"), {2, 0}}); + m_introspection->m_fileApis.append({QString("cmakefiles"), {1, 0}}); } } diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp index 804f6a0841b..4abee299646 100644 --- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp +++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp @@ -699,7 +699,7 @@ void setupLocationInfoForTargets(CMakeProjectNode *rootNode, const QList result; for (const FolderNode::LocationInfo &i : bt) { int count = locations.count(); - locations.insert(std::make_pair(i.path, i.line)); + locations.insert({i.path, i.line}); if (count != locations.count()) { result.append(i); } diff --git a/src/plugins/cmakeprojectmanager/fileapiparser.cpp b/src/plugins/cmakeprojectmanager/fileapiparser.cpp index ea323931559..adf05be72ea 100644 --- a/src/plugins/cmakeprojectmanager/fileapiparser.cpp +++ b/src/plugins/cmakeprojectmanager/fileapiparser.cpp @@ -52,7 +52,7 @@ static std::pair cmakeVersion(const QJsonObject &obj) const QJsonObject version = obj.value("version").toObject(); const int major = version.value("major").toInt(-1); const int minor = version.value("minor").toInt(-1); - return std::make_pair(major, minor); + return {major, minor}; } static bool checkJsonObject(const QJsonObject &obj, const QString &kind, int major, int minor = -1) @@ -67,7 +67,7 @@ static bool checkJsonObject(const QJsonObject &obj, const QString &kind, int maj static std::pair nameValue(const QJsonObject &obj) { - return std::make_pair(obj.value("name").toString(), obj.value("value").toString()); + return {obj.value("name").toString(), obj.value("value").toString()}; } static QJsonDocument readJsonFile(const FilePath &filePath)