From 1372dfdf7fc5e0ee04c064568bcd6e45da019db5 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 28 May 2021 18:22:44 +0300 Subject: Android: Fix multiple clang clazy warnings Change-Id: I2ea6cebd16c09a8a4502f4719d99a9d85e5e7d02 Reviewed-by: Alessandro Portale --- src/plugins/android/androidsettingswidget.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/plugins/android/androidsettingswidget.cpp') diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 4e57b1868b..1e566eb3c0 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -298,8 +298,8 @@ void AndroidSettingsWidget::showEvent(QShowEvent *event) validateJdk(); // Reloading SDK packages (force) is still synchronous. Use zero timer // to let settings dialog open first. - QTimer::singleShot(0, std::bind(&AndroidSdkManager::reloadPackages, - &m_sdkManager, false)); + QTimer::singleShot(0, &m_sdkManager, std::bind(&AndroidSdkManager::reloadPackages, + &m_sdkManager, false)); validateOpenSsl(); m_isInitialReloadDone = true; } @@ -308,12 +308,14 @@ void AndroidSettingsWidget::showEvent(QShowEvent *event) void AndroidSettingsWidget::updateNdkList() { m_ui.ndkListWidget->clear(); - for (const Ndk *ndk : m_sdkManager.installedNdkPackages()) { + const auto installedPkgs = m_sdkManager.installedNdkPackages(); + for (const Ndk *ndk : installedPkgs) { m_ui.ndkListWidget->addItem(new QListWidgetItem(Icons::LOCKED.icon(), ndk->installedLocation().toString())); } - for (const QString &ndk : m_androidConfig.getCustomNdkList()) { + const auto customNdks = m_androidConfig.getCustomNdkList(); + for (const QString &ndk : customNdks) { if (m_androidConfig.isValidNdk(ndk)) { m_ui.ndkListWidget->addItem(new QListWidgetItem(Icons::UNLOCKED.icon(), ndk)); } else { @@ -730,6 +732,7 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent) connect(gitCloner, QOverload::of(&QtcProcess::finished), + m_ui.openSslPathChooser, [=](int exitCode, QProcess::ExitStatus exitStatus) { openSslProgressDialog->close(); validateOpenSsl(); -- cgit v1.2.1