Android: New setup for AndroidDeviceManager

Also remove the now-unneeded plugin pimpl.

Change-Id: I37eaa91a2756e823d07323b54695e19860cb16ab
Reviewed-by: Jarek Kobus <[email protected]>
Reviewed-by: <[email protected]>

4 files changed, 10 insertions, 18 deletions

diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index 3e42b42a930..971c2619a3a 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -870,4 +870,9 @@ void setupAndroidDevice()
     static AndroidDeviceFactory theAndroidDeviceFactory;
 }
 
+void setupAndroidDeviceManager(QObject *guard)
+{
+    (void) new AndroidDeviceManager(guard);
+}
+
 } // Android::Internal
diff --git a/src/plugins/android/androiddevice.h b/src/plugins/android/androiddevice.h
index 80f1e365c9f..0c1ab9dd98e 100644
--- a/src/plugins/android/androiddevice.h
+++ b/src/plugins/android/androiddevice.h
@@ -87,8 +87,9 @@ public:
     QString getRunningAvdsSerialNumber(const QString &name) const;
 
 private:
-    AndroidDeviceManager(QObject *parent = nullptr);
+    explicit AndroidDeviceManager(QObject *parent);
     ~AndroidDeviceManager();
+
     void HandleDevicesListChange(const QString &serialNumber);
     void HandleAvdsListChange();
 
@@ -101,9 +102,10 @@ private:
     AndroidConfig &m_androidConfig;
     AndroidAvdManager m_avdManager;
 
-    friend class AndroidPluginPrivate;
+    friend void setupAndroidDeviceManager(QObject *guard);
 };
 
 void setupAndroidDevice();
+void setupAndroidDeviceManager(QObject *guard);
 
 } // Android::Internal
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index 2ad8e2c6851..0d2bd90a8b3 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -78,17 +78,6 @@ void setupAndroidDeployConfiguration()
     static AndroidDeployConfigurationFactory theAndroidDeployConfigurationFactory;
 }
 
-class AndroidPluginPrivate : public QObject
-{
-public:
-    AndroidDeviceManager deviceManager;
-};
-
-AndroidPlugin::~AndroidPlugin()
-{
-    delete d;
-}
-
 void AndroidPlugin::initialize()
 {
     setupAndroidConfigurations();
@@ -98,7 +87,7 @@ void AndroidPlugin::initialize()
     setupAndroidQtVersion();
     setupAndroidToolchain();
 
-    d = new AndroidPluginPrivate;
+    setupAndroidDeviceManager(this);
 
     setupAndroidSettingsPage();
 
diff --git a/src/plugins/android/androidplugin.h b/src/plugins/android/androidplugin.h
index e1c36608466..75b19d24f07 100644
--- a/src/plugins/android/androidplugin.h
+++ b/src/plugins/android/androidplugin.h
@@ -12,15 +12,11 @@ class AndroidPlugin final : public ExtensionSystem::IPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Android.json")
 
-    ~AndroidPlugin() final;
-
     void initialize() final;
 
     void kitsRestored();
     void askUserAboutAndroidSetup();
 
-    class AndroidPluginPrivate *d = nullptr;
-
 #ifdef WITH_TESTS
 private slots:
    void testAndroidConfigAvailableNdkPlatforms_data();