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

Android: Use qAsConst with non-const Qt containers in range-loops

Browse Source 
Change-Id: I1242a5c62a27b7b8f30bb7b43ff406eceb4135f7
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale
2021-02-16 20:40:12 +01:00
parent 80dfaf3be3
commit 670616c6f9
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidavdmanager.cpp
View File

@@ -403,7 +403,7 @@ AndroidDeviceInfoList AvdManagerOutputParser::listVirtualDevices(const AndroidCo
avdList = parseAvdList(output); avdList = parseAvdList(output);
} while (output.contains(avdManufacturerError)); } while (output.contains(avdManufacturerError));
for (const QString &avdPathStr : avdErrorPaths) for (const QString &avdPathStr : qAsConst(avdErrorPaths))
AvdConfigEditManufacturerTag(avdPathStr, true); AvdConfigEditManufacturerTag(avdPathStr, true);
return avdList; return avdList;

2
src/plugins/android/androidconfigurations.cpp
View File

@@ -1494,7 +1494,7 @@ FilePath AndroidConfig::getJdkPath()
#endif // Q_OS_WIN #endif // Q_OS_WIN
} }
for (const QString &version : allVersions) { for (const QString &version : qAsConst(allVersions)) {
settings->beginGroup(version); settings->beginGroup(version);
jdkHome = FilePath::fromUserInput(settings->value("JavaHome").toString()); jdkHome = FilePath::fromUserInput(settings->value("JavaHome").toString());
settings->endGroup(); settings->endGroup();

4
src/plugins/android/androidrunnerworker.cpp
View File

@@ -538,7 +538,7 @@ void AndroidRunnerWorker::asyncStartHelper()
forceStop(); forceStop();
asyncStartLogcat(); asyncStartLogcat();
for (const QString &entry : m_beforeStartAdbCommands) for (const QString &entry : qAsConst(m_beforeStartAdbCommands))
runAdb(entry.split(' ', Qt::SkipEmptyParts)); runAdb(entry.split(' ', Qt::SkipEmptyParts));
QStringList args({"shell", "am", "start"}); QStringList args({"shell", "am", "start"});
@@ -825,7 +825,7 @@ void AndroidRunnerWorker::onProcessIdChanged(qint64 pid)
m_debugServerProcess.reset(); m_debugServerProcess.reset();
// Run adb commands after application quit. // Run adb commands after application quit.
for (const QString &entry: m_afterFinishAdbCommands) for (const QString &entry: qAsConst(m_afterFinishAdbCommands))
runAdb(entry.split(' ', Qt::SkipEmptyParts)); runAdb(entry.split(' ', Qt::SkipEmptyParts));
} else { } else {
// In debugging cases this will be funneled to the engine to actually start // In debugging cases this will be funneled to the engine to actually start

4
src/plugins/android/androidsdkmanager.cpp
View File

@@ -566,7 +566,7 @@ void SdkManagerOutputParser::compilePackageAssociations()
deleteAlreadyInstalled(images); deleteAlreadyInstalled(images);
// Associate the system images with sdk platforms. // Associate the system images with sdk platforms.
for (AndroidSdkPackage *image : images) { for (AndroidSdkPackage *image : qAsConst(images)) {
int imageApi = m_systemImages[image]; int imageApi = m_systemImages[image];
auto itr = std::find_if(m_packages.begin(), m_packages.end(), auto itr = std::find_if(m_packages.begin(), m_packages.end(),
[imageApi](const AndroidSdkPackage *p) { [imageApi](const AndroidSdkPackage *p) {
@@ -1151,7 +1151,7 @@ void AndroidSdkManagerPrivate::parseCommonArguments(QFutureInterface<QString> &f
void AndroidSdkManagerPrivate::clearPackages() void AndroidSdkManagerPrivate::clearPackages()
{ {
for (AndroidSdkPackage *p : m_allPackages) for (AndroidSdkPackage *p : qAsConst(m_allPackages))
delete p; delete p;
m_allPackages.clear(); m_allPackages.clear();
} }

2
src/plugins/android/androidsdkmodel.cpp
View File

@@ -298,7 +298,7 @@ void AndroidSdkModel::selectMissingEssentials()
} }
// Select SDK platform // Select SDK platform
for (const SdkPlatform *platform : m_sdkPlatforms) { for (const SdkPlatform *platform : qAsConst(m_sdkPlatforms)) {
if (!platform->installedLocation().isEmpty()) { if (!platform->installedLocation().isEmpty()) {
pendingPkgs.removeOne(platform->sdkStylePath()); pendingPkgs.removeOne(platform->sdkStylePath());
} else if (pendingPkgs.contains(platform->sdkStylePath()) && } else if (pendingPkgs.contains(platform->sdkStylePath()) &&

2
src/plugins/android/androidsdkpackage.cpp
View File

@@ -154,7 +154,7 @@ SdkPlatform::SdkPlatform(QVersionNumber version, QString sdkStylePathStr, int ap
SdkPlatform::~SdkPlatform() SdkPlatform::~SdkPlatform()
{ {
for (SystemImage *image : m_systemImages) for (SystemImage *image : qAsConst(m_systemImages))
delete image; delete image;
m_systemImages.clear(); m_systemImages.clear();
} }

4
src/plugins/android/avddialog.cpp
View File

@@ -177,7 +177,7 @@ void AvdDialog::updateDeviceDefinitionComboBox()
m_avdDialog.deviceDefinitionTypeComboBox->currentText()); m_avdDialog.deviceDefinitionTypeComboBox->currentText());
m_avdDialog.deviceDefinitionComboBox->clear(); m_avdDialog.deviceDefinitionComboBox->clear();
for (const DeviceDefinitionStruct &item : m_deviceDefinitionsList) { for (const DeviceDefinitionStruct &item : qAsConst(m_deviceDefinitionsList)) {
if (item.deviceType == curDeviceType) if (item.deviceType == curDeviceType)
m_avdDialog.deviceDefinitionComboBox->addItem(item.name_id); m_avdDialog.deviceDefinitionComboBox->addItem(item.name_id);
} }
@@ -231,7 +231,7 @@ void AvdDialog::updateApiLevelComboBox()
}); });
m_avdDialog.targetApiComboBox->clear(); m_avdDialog.targetApiComboBox->clear();
for (SystemImage *image : filteredList) { for (SystemImage *image : qAsConst(filteredList)) {
QString imageString = "android-" % QString::number(image->apiLevel()); QString imageString = "android-" % QString::number(image->apiLevel());
const QStringList imageSplits = image->sdkStylePath().split(';'); const QStringList imageSplits = image->sdkStylePath().split(';');
if (imageSplits.size() == 4) if (imageSplits.size() == 4)