From e2612705b157b4b4515fa30d48601769d7d8efe5 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 3 May 2024 18:37:12 +0200
Subject: [PATCH] Android: Hide AndroidSdkManagerDialog

Provide executeAndroidSdkManagerDialog() function instead.

Change-Id: If7033ce797710f4dfbb7df0630962316b20c8a12
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/android/androidsdkmanagerdialog.cpp | 17 +++++++++++++++++
 src/plugins/android/androidsdkmanagerdialog.h   | 15 ++-------------
 src/plugins/android/androidsettingswidget.cpp   |  3 +--
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/plugins/android/androidsdkmanagerdialog.cpp b/src/plugins/android/androidsdkmanagerdialog.cpp
index c8c070d6486..a2297bdac3a 100644
--- a/src/plugins/android/androidsdkmanagerdialog.cpp
+++ b/src/plugins/android/androidsdkmanagerdialog.cpp
@@ -12,6 +12,7 @@
 #include <utils/qtcprocess.h>
 
 #include <QCheckBox>
+#include <QDialog>
 #include <QDialogButtonBox>
 #include <QHeaderView>
 #include <QLineEdit>
@@ -101,6 +102,16 @@ private:
     QString m_searchText;
 };
 
+class AndroidSdkManagerDialog : public QDialog
+{
+public:
+    AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent);
+
+private:
+    AndroidSdkManager *m_sdkManager = nullptr;
+    AndroidSdkModel *m_sdkModel = nullptr;
+};
+
 AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent)
     : QDialog(parent)
     , m_sdkManager(sdkManager)
@@ -322,4 +333,10 @@ bool PackageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sour
     return showTopLevel || ((packageState(srcIndex) & m_packageState) && packageFound(srcIndex));
 }
 
+void executeAndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent)
+{
+    AndroidSdkManagerDialog dialog(sdkManager, parent);
+    dialog.exec();
+}
+
 } // Android::Internal
diff --git a/src/plugins/android/androidsdkmanagerdialog.h b/src/plugins/android/androidsdkmanagerdialog.h
index ed57211c52c..e5e10c6783b 100644
--- a/src/plugins/android/androidsdkmanagerdialog.h
+++ b/src/plugins/android/androidsdkmanagerdialog.h
@@ -2,23 +2,12 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 #pragma once
 
-#include "androidsdkmanager.h"
-
-#include <QDialog>
+#include <QWidget>
 
 namespace Android::Internal {
 
 class AndroidSdkManager;
-class AndroidSdkModel;
 
-class AndroidSdkManagerDialog : public QDialog
-{
-public:
-    AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent = nullptr);
-
-private:
-    AndroidSdkManager *m_sdkManager = nullptr;
-    AndroidSdkModel *m_sdkModel = nullptr;
-};
+void executeAndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent);
 
 } // Android::Internal
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index f71ff220703..284a6120713 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -495,8 +495,7 @@ AndroidSettingsWidget::AndroidSettingsWidget()
         m_androidProgress->show();
     });
     connect(sdkManagerToolButton, &QAbstractButton::clicked, this, [this] {
-        AndroidSdkManagerDialog dialog(&m_sdkManager, this);
-        dialog.exec();
+        executeAndroidSdkManagerDialog(&m_sdkManager, this);
     });
     connect(sdkToolsAutoDownloadButton, &QAbstractButton::clicked,
             this, &AndroidSettingsWidget::downloadSdk);