feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMakeProjectManager: Limit the usage of std::make_pair

Browse Source 
Make the code less verbose.

Change-Id: I8dc194f0cb4ed38c4c117482a7011019444edc40
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Jarek Kobus
2022-09-30 14:58:22 +02:00
parent 55efe40a58
commit 5ab100a2b9
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cmakeprojectmanager/cmaketool.cpp
View File

@@ -541,13 +541,11 @@ void CMakeTool::parseFromCapabilities(const QString &input) const
const QVariantMap object = r.toMap(); const QVariantMap object = r.toMap();
const QString kind = object.value("kind").toString(); const QString kind = object.value("kind").toString();
const QVariantList versionList = object.value("version").toList(); const QVariantList versionList = object.value("version").toList();
std::pair<int, int> highestVersion = std::make_pair(-1, -1); std::pair<int, int> highestVersion{-1, -1};
for (const QVariant &v : versionList) { for (const QVariant &v : versionList) {
const QVariantMap versionObject = v.toMap(); const QVariantMap versionObject = v.toMap();
const std::pair<int, int> version = std::make_pair(getVersion(versionObject, const std::pair<int, int> version{getVersion(versionObject, "major"),
"major"), getVersion(versionObject, "minor")};
getVersion(versionObject,
"minor"));
if (version.first > highestVersion.first if (version.first > highestVersion.first
|| (version.first == highestVersion.first || (version.first == highestVersion.first
&& version.second > highestVersion.second)) && version.second > highestVersion.second))
@@ -566,9 +564,9 @@ void CMakeTool::parseFromCapabilities(const QString &input) const
// Fix up fileapi support for cmake 3.14: // Fix up fileapi support for cmake 3.14:
if (m_introspection->m_version.major == 3 && m_introspection->m_version.minor == 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("codemodel"), {2, 0}});
m_introspection->m_fileApis.append({QString("cache"), std::make_pair(2, 0)}); m_introspection->m_fileApis.append({QString("cache"), {2, 0}});
m_introspection->m_fileApis.append({QString("cmakefiles"), std::make_pair(1, 0)}); m_introspection->m_fileApis.append({QString("cmakefiles"), {1, 0}});
} }
} }

2
src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
View File

@@ -699,7 +699,7 @@ void setupLocationInfoForTargets(CMakeProjectNode *rootNode, const QList<CMakeBu
QVector<FolderNode::LocationInfo> result; QVector<FolderNode::LocationInfo> result;
for (const FolderNode::LocationInfo &i : bt) { for (const FolderNode::LocationInfo &i : bt) {
int count = locations.count(); int count = locations.count();
locations.insert(std::make_pair(i.path, i.line)); locations.insert({i.path, i.line});
if (count != locations.count()) { if (count != locations.count()) {
result.append(i); result.append(i);
} }

4
src/plugins/cmakeprojectmanager/fileapiparser.cpp
View File

@@ -52,7 +52,7 @@ static std::pair<int, int> cmakeVersion(const QJsonObject &obj)
const QJsonObject version = obj.value("version").toObject(); const QJsonObject version = obj.value("version").toObject();
const int major = version.value("major").toInt(-1); const int major = version.value("major").toInt(-1);
const int minor = version.value("minor").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) 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<QString, QString> nameValue(const QJsonObject &obj) static std::pair<QString, QString> 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) static QJsonDocument readJsonFile(const FilePath &filePath)