From 50f2f57f6a783aa59d14326313fb9907e8b4ed86 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 30 Sep 2022 15:17:36 +0200 Subject: [PATCH] ProjectExplorer: Limit the usage of std::make_pair Make the code less verbose. Change-Id: I4d671a49a6b8097d4a324bdd9f6a2c9dbdb225cc Reviewed-by: Christian Kandeler Reviewed-by: --- .../projectexplorer/jsonwizard/jsonwizardfactory.cpp | 2 +- src/plugins/projectexplorer/toolchain.cpp | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp index 54d0323accf..63723c757b3 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp @@ -300,7 +300,7 @@ std::pair JsonWizardFactory::screenSizeInfoFromPage(const QStr if (values.isEmpty()) return {}; - return std::make_pair(index, values); + return {index, values}; } JsonWizardFactory::Page JsonWizardFactory::parsePage(const QVariant &value, QString *errorMessage) diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index 9c97e71ba31..0776ef7ce0f 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -685,11 +685,9 @@ static QString badToolchainTimestampKey() { return {"Timestamp"}; } QVariantMap BadToolchain::toMap() const { - return { - std::make_pair(badToolchainFilePathKey(), filePath.toVariant()), - std::make_pair(badToolchainSymlinkTargetKey(), symlinkTarget.toVariant()), - std::make_pair(badToolchainTimestampKey(), timestamp.toMSecsSinceEpoch()), - }; + return {{badToolchainFilePathKey(), filePath.toVariant()}, + {badToolchainSymlinkTargetKey(), symlinkTarget.toVariant()}, + {badToolchainTimestampKey(), timestamp.toMSecsSinceEpoch()}}; } BadToolchain BadToolchain::fromMap(const QVariantMap &map)