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

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

@@ -306,8 +306,8 @@ bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
QString AndroidAvdManager::findAvd(const QString &avdName) const
{
QVector<AndroidDeviceInfo> devices = m_config.connectedDevices();
foreach (AndroidDeviceInfo device, devices) {
const QVector<AndroidDeviceInfo> devices = m_config.connectedDevices();
for (const AndroidDeviceInfo &device : devices) {
if (device.type != ProjectExplorer::IDevice::Emulator)
continue;
if (device.avdName == avdName)

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);
}

3
src/plugins/android/androidmanager.cpp
View File

@@ -643,7 +643,8 @@ static GradleProperties readGradleProperties(const QString &path)
if (!file.open(QIODevice::ReadOnly))
return properties;
foreach (const QByteArray &line, file.readAll().split('\n')) {
const QList<QByteArray> lines = file.readAll().split('\n');
for (const QByteArray &line : lines) {
if (line.trimmed().startsWith('#'))
continue;

3
src/plugins/android/androidmanifesteditor.cpp
View File

@@ -99,7 +99,8 @@ void AndroidManifestEditor::gotoLine(int line, int column, bool centerLine)
void AndroidManifestEditor::changeEditorPage(QAction *action)
{
if (!widget()->setActivePage(static_cast<AndroidManifestEditorWidget::EditorPage>(action->data().toInt()))) {
foreach (QAction *action, m_actionGroup->actions()) {
const QList<QAction *> actions = m_actionGroup->actions();
for (QAction *action : actions) {
if (action->data().toInt() == widget()->activePage()) {
action->setChecked(true);
break;

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

@@ -1006,7 +1006,7 @@ QXmlStreamAttributes modifyXmlStreamAttributes(const QXmlStreamAttributes &input
Q_ASSERT(keys.size() == values.size());
QXmlStreamAttributes result;
result.reserve(input.size());
foreach (const QXmlStreamAttribute &attribute, input) {
for (const QXmlStreamAttribute &attribute : input) {
const QString &name = attribute.qualifiedName().toString();
if (remove.contains(name))
continue;
@@ -1082,7 +1082,7 @@ void AndroidManifestEditorWidget::parseManifest(QXmlStreamReader &reader, QXmlSt
writer.writeComment(QLatin1String(" %%INSERT_FEATURES "));
if (!permissions.isEmpty()) {
foreach (const QString &permission, permissions) {
for (const QString &permission : qAsConst(permissions)) {
writer.writeEmptyElement(QLatin1String("uses-permission"));
writer.writeAttribute(QLatin1String("android:name"), permission);
}

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

@@ -147,7 +147,7 @@ void AndroidPackageInstallationStep::setupOutputFormatter(OutputFormatter *forma
void AndroidPackageInstallationStep::doRun()
{
QString error;
foreach (const QString &dir, m_androidDirsToClean) {
for (const QString &dir : qAsConst(m_androidDirsToClean)) {
FilePath androidDir = FilePath::fromString(dir);
if (!dir.isEmpty() && androidDir.exists()) {
emit addOutput(tr("Removing directory %1").arg(dir), OutputFormat::NormalMessage);

8
src/plugins/android/androidpotentialkit.cpp
View File

@@ -66,8 +66,8 @@ QWidget *AndroidPotentialKit::createWidget(QWidget *parent) const
bool AndroidPotentialKit::isEnabled() const
{
QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits();
foreach (ProjectExplorer::Kit *kit, kits) {
const QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits();
for (const ProjectExplorer::Kit *kit : kits) {
if (kit->isAutoDetected() && !kit->isSdkProvided()) {
return false;
}
@@ -115,8 +115,8 @@ void AndroidPotentialKitWidget::openOptions()
void AndroidPotentialKitWidget::recheck()
{
QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits();
foreach (ProjectExplorer::Kit *kit, kits) {
const QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits();
for (const ProjectExplorer::Kit *kit : kits) {
if (kit->isAutoDetected() && !kit->isSdkProvided()) {
setVisible(false);
return;

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

@@ -439,7 +439,7 @@ void AndroidRunnerWorker::logcatProcess(const QByteArray &text, QByteArray &buff
}
QString pidString = QString::number(m_processPID);
foreach (const QByteArray &msg, lines) {
for (const QByteArray &msg : qAsConst(lines)) {
const QString line = QString::fromUtf8(msg).trimmed() + QLatin1Char('\n');
if (!line.contains(pidString))
continue;