From c66e7556cfbf6d9261aeaa3c492a0d561f45684d Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 3 May 2024 17:04:44 +0200 Subject: [PATCH] Android: Rename AndroidSdkManager{Widget -> Dialog} Do some small cleanups. Change-Id: Iec6c77cb0a33ebdfcd72c3751cb1fd44ab3ea078 Reviewed-by: Alessandro Portale --- src/plugins/android/CMakeLists.txt | 2 +- src/plugins/android/android.qbs | 4 ++-- ...managerwidget.cpp => androidsdkmanagerdialog.cpp} | 12 ++++++------ ...dsdkmanagerwidget.h => androidsdkmanagerdialog.h} | 6 ++---- src/plugins/android/androidsettingswidget.cpp | 4 ++-- 5 files changed, 13 insertions(+), 15 deletions(-) rename src/plugins/android/{androidsdkmanagerwidget.cpp => androidsdkmanagerdialog.cpp} (97%) rename src/plugins/android/{androidsdkmanagerwidget.h => androidsdkmanagerdialog.h} (88%) diff --git a/src/plugins/android/CMakeLists.txt b/src/plugins/android/CMakeLists.txt index e51a840e632..619484a2b53 100644 --- a/src/plugins/android/CMakeLists.txt +++ b/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 diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs index e1bcc9e0ce2..f7f558f5434 100644 --- a/src/plugins/android/android.qbs +++ b/src/plugins/android/android.qbs @@ -73,8 +73,8 @@ QtcPlugin { "androidsdkdownloader.h", "androidsdkmanager.cpp", "androidsdkmanager.h", - "androidsdkmanagerwidget.cpp", - "androidsdkmanagerwidget.h", + "androidsdkmanagerdialog.cpp", + "androidsdkmanagerdialog.h", "androidsdkmodel.cpp", "androidsdkmodel.h", "androidsdkpackage.cpp", diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerdialog.cpp similarity index 97% rename from src/plugins/android/androidsdkmanagerwidget.cpp rename to src/plugins/android/androidsdkmanagerdialog.cpp index 2a9027d0aa2..047f3d3d44a 100644 --- a/src/plugins/android/androidsdkmanagerwidget.cpp +++ b/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); - dialogButtons->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); + auto dialogButtons = new QDialogButtonBox; + 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(' '); } diff --git a/src/plugins/android/androidsdkmanagerwidget.h b/src/plugins/android/androidsdkmanagerdialog.h similarity index 88% rename from src/plugins/android/androidsdkmanagerwidget.h rename to src/plugins/android/androidsdkmanagerdialog.h index d33d0125c04..b1372782c61 100644 --- a/src/plugins/android/androidsdkmanagerwidget.h +++ b/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; diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index f9d382ba5e6..f71ff220703 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/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,