diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-10-24 10:50:33 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-11-16 15:11:15 +0000 |
| commit | 4432ba4949647917d0fc3fb2ef73f9737a7c2431 (patch) | |
| tree | e36f48e90f7019ad0ecfb7046638cebf3410930e /src/app/qbs-setup-android | |
| parent | a0c61e70eeefbf9d6c632a94d29bcc2a7e97b7d7 (diff) | |
STL compatibility: use empty() instead of isEmpty()
This is a simple find and replace with manual sanity check.
Change-Id: Iab6d46dcc3be246d1650aae2b1730f933b717be8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/app/qbs-setup-android')
| -rw-r--r-- | src/app/qbs-setup-android/android-setup.cpp | 4 | ||||
| -rw-r--r-- | src/app/qbs-setup-android/commandlineparser.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/app/qbs-setup-android/android-setup.cpp b/src/app/qbs-setup-android/android-setup.cpp index e5ad9e845..7a749f374 100644 --- a/src/app/qbs-setup-android/android-setup.cpp +++ b/src/app/qbs-setup-android/android-setup.cpp @@ -198,7 +198,7 @@ static void setupNdk(qbs::Settings *settings, const QString &profileName, const mainProfile.setValue(qls("qbs.toolchain"), QStringList() << qls("gcc")); const QStringList archs = expectedArchs(); const QtInfoPerArch infoPerArch = getQtAndroidInfo(qtSdkDirPath); - mainProfile.setValue(qls("qbs.architectures"), infoPerArch.isEmpty() + mainProfile.setValue(qls("qbs.architectures"), infoPerArch.empty() ? archs : QStringList(infoPerArch.keys())); QStringList searchPaths; QString platform; @@ -227,7 +227,7 @@ static void setupNdk(qbs::Settings *settings, const QString &profileName, const searchPaths << p.p.value(qls("preferences.qbsSearchPaths")).toStringList(); platform = maximumPlatform(platform, qtAndroidInfo.platform); } - if (!searchPaths.isEmpty()) + if (!searchPaths.empty()) mainProfile.setValue(qls("preferences.qbsSearchPaths"), searchPaths); if (!platform.isEmpty()) mainProfile.setValue(qls("Android.ndk.platform"), platform); diff --git a/src/app/qbs-setup-android/commandlineparser.cpp b/src/app/qbs-setup-android/commandlineparser.cpp index 174016480..1bdf2188b 100644 --- a/src/app/qbs-setup-android/commandlineparser.cpp +++ b/src/app/qbs-setup-android/commandlineparser.cpp @@ -60,7 +60,7 @@ static QString qtSdkDirOption() { return QLatin1String("--qt-dir"); } void CommandLineParser::parse(const QStringList &commandLine) { m_commandLine = commandLine; - Q_ASSERT(!m_commandLine.isEmpty()); + Q_ASSERT(!m_commandLine.empty()); m_command = QFileInfo(m_commandLine.takeFirst()).fileName(); m_helpRequested = false; m_sdkDir.clear(); @@ -68,10 +68,10 @@ void CommandLineParser::parse(const QStringList &commandLine) m_profileName.clear(); m_settingsDir.clear(); - if (m_commandLine.isEmpty()) + if (m_commandLine.empty()) throwError(Tr::tr("No command-line arguments provided.")); - while (!m_commandLine.isEmpty()) { + while (!m_commandLine.empty()) { const QString arg = m_commandLine.front(); if (!arg.startsWith(QLatin1Char('-'))) break; @@ -89,7 +89,7 @@ void CommandLineParser::parse(const QStringList &commandLine) } if (m_helpRequested) { - if (!m_commandLine.isEmpty()) + if (!m_commandLine.empty()) complainAboutExtraArguments(); return; } @@ -129,7 +129,7 @@ QString CommandLineParser::usageString() const void CommandLineParser::assignOptionArgument(const QString &option, QString &argument) { - if (m_commandLine.isEmpty()) + if (m_commandLine.empty()) throwError(Tr::tr("Option '%1' needs an argument.").arg(option)); argument = m_commandLine.takeFirst(); if (argument.isEmpty()) |