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

Android: Remove foreach / Q_FOREACH usage

Browse Source 
Task-number: QTCREATORBUG-27464
Change-Id: I2530688c44735bc4c69d57f9e8f392867be316f0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Artem Sokolovskii
2022-05-04 15:56:27 +02:00
parent c056c5c4b4
commit bef1bd18f7
8 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -698,7 +698,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
// workaround for '????????????' serial numbers:
// can use "adb -d" when only one usb device attached
foreach (const QString &device, adbDevs) {
for (const QString &device : qAsConst(adbDevs)) {
const QString serialNo = device.left(device.indexOf('\t')).trimmed();
const QString deviceType = device.mid(device.indexOf('\t')).trimmed();
AndroidDeviceInfo dev;
@@ -733,8 +733,8 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
bool AndroidConfig::isConnected(const QString &serialNumber) const
{
QVector<AndroidDeviceInfo> devices = connectedDevices();
foreach (AndroidDeviceInfo device, devices) {
const QVector<AndroidDeviceInfo> devices = connectedDevices();
for (const AndroidDeviceInfo &device : devices) {
if (device.serialNumber == serialNumber)
return true;
}
@@ -888,7 +888,8 @@ bool AndroidConfig::isValidNdk(const QString &ndkLocation) const
QString AndroidConfig::bestNdkPlatformMatch(int target, const QtVersion *qtVersion) const
{
target = std::max(AndroidManager::defaultMinimumSDK(qtVersion), target);
foreach (int apiLevel, availableNdkPlatforms(qtVersion)) {
const QList<int> platforms = availableNdkPlatforms(qtVersion);
for (const int apiLevel : platforms) {
if (apiLevel <= target)
return QString::fromLatin1("android-%1").arg(apiLevel);
}