Android: Some code cosmetics

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

View File

@@ -56,11 +56,11 @@
using namespace ProjectExplorer;
using namespace ProjectExplorer::Constants;
using namespace Android::Internal;
namespace Android {
namespace Internal {
class AndroidPluginRunData
class AndroidPluginPrivate
{
public:
AndroidConfigurations androidConfiguration;
@@ -76,12 +76,9 @@ public:
AndroidManifestEditorFactory manifestEditorFactory;
};
AndroidPlugin::AndroidPlugin()
{ }
AndroidPlugin::~AndroidPlugin()
{
delete m_runData;
delete d;
}
bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessage)
@@ -96,15 +93,13 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
RunControl::registerWorker<AndroidRunConfiguration, AndroidQmlToolingSupport>(
QML_PREVIEW_RUN_MODE);
m_runData = new AndroidPluginRunData;
d = new AndroidPluginPrivate;
KitManager::registerKitInformation(new Internal::AndroidGdbServerKitInformation);
connect(KitManager::instance(), &KitManager::kitsLoaded,
this, &AndroidPlugin::kitsRestored);
connect(DeviceManager::instance(), &DeviceManager::devicesLoaded,
this, &AndroidPlugin::updateDevice);
return true;
}
@@ -117,9 +112,5 @@ void AndroidPlugin::kitsRestored()
this, &AndroidPlugin::kitsRestored);
}
void AndroidPlugin::updateDevice()
{
AndroidConfigurations::updateAndroidDevice();
}
} // namespace Internal
} // namespace Android