diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-03-14 13:31:01 -0700 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-03-22 11:09:37 +0000 |
| commit | ea392e1932f8cdfde64b79c303eb2d704862c36a (patch) | |
| tree | d24d294c93805bb6be79af1bd9386b47a2614180 /src/app/qbs | |
| parent | c411f577f9febc42d5a26827257526700b771ede (diff) | |
Replace all uses of QPair/qMakePair with std::pair/std::make_pair
Change-Id: I1cde37fcf30b066130b9f5ff13743af009a6cb4f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/app/qbs')
| -rw-r--r-- | src/app/qbs/parser/commandlineparser.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp index 074dedc47..ff42d1bab 100644 --- a/src/app/qbs/parser/commandlineparser.cpp +++ b/src/app/qbs/parser/commandlineparser.cpp @@ -60,9 +60,10 @@ #include <QtCore/qcoreapplication.h> #include <QtCore/qdir.h> #include <QtCore/qmap.h> -#include <QtCore/qpair.h> #include <QtCore/qtextstream.h> +#include <utility> + #ifdef Q_OS_UNIX #include <unistd.h> #endif @@ -291,7 +292,7 @@ QList<QVariantMap> CommandLineParser::buildConfigurations() const { // first: configuration name, second: properties. // Empty configuration name used for global properties. - typedef QPair<QString, QVariantMap> PropertyListItem; + typedef std::pair<QString, QVariantMap> PropertyListItem; QList<PropertyListItem> propertiesPerConfiguration; const QString configurationNameKey = QLatin1String("qbs.configurationName"); @@ -300,7 +301,8 @@ QList<QVariantMap> CommandLineParser::buildConfigurations() const foreach (const QString &arg, d->command->additionalArguments()) { const int sepPos = arg.indexOf(QLatin1Char(':')); if (sepPos == -1) { // New build configuration found. - propertiesPerConfiguration << qMakePair(currentConfigurationName, currentProperties); + propertiesPerConfiguration << std::make_pair(currentConfigurationName, + currentProperties); currentConfigurationName = arg; currentProperties.clear(); continue; @@ -316,7 +318,7 @@ QList<QVariantMap> CommandLineParser::buildConfigurations() const currentProperties.insert(property, representationToSettingsValue(rawString)); } } - propertiesPerConfiguration << qMakePair(currentConfigurationName, currentProperties); + propertiesPerConfiguration << std::make_pair(currentConfigurationName, currentProperties); if (propertiesPerConfiguration.count() == 1) // No configuration name specified on command line. propertiesPerConfiguration << PropertyListItem(QStringLiteral("default"), QVariantMap()); |