Android: Rename AndroidSdkManager{Widget -> Dialog}

Do some small cleanups.

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

src/plugins/android/CMakeLists.txt

@@ -34,7 +34,7 @@ add_qtc_plugin(Android
     androidrunnerworker.cpp androidrunnerworker.h
     androidsdkdownloader.cpp androidsdkdownloader.h
     androidsdkmanager.cpp androidsdkmanager.h
-    androidsdkmanagerwidget.cpp androidsdkmanagerwidget.h
+    androidsdkmanagerdialog.cpp androidsdkmanagerdialog.h
     androidsdkmodel.cpp androidsdkmodel.h
     androidsdkpackage.cpp androidsdkpackage.h
     androidsettingswidget.cpp androidsettingswidget.h

src/plugins/android/android.qbs

@@ -73,8 +73,8 @@ QtcPlugin {
         "androidsdkdownloader.h",
         "androidsdkmanager.cpp",
         "androidsdkmanager.h",
-        "androidsdkmanagerwidget.cpp",
+        "androidsdkmanagerdialog.cpp",
-        "androidsdkmanagerwidget.h",
+        "androidsdkmanagerdialog.h",
         "androidsdkmodel.cpp",
         "androidsdkmodel.h",
         "androidsdkpackage.cpp",

src/plugins/android/androidsdkmanagerdialog.cpp

@@ -3,7 +3,7 @@
 
 #include "androidconfigurations.h"
 #include "androidsdkmanager.h"
-#include "androidsdkmanagerwidget.h"
+#include "androidsdkmanagerdialog.h"
 #include "androidsdkmodel.h"
 #include "androidtr.h"
 
@@ -39,7 +39,7 @@ private:
     QString m_searchText;
 };
 
-AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidSdkManager *sdkManager, QWidget *parent)
+AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent)
     : QDialog(parent)
     , m_sdkManager(sdkManager)
     , m_sdkModel(new AndroidSdkModel(m_sdkManager, this))
@@ -156,7 +156,7 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidSdkManager *sdkManager,
     connect(m_buttonBox->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, [this] {
         m_sdkManager->runInstallationChange(m_sdkModel->installationChange());
     });
-    connect(m_buttonBox, &QDialogButtonBox::rejected, this, &AndroidSdkManagerWidget::reject);
+    connect(m_buttonBox, &QDialogButtonBox::rejected, this, &AndroidSdkManagerDialog::reject);
 
     connect(optionsButton, &QPushButton::clicked, this, [this] {
         OptionsDialog dlg(m_sdkManager, androidConfig().sdkManagerToolArgs(), this);
@@ -289,8 +289,8 @@ OptionsDialog::OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &a
     });
     m_process.start();
 
-    auto dialogButtons = new QDialogButtonBox(this);
+    auto dialogButtons = new QDialogButtonBox;
-    dialogButtons->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+    dialogButtons->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
     connect(dialogButtons, &QDialogButtonBox::accepted, this, &OptionsDialog::accept);
     connect(dialogButtons, &QDialogButtonBox::rejected, this, &OptionsDialog::reject);
 
@@ -308,7 +308,7 @@ OptionsDialog::OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &a
 
 QStringList OptionsDialog::sdkManagerArguments() const
 {
-    QString userInput = m_argumentsEdit->text().simplified();
+    const QString userInput = m_argumentsEdit->text().simplified();
     return userInput.isEmpty() ? QStringList() : userInput.split(' ');
 }
 

src/plugins/android/androidsdkmanagerdialog.h

@@ -34,12 +34,10 @@ private:
     Utils::Process m_process;
 };
 
-class AndroidSdkManagerWidget : public QDialog
+class AndroidSdkManagerDialog : public QDialog
 {
-    Q_OBJECT
-
 public:
-    AndroidSdkManagerWidget(AndroidSdkManager *sdkManager, QWidget *parent = nullptr);
+    AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent = nullptr);
 
 private:
     AndroidSdkManager *m_sdkManager = nullptr;

src/plugins/android/androidsettingswidget.cpp

@@ -5,7 +5,7 @@
 #include "androidconstants.h"
 #include "androidsdkdownloader.h"
 #include "androidsdkmanager.h"
-#include "androidsdkmanagerwidget.h"
+#include "androidsdkmanagerdialog.h"
 #include "androidsettingswidget.h"
 #include "androidtr.h"
 
@@ -495,7 +495,7 @@ AndroidSettingsWidget::AndroidSettingsWidget()
         m_androidProgress->show();
     });
     connect(sdkManagerToolButton, &QAbstractButton::clicked, this, [this] {
-        AndroidSdkManagerWidget dialog(&m_sdkManager, this);
+        AndroidSdkManagerDialog dialog(&m_sdkManager, this);
         dialog.exec();
     });
     connect(sdkToolsAutoDownloadButton, &QAbstractButton::clicked,