feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Use latest setup pattern for AndroidDeviceManager

Browse Source 
More uniform.

Change-Id: I93f6190f3fe4ad89f635e2968ae6e9ae1343610f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2025-01-13 12:48:01 +01:00
parent 1d7fd9a781
commit 74ef874b9e
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/android/androiddevice.cpp
View File

@@ -30,6 +30,7 @@
#include <utils/port.h> #include <utils/port.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <utils/shutdownguard.h>
#include <utils/url.h> #include <utils/url.h>
#include <QFileSystemWatcher> #include <QFileSystemWatcher>
@@ -89,7 +90,7 @@ static SdkToolResult runAdbCommand(const QStringList &args)
class AndroidDeviceManagerInstance : public QObject class AndroidDeviceManagerInstance : public QObject
{ {
public: public:
AndroidDeviceManagerInstance(QObject *parent); AndroidDeviceManagerInstance();
~AndroidDeviceManagerInstance() ~AndroidDeviceManagerInstance()
{ {
QTC_ASSERT(s_instance == this, return); QTC_ASSERT(s_instance == this, return);
@@ -99,7 +100,7 @@ public:
void setupDevicesWatcher(); void setupDevicesWatcher();
void eraseAvd(const IDevice::Ptr &device, QWidget *parent); void eraseAvd(const IDevice::Ptr &device, QWidget *parent);
Group m_avdListRecipe; Group m_avdListRecipe{};
TaskTreeRunner m_avdListRunner; TaskTreeRunner m_avdListRunner;
TaskTreeRunner m_avdDeviceWatcherRunner; TaskTreeRunner m_avdDeviceWatcherRunner;
std::unique_ptr<Process> m_removeAvdProcess; std::unique_ptr<Process> m_removeAvdProcess;
@@ -842,9 +843,7 @@ static void handleAvdListChange(const AndroidDeviceInfoList &avdList)
} }
} }
AndroidDeviceManagerInstance::AndroidDeviceManagerInstance(QObject *parent) AndroidDeviceManagerInstance::AndroidDeviceManagerInstance()
: QObject(parent)
, m_avdListRecipe{}
{ {
QTC_ASSERT(!s_instance, return); QTC_ASSERT(!s_instance, return);
s_instance = this; s_instance = this;
@@ -1092,9 +1091,9 @@ void setupAndroidDevice()
static AndroidDeviceFactory theAndroidDeviceFactory; static AndroidDeviceFactory theAndroidDeviceFactory;
} }
void setupAndroidDeviceManager(QObject *guard) void setupAndroidDeviceManager()
{ {
(void) new AndroidDeviceManagerInstance(guard); static GuardedObject<AndroidDeviceManagerInstance> theAndroidDeviceManager;
} }
} // Android::Internal } // Android::Internal

2
src/plugins/android/androiddevice.h
View File

@@ -74,6 +74,6 @@ Tasking::Group createAvdRecipe(const Tasking::Storage<std::optional<QString>> &e
const CreateAvdInfo &info, bool force); const CreateAvdInfo &info, bool force);
void setupAndroidDevice(); void setupAndroidDevice();
void setupAndroidDeviceManager(QObject *guard); void setupAndroidDeviceManager();
} // Android::Internal } // Android::Internal

2
src/plugins/android/androidplugin.cpp
View File

@@ -84,7 +84,7 @@ class AndroidPlugin final : public ExtensionSystem::IPlugin
setupAndroidQtVersion(); setupAndroidQtVersion();
setupAndroidToolchain(); setupAndroidToolchain();
setupAndroidDeviceManager(this); setupAndroidDeviceManager();
setupAndroidSettingsPage(); setupAndroidSettingsPage();