From 670616c6f92500ae8d17539a74f088e06264dd7f Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 16 Feb 2021 20:40:12 +0100 Subject: [PATCH] Android: Use qAsConst with non-const Qt containers in range-loops Change-Id: I1242a5c62a27b7b8f30bb7b43ff406eceb4135f7 Reviewed-by: Assam Boudjelthia --- src/plugins/android/androidavdmanager.cpp | 2 +- src/plugins/android/androidconfigurations.cpp | 2 +- src/plugins/android/androidrunnerworker.cpp | 4 ++-- src/plugins/android/androidsdkmanager.cpp | 4 ++-- src/plugins/android/androidsdkmodel.cpp | 2 +- src/plugins/android/androidsdkpackage.cpp | 2 +- src/plugins/android/avddialog.cpp | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index c000a623544..7fb12a49d64 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/src/plugins/android/androidavdmanager.cpp @@ -403,7 +403,7 @@ AndroidDeviceInfoList AvdManagerOutputParser::listVirtualDevices(const AndroidCo avdList = parseAvdList(output); } while (output.contains(avdManufacturerError)); - for (const QString &avdPathStr : avdErrorPaths) + for (const QString &avdPathStr : qAsConst(avdErrorPaths)) AvdConfigEditManufacturerTag(avdPathStr, true); return avdList; diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index a57e9e851a0..34593bb340f 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1494,7 +1494,7 @@ FilePath AndroidConfig::getJdkPath() #endif // Q_OS_WIN } - for (const QString &version : allVersions) { + for (const QString &version : qAsConst(allVersions)) { settings->beginGroup(version); jdkHome = FilePath::fromUserInput(settings->value("JavaHome").toString()); settings->endGroup(); diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index ac27b3b14c6..b07e6210599 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -538,7 +538,7 @@ void AndroidRunnerWorker::asyncStartHelper() forceStop(); asyncStartLogcat(); - for (const QString &entry : m_beforeStartAdbCommands) + for (const QString &entry : qAsConst(m_beforeStartAdbCommands)) runAdb(entry.split(' ', Qt::SkipEmptyParts)); QStringList args({"shell", "am", "start"}); @@ -825,7 +825,7 @@ void AndroidRunnerWorker::onProcessIdChanged(qint64 pid) m_debugServerProcess.reset(); // Run adb commands after application quit. - for (const QString &entry: m_afterFinishAdbCommands) + for (const QString &entry: qAsConst(m_afterFinishAdbCommands)) runAdb(entry.split(' ', Qt::SkipEmptyParts)); } else { // In debugging cases this will be funneled to the engine to actually start diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index b84b6fea84f..ca66e26576f 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -566,7 +566,7 @@ void SdkManagerOutputParser::compilePackageAssociations() deleteAlreadyInstalled(images); // Associate the system images with sdk platforms. - for (AndroidSdkPackage *image : images) { + for (AndroidSdkPackage *image : qAsConst(images)) { int imageApi = m_systemImages[image]; auto itr = std::find_if(m_packages.begin(), m_packages.end(), [imageApi](const AndroidSdkPackage *p) { @@ -1151,7 +1151,7 @@ void AndroidSdkManagerPrivate::parseCommonArguments(QFutureInterface &f void AndroidSdkManagerPrivate::clearPackages() { - for (AndroidSdkPackage *p : m_allPackages) + for (AndroidSdkPackage *p : qAsConst(m_allPackages)) delete p; m_allPackages.clear(); } diff --git a/src/plugins/android/androidsdkmodel.cpp b/src/plugins/android/androidsdkmodel.cpp index 50205e735f2..2f83e86156c 100644 --- a/src/plugins/android/androidsdkmodel.cpp +++ b/src/plugins/android/androidsdkmodel.cpp @@ -298,7 +298,7 @@ void AndroidSdkModel::selectMissingEssentials() } // Select SDK platform - for (const SdkPlatform *platform : m_sdkPlatforms) { + for (const SdkPlatform *platform : qAsConst(m_sdkPlatforms)) { if (!platform->installedLocation().isEmpty()) { pendingPkgs.removeOne(platform->sdkStylePath()); } else if (pendingPkgs.contains(platform->sdkStylePath()) && diff --git a/src/plugins/android/androidsdkpackage.cpp b/src/plugins/android/androidsdkpackage.cpp index e9b019782bb..5b218c448c4 100644 --- a/src/plugins/android/androidsdkpackage.cpp +++ b/src/plugins/android/androidsdkpackage.cpp @@ -154,7 +154,7 @@ SdkPlatform::SdkPlatform(QVersionNumber version, QString sdkStylePathStr, int ap SdkPlatform::~SdkPlatform() { - for (SystemImage *image : m_systemImages) + for (SystemImage *image : qAsConst(m_systemImages)) delete image; m_systemImages.clear(); } diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp index a9ea27f6bc1..9353f148bb4 100644 --- a/src/plugins/android/avddialog.cpp +++ b/src/plugins/android/avddialog.cpp @@ -177,7 +177,7 @@ void AvdDialog::updateDeviceDefinitionComboBox() m_avdDialog.deviceDefinitionTypeComboBox->currentText()); m_avdDialog.deviceDefinitionComboBox->clear(); - for (const DeviceDefinitionStruct &item : m_deviceDefinitionsList) { + for (const DeviceDefinitionStruct &item : qAsConst(m_deviceDefinitionsList)) { if (item.deviceType == curDeviceType) m_avdDialog.deviceDefinitionComboBox->addItem(item.name_id); } @@ -231,7 +231,7 @@ void AvdDialog::updateApiLevelComboBox() }); m_avdDialog.targetApiComboBox->clear(); - for (SystemImage *image : filteredList) { + for (SystemImage *image : qAsConst(filteredList)) { QString imageString = "android-" % QString::number(image->apiLevel()); const QStringList imageSplits = image->sdkStylePath().split(';'); if (imageSplits.size() == 4)