diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-11-29 21:11:25 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-11-30 07:09:10 +0000 |
| commit | ccb2317a16388eb3026877294bf1350834d2737e (patch) | |
| tree | a73b18e1dcc06d12e3f23d6c761af1973c436e17 | |
| parent | 4417c48e7b8f9564bb780b14b6ddfb9a209b7c87 (diff) | |
Android: Fix clazy "Mixing iterators with const_iterators" warnings
Change-Id: I90fd2c10240a367ef546f9b48b2a2f784f00f4e0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/android/androidsdkpackage.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/autotest/autotestplugin.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 29df41728b..9fb2834e1a 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -650,8 +650,8 @@ static bool mergeGradleProperties(const QString &path, GradleProperties properti QByteArray line(oldFile.readLine()); QList<QByteArray> prop(line.split('=')); if (prop.size() > 1) { - GradleProperties::iterator it = properties.find(prop.at(0).trimmed()); - if (it != properties.end()) { + const auto it = properties.constFind(prop.at(0).trimmed()); + if (it != properties.constEnd()) { file.write(it.key() + '=' + it.value() + '\n'); properties.erase(it); continue; diff --git a/src/plugins/android/androidsdkpackage.cpp b/src/plugins/android/androidsdkpackage.cpp index 16e3cc8b72..c1659c63a2 100644 --- a/src/plugins/android/androidsdkpackage.cpp +++ b/src/plugins/android/androidsdkpackage.cpp @@ -173,8 +173,8 @@ QVersionNumber SdkPlatform::version() const void SdkPlatform::addSystemImage(SystemImage *image) { // Ordered insert. Installed images on top with lexical comparison of the display name. - auto itr = m_systemImages.begin(); - while (itr != m_systemImages.end()) { + auto itr = m_systemImages.cbegin(); + while (itr != m_systemImages.cend()) { SystemImage *currentImage = *itr; if (currentImage->state() == image->state()) { if (currentImage->displayText() > image->displayText()) diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp index 68b76b986b..4457c7531f 100644 --- a/src/plugins/autotest/autotestplugin.cpp +++ b/src/plugins/autotest/autotestplugin.cpp @@ -149,8 +149,8 @@ AutotestPluginPrivate::AutotestPluginPrivate() connect(sessionManager, &ProjectExplorer::SessionManager::aboutToRemoveProject, this, [] (ProjectExplorer::Project *project) { - auto it = s_projectSettings.find(project); - if (it != s_projectSettings.end()) { + const auto it = s_projectSettings.constFind(project); + if (it != s_projectSettings.constEnd()) { delete it.value(); s_projectSettings.erase(it); } |