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

Android: Minor code cosmetics

Browse Source 
Connects, namespaces, includes, ...

Change-Id: I066a03e528df0e485f8ac473db94f17175277fb4
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
hjk
2016-04-29 23:06:26 +02:00
parent 411bc70df0
commit 10ca24347f
2 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,13 +46,17 @@
#endif
#include <coreplugin/icore.h>
#include <projectexplorer/devicesupport/devicemanager.h>
#include <projectexplorer/kitmanager.h>
#include <qtsupport/qtversionmanager.h>
#include <utils/mimetypes/mimedatabase.h>
#include <QtPlugin>
#include <projectexplorer/devicesupport/devicemanager.h>
using namespace ProjectExplorer;
namespace Android {
@@ -75,27 +79,27 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
addAutoReleasedObject(new Internal::AndroidDeviceFactory);
addAutoReleasedObject(new Internal::AndroidPotentialKit);
addAutoReleasedObject(new Internal::JavaEditorFactory);
ProjectExplorer::KitManager::registerKitInformation(new Internal::AndroidGdbServerKitInformation);
KitManager::registerKitInformation(new Internal::AndroidGdbServerKitInformation);
Utils::MimeDatabase::addMimeTypes(QLatin1String(":/android/Android.mimetypes.xml"));
addAutoReleasedObject(new Internal::AndroidManifestEditorFactory);
connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsLoaded()),
this, SLOT(kitsRestored()));
connect(KitManager::instance(), &KitManager::kitsLoaded,
this, &AndroidPlugin::kitsRestored);
connect(ProjectExplorer::DeviceManager::instance(), SIGNAL(devicesLoaded()),
this, SLOT(updateDevice()));
connect(DeviceManager::instance(), &DeviceManager::devicesLoaded,
this, &AndroidPlugin::updateDevice);
return true;
}
void AndroidPlugin::kitsRestored()
{
AndroidConfigurations::updateAutomaticKitList();
connect(QtSupport::QtVersionManager::instance(), SIGNAL(qtVersionsChanged(QList<int>,QList<int>,QList<int>)),
AndroidConfigurations::instance(), SLOT(updateAutomaticKitList()));
disconnect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()),
this, SLOT(kitsRestored()));
connect(QtSupport::QtVersionManager::instance(), &QtSupport::QtVersionManager::qtVersionsChanged,
AndroidConfigurations::instance(), &AndroidConfigurations::updateAutomaticKitList);
disconnect(KitManager::instance(), &KitManager::kitsChanged,
this, &AndroidPlugin::kitsRestored);
}
void AndroidPlugin::updateDevice()