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

Android: Some code cosmetics

Browse Source 
The naming scheme of the internal object was changed
to the usual pimpl pattern.

Also setup device update connection in the device constructory

Change-Id: I5cbb7a9d870a7d1f0e91e54f2ad6dfb95ea63e37
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2018-02-09 16:16:38 +01:00
parent cbed562175
commit b0b4022470
4 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidconfigurations.h
View File

@@ -52,9 +52,11 @@ class Project;
namespace Android {
class AndroidPluginRunData;
namespace Internal { class AndroidSdkManager; }
namespace Internal {
class AndroidSdkManager;
class AndroidPluginPrivate;
}
class AndroidDeviceInfo
{
@@ -195,7 +197,6 @@ public:
static void setConfig(const AndroidConfig &config);
static AndroidConfigurations *instance();
static void updateAndroidDevice();
static AndroidDeviceInfo showDeviceDialog(ProjectExplorer::Project *project, int apiLevel, const QString &abi);
static void setDefaultDevice(ProjectExplorer::Project *project, const QString &abi, const QString &serialNumber); // serial number or avd name
static QString defaultDevice(ProjectExplorer::Project *project, const QString &abi); // serial number or avd name
@@ -210,12 +211,13 @@ signals:
void updated();
private:
friend class Android::AndroidPluginRunData;
friend class Android::Internal::AndroidPluginPrivate;
AndroidConfigurations();
~AndroidConfigurations();
void load();
void save();
static void updateAndroidDevice();
static AndroidConfigurations *m_instance;
AndroidConfig m_config;
std::unique_ptr<Internal::AndroidSdkManager> m_sdkManager;