Android: Pass context object to lambda connections

Remove some unneeded lambda () brackets.

Change-Id: Id00e2bc736683bb844cc7ba936ac9d21aa204416
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

src/plugins/android/androidbuildapkstep.cpp

@@ -1021,11 +1021,11 @@ PasswordInputDialog::PasswordInputDialog(PasswordInputDialog::Context context,
     mainLayout->addWidget(warningLabel);
     mainLayout->addWidget(buttonBox);
 
-    connect(inputEdit, &QLineEdit::textChanged,[this](const QString &text) {
+    connect(inputEdit, &QLineEdit::textChanged, this, [this](const QString &text) {
         buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!text.isEmpty());
     });
 
-    connect(buttonBox, &QDialogButtonBox::accepted, [this] {
+    connect(buttonBox, &QDialogButtonBox::accepted, this, [this] {
         if (verifyCallback(inputEdit->text())) {
             accept(); // Dialog accepted.
         } else {

src/plugins/android/androiddevice.cpp

@@ -455,7 +455,7 @@ void AndroidDeviceManager::startAvd(const ProjectExplorer::IDevice::Ptr &device,
     const AndroidDevice *androidDev = static_cast<const AndroidDevice *>(device.data());
     const QString name = androidDev->avdName();
     qCDebug(androidDeviceLog, "Starting Android AVD id \"%s\".", qPrintable(name));
-    runAsync([this, name, device]() {
+    runAsync([this, name, device] {
         const QString serialNumber = m_avdManager.startAvd(name);
         // Mark the AVD as ReadyToUse once we know it's started
         if (!serialNumber.isEmpty()) {
@@ -480,7 +480,7 @@ void AndroidDeviceManager::eraseAvd(const IDevice::Ptr &device, QWidget *parent)
         return;
 
     qCDebug(androidDeviceLog) << QString("Erasing Android AVD \"%1\" from the system.").arg(name);
-    m_removeAvdFutureWatcher.setFuture(runAsync([this, name, device]() {
+    m_removeAvdFutureWatcher.setFuture(runAsync([this, name, device] {
         QPair<IDevice::ConstPtr, bool> pair;
         pair.first = device;
         pair.second = false;
@@ -512,7 +512,7 @@ void AndroidDeviceManager::setupWifiForDevice(const IDevice::Ptr &device, QWidge
         return;
     }
 
-    QTimer::singleShot(2000, parent, [adbSelector, parent]() {
+    QTimer::singleShot(2000, parent, [adbSelector, parent] {
         // Get device IP address
         QStringList args = adbSelector;
         args.append({"shell", "ip", "route"});

src/plugins/android/androidplugin.cpp

@@ -131,10 +131,10 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
     connect(KitManager::instance(), &KitManager::kitsLoaded,
             this, &AndroidPlugin::kitsRestored);
 
-    LanguageClient::LanguageClientSettings::registerClientType({Android::Constants::JLS_SETTINGS_ID,
+    LanguageClient::LanguageClientSettings::registerClientType(
+        {Android::Constants::JLS_SETTINGS_ID,
          Tr::tr("Java Language Server"),
-                                                                []() { return new JLSSettings; }});
+         [] { return new JLSSettings; }});
-
     return true;
 }
 
@@ -153,7 +153,7 @@ void AndroidPlugin::kitsRestored()
     AndroidConfigurations::registerNewToolChains();
     AndroidConfigurations::updateAutomaticKitList();
     connect(QtSupport::QtVersionManager::instance(), &QtSupport::QtVersionManager::qtVersionsChanged,
-            AndroidConfigurations::instance(), []() {
+            AndroidConfigurations::instance(), [] {
         AndroidConfigurations::registerNewToolChains();
         AndroidConfigurations::updateAutomaticKitList();
     });

src/plugins/android/androidsdkmanager.cpp

@@ -451,7 +451,7 @@ void SdkManagerOutputParser::parsePackageListing(const QString &output)
     bool collectingPackageData = false;
     MarkerTag currentPackageMarker = MarkerTag::None;
 
-    auto processCurrentPackage = [&]() {
+    auto processCurrentPackage = [&] {
         if (collectingPackageData) {
             collectingPackageData = false;
             parsePackageData(currentPackageMarker, packageData);

src/plugins/android/androidsdkmodel.cpp

@@ -29,11 +29,11 @@ AndroidSdkModel::AndroidSdkModel(const AndroidConfig &config, AndroidSdkManager
       m_sdkManager(sdkManager)
 {
     QTC_CHECK(m_sdkManager);
-    connect(m_sdkManager, &AndroidSdkManager::packageReloadBegin, [this] {
+    connect(m_sdkManager, &AndroidSdkManager::packageReloadBegin, this, [this] {
         clearContainers();
         beginResetModel();
     });
-    connect(m_sdkManager, &AndroidSdkManager::packageReloadFinished, [this] {
+    connect(m_sdkManager, &AndroidSdkManager::packageReloadFinished, this, [this] {
         refreshData();
         endResetModel();
     });

src/plugins/android/androidservicewidget.cpp

@@ -331,14 +331,14 @@ AndroidServiceWidget::AndroidServiceWidget(QWidget *parent) : QWidget(parent),
     connect(m_removeButton, &QAbstractButton::clicked,
             this, &AndroidServiceWidget::removeService);
     connect(m_tableView->selectionModel(), &QItemSelectionModel::selectionChanged,
-            [this](const QItemSelection &selected, const QItemSelection &/*deselected*/) {
+            this, [this](const QItemSelection &selected) {
         if (!selected.isEmpty())
             m_removeButton->setEnabled(true);
     });
     connect(m_model.data(), &AndroidServiceWidget::AndroidServiceModel::validDataChanged,
-            [this] { emit servicesModified(); });
+            this, [this] { emit servicesModified(); });
     connect(m_model.data(), &AndroidServiceWidget::AndroidServiceModel::invalidDataChanged,
-            [this] { emit servicesInvalid(); });
+            this, [this] { emit servicesInvalid(); });
 }
 
 AndroidServiceWidget::~AndroidServiceWidget()

src/plugins/android/androidsettingswidget.cpp

@@ -381,7 +381,7 @@ AndroidSettingsWidget::AndroidSettingsWidget()
             this, &AndroidSettingsWidget::onSdkPathChanged);
 
     connect(m_ndkListWidget, &QListWidget::currentTextChanged,
-            [this, removeCustomNdkButton](const QString &ndk) {
+            this, [this, removeCustomNdkButton](const QString &ndk) {
         updateUI();
         removeCustomNdkButton->setEnabled(m_androidConfig.getCustomNdkList().contains(ndk));
     });