Commit bab670af authored by hjk's avatar hjk
Browse files

android: code cosmetics



Fix whitespace, capitalization, naming, comments, add 'using'
in .cpp, remove 'using' in .h, remove unneeded Q_UNUSED, add
needed Q_UNUSED, etc.

Change-Id: Ibf9ba57850cbea1e79e152ec0165c8b01fa66567
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent d215470b
......@@ -54,6 +54,7 @@
#include <unistd.h>
#endif
using namespace ProjectExplorer;
using namespace Utils;
namespace Android {
......@@ -94,25 +95,24 @@ namespace {
}
}
QLatin1String AndroidConfigurations::toolchainPrefix(ProjectExplorer::Abi::Architecture architecture)
QLatin1String AndroidConfigurations::toolchainPrefix(Abi::Architecture architecture)
{
switch (architecture) {
case ProjectExplorer::Abi::ArmArchitecture:
case Abi::ArmArchitecture:
return ArmToolchainPrefix;
case ProjectExplorer::Abi::X86Architecture:
case Abi::X86Architecture:
return X86ToolchainPrefix;
default:
return Unknown;
}
}
QLatin1String AndroidConfigurations::toolsPrefix(ProjectExplorer::Abi::Architecture architecture)
QLatin1String AndroidConfigurations::toolsPrefix(Abi::Architecture architecture)
{
switch (architecture) {
case ProjectExplorer::Abi::ArmArchitecture:
case Abi::ArmArchitecture:
return ArmToolsPrefix;
case ProjectExplorer::Abi::X86Architecture:
case Abi::X86Architecture:
return X86ToolsPrefix;
default:
return Unknown;
......@@ -122,16 +122,16 @@ QLatin1String AndroidConfigurations::toolsPrefix(ProjectExplorer::Abi::Architect
AndroidConfig::AndroidConfig(const QSettings &settings)
{
// user settings
armGdbLocation = Utils::FileName::fromString(settings.value(ArmGdbLocationKey).toString());
armGdbserverLocation = Utils::FileName::fromString(settings.value(ArmGdbserverLocationKey).toString());
x86GdbLocation = Utils::FileName::fromString(settings.value(X86GdbLocationKey).toString());
x86GdbserverLocation = Utils::FileName::fromString(settings.value(X86GdbserverLocationKey).toString());
armGdbLocation = FileName::fromString(settings.value(ArmGdbLocationKey).toString());
armGdbserverLocation = FileName::fromString(settings.value(ArmGdbserverLocationKey).toString());
x86GdbLocation = FileName::fromString(settings.value(X86GdbLocationKey).toString());
x86GdbserverLocation = FileName::fromString(settings.value(X86GdbserverLocationKey).toString());
partitionSize = settings.value(PartitionSizeKey, 1024).toInt();
sdkLocation = Utils::FileName::fromString(settings.value(SDKLocationKey).toString());
ndkLocation = Utils::FileName::fromString(settings.value(NDKLocationKey).toString());
antLocation = Utils::FileName::fromString(settings.value(AntLocationKey).toString());
openJDKLocation = Utils::FileName::fromString(settings.value(OpenJDKLocationKey).toString());
keystoreLocation = Utils::FileName::fromString(settings.value(KeystoreLocationKey).toString());
sdkLocation = FileName::fromString(settings.value(SDKLocationKey).toString());
ndkLocation = FileName::fromString(settings.value(NDKLocationKey).toString());
antLocation = FileName::fromString(settings.value(AntLocationKey).toString());
openJDKLocation = FileName::fromString(settings.value(OpenJDKLocationKey).toString());
keystoreLocation = FileName::fromString(settings.value(KeystoreLocationKey).toString());
QRegExp versionRegExp(NDKGccVersionRegExp);
const QString &value = settings.value(NDKToolchainVersionKey).toString();
......@@ -145,11 +145,11 @@ AndroidConfig::AndroidConfig(const QSettings &settings)
if (reader.load(settingsFileName())
&& settings.value(changeTimeStamp).toInt() != QFileInfo(settingsFileName()).lastModified().toMSecsSinceEpoch() / 1000) {
// persisten settings
sdkLocation = Utils::FileName::fromString(reader.restoreValue(SDKLocationKey).toString());
ndkLocation = Utils::FileName::fromString(reader.restoreValue(NDKLocationKey).toString());
antLocation = Utils::FileName::fromString(reader.restoreValue(AntLocationKey).toString());
openJDKLocation = Utils::FileName::fromString(reader.restoreValue(OpenJDKLocationKey).toString());
keystoreLocation = Utils::FileName::fromString(reader.restoreValue(KeystoreLocationKey).toString());
sdkLocation = FileName::fromString(reader.restoreValue(SDKLocationKey).toString());
ndkLocation = FileName::fromString(reader.restoreValue(NDKLocationKey).toString());
antLocation = FileName::fromString(reader.restoreValue(AntLocationKey).toString());
openJDKLocation = FileName::fromString(reader.restoreValue(OpenJDKLocationKey).toString());
keystoreLocation = FileName::fromString(reader.restoreValue(KeystoreLocationKey).toString());
QRegExp versionRegExp(NDKGccVersionRegExp);
const QString &value = reader.restoreValue(NDKToolchainVersionKey).toString();
......@@ -159,16 +159,16 @@ AndroidConfig::AndroidConfig(const QSettings &settings)
ndkToolchainVersion = value.mid(versionRegExp.indexIn(value)+1);
if (armGdbLocation.isEmpty())
armGdbLocation = Utils::FileName::fromString(reader.restoreValue(ArmGdbLocationKey).toString());
armGdbLocation = FileName::fromString(reader.restoreValue(ArmGdbLocationKey).toString());
if (armGdbserverLocation.isEmpty())
armGdbserverLocation = Utils::FileName::fromString(reader.restoreValue(ArmGdbserverLocationKey).toString());
armGdbserverLocation = FileName::fromString(reader.restoreValue(ArmGdbserverLocationKey).toString());
if (x86GdbLocation.isEmpty())
x86GdbLocation = Utils::FileName::fromString(reader.restoreValue(X86GdbLocationKey).toString());
x86GdbLocation = FileName::fromString(reader.restoreValue(X86GdbLocationKey).toString());
if (x86GdbserverLocation.isEmpty())
x86GdbserverLocation = Utils::FileName::fromString(reader.restoreValue(X86GdbserverLocationKey).toString());
x86GdbserverLocation = FileName::fromString(reader.restoreValue(X86GdbserverLocationKey).toString());
// persistent settings
}
......@@ -197,8 +197,6 @@ void AndroidConfig::save(QSettings &settings) const
settings.setValue(X86GdbLocationKey, x86GdbLocation.toString());
settings.setValue(X86GdbserverLocationKey, x86GdbserverLocation.toString());
settings.setValue(PartitionSizeKey, partitionSize);
// user settings
}
void AndroidConfigurations::setConfig(const AndroidConfig &devConfigs)
......@@ -212,7 +210,7 @@ void AndroidConfigurations::setConfig(const AndroidConfig &devConfigs)
void AndroidConfigurations::updateAvailablePlatforms()
{
m_availablePlatforms.clear();
Utils::FileName path = m_config.ndkLocation;
FileName path = m_config.ndkLocation;
QDirIterator it(path.appendPath(QLatin1String("platforms")).toString(), QStringList() << QLatin1String("android-*"), QDir::Dirs);
while (it.hasNext()) {
const QString &fileName = it.next();
......@@ -246,7 +244,7 @@ QStringList AndroidConfigurations::ndkToolchainVersions() const
{
QRegExp versionRegExp(NDKGccVersionRegExp);
QStringList result;
Utils::FileName path = m_config.ndkLocation;
FileName path = m_config.ndkLocation;
QDirIterator it(path.appendPath(QLatin1String("toolchains")).toString(),
QStringList() << QLatin1String("*"), QDir::Dirs);
while (it.hasNext()) {
......@@ -261,46 +259,46 @@ QStringList AndroidConfigurations::ndkToolchainVersions() const
return result;
}
Utils::FileName AndroidConfigurations::adbToolPath() const
FileName AndroidConfigurations::adbToolPath() const
{
Utils::FileName path = m_config.sdkLocation;
FileName path = m_config.sdkLocation;
return path.appendPath(QLatin1String("platform-tools/adb" ANDROID_EXE_SUFFIX));
}
Utils::FileName AndroidConfigurations::androidToolPath() const
FileName AndroidConfigurations::androidToolPath() const
{
#ifdef Q_OS_WIN32
// I want to switch from using android.bat to using an executable. All it really does is call
// Java and I've made some progress on it. So if android.exe exists, return that instead.
Utils::FileName path = m_config.sdkLocation;
FileName path = m_config.sdkLocation;
path.appendPath(QLatin1String("tools/android"ANDROID_EXE_SUFFIX));
if (path.toFileInfo().exists())
return path;
path = m_config.sdkLocation;
return path.appendPath(QLatin1String("tools/android"ANDROID_BAT_SUFFIX));
#else
Utils::FileName path = m_config.sdkLocation;
FileName path = m_config.sdkLocation;
return path.appendPath(QLatin1String("tools/android"));
#endif
}
Utils::FileName AndroidConfigurations::antToolPath() const
FileName AndroidConfigurations::antToolPath() const
{
if (!m_config.antLocation.isEmpty())
return m_config.antLocation;
else
return Utils::FileName::fromString(QLatin1String("ant"));
return FileName::fromString(QLatin1String("ant"));
}
Utils::FileName AndroidConfigurations::emulatorToolPath() const
FileName AndroidConfigurations::emulatorToolPath() const
{
Utils::FileName path = m_config.sdkLocation;
FileName path = m_config.sdkLocation;
return path.appendPath(QLatin1String("tools/emulator" ANDROID_EXE_SUFFIX));
}
Utils::FileName AndroidConfigurations::toolPath(ProjectExplorer::Abi::Architecture architecture) const
FileName AndroidConfigurations::toolPath(Abi::Architecture architecture) const
{
Utils::FileName path = m_config.ndkLocation;
FileName path = m_config.ndkLocation;
return path.appendPath(QString::fromLatin1("toolchains/%1-%2/prebuilt/%3/bin/%4")
.arg(toolchainPrefix(architecture))
.arg(m_config.ndkToolchainVersion)
......@@ -308,56 +306,56 @@ Utils::FileName AndroidConfigurations::toolPath(ProjectExplorer::Abi::Architectu
.arg(toolsPrefix(architecture)));
}
Utils::FileName AndroidConfigurations::stripPath(ProjectExplorer::Abi::Architecture architecture) const
FileName AndroidConfigurations::stripPath(Abi::Architecture architecture) const
{
return toolPath(architecture).append(QLatin1String("-strip" ANDROID_EXE_SUFFIX));
}
Utils::FileName AndroidConfigurations::readelfPath(ProjectExplorer::Abi::Architecture architecture) const
FileName AndroidConfigurations::readelfPath(Abi::Architecture architecture) const
{
return toolPath(architecture).append(QLatin1String("-readelf" ANDROID_EXE_SUFFIX));
}
Utils::FileName AndroidConfigurations::gccPath(ProjectExplorer::Abi::Architecture architecture) const
FileName AndroidConfigurations::gccPath(Abi::Architecture architecture) const
{
return toolPath(architecture).append(QLatin1String("-gcc" ANDROID_EXE_SUFFIX));
}
Utils::FileName AndroidConfigurations::gdbServerPath(ProjectExplorer::Abi::Architecture architecture) const
FileName AndroidConfigurations::gdbServerPath(Abi::Architecture architecture) const
{
Utils::FileName gdbServerPath;
FileName gdbServerPath;
switch (architecture) {
case ProjectExplorer::Abi::ArmArchitecture:
case Abi::ArmArchitecture:
gdbServerPath = m_config.armGdbserverLocation;
break;
case ProjectExplorer::Abi::X86Architecture:
case Abi::X86Architecture:
gdbServerPath = m_config.x86GdbserverLocation;
break;
default:
gdbServerPath = Utils::FileName::fromString(Unknown);
gdbServerPath = FileName::fromString(Unknown);
break;
}
if (!gdbServerPath.isEmpty())
return gdbServerPath;
Utils::FileName path = m_config.ndkLocation;
FileName path = m_config.ndkLocation;
return path.appendPath(QString::fromLatin1("toolchains/%1-%2/prebuilt/gdbserver")
.arg(toolchainPrefix(architecture))
.arg(m_config.ndkToolchainVersion));
}
Utils::FileName AndroidConfigurations::gdbPath(ProjectExplorer::Abi::Architecture architecture) const
FileName AndroidConfigurations::gdbPath(Abi::Architecture architecture) const
{
Utils::FileName gdbPath;
FileName gdbPath;
switch (architecture) {
case ProjectExplorer::Abi::ArmArchitecture:
case Abi::ArmArchitecture:
gdbPath = m_config.armGdbLocation;
break;
case ProjectExplorer::Abi::X86Architecture:
case Abi::X86Architecture:
gdbPath = m_config.x86GdbLocation;
break;
default:
gdbPath = Utils::FileName::fromString(Unknown);
gdbPath = FileName::fromString(Unknown);
break;
}
if (!gdbPath.isEmpty())
......@@ -365,30 +363,30 @@ Utils::FileName AndroidConfigurations::gdbPath(ProjectExplorer::Abi::Architectur
return toolPath(architecture).append(QLatin1String("-gdb" ANDROID_EXE_SUFFIX));
}
Utils::FileName AndroidConfigurations::openJDKPath() const
FileName AndroidConfigurations::openJDKPath() const
{
return m_config.openJDKLocation;
}
Utils::FileName AndroidConfigurations::openJDKBinPath() const
FileName AndroidConfigurations::openJDKBinPath() const
{
Utils::FileName path = m_config.openJDKLocation;
FileName path = m_config.openJDKLocation;
if (!path.isEmpty())
return path.appendPath(QLatin1String("bin"));
return path;
}
Utils::FileName AndroidConfigurations::keytoolPath() const
FileName AndroidConfigurations::keytoolPath() const
{
return openJDKBinPath().appendPath(keytoolName);
}
Utils::FileName AndroidConfigurations::jarsignerPath() const
FileName AndroidConfigurations::jarsignerPath() const
{
return openJDKBinPath().appendPath(jarsignerName);
}
Utils::FileName AndroidConfigurations::zipalignPath() const
FileName AndroidConfigurations::zipalignPath() const
{
Utils::FileName path = m_config.sdkLocation;
return path.appendPath(QLatin1String("tools/zipalign" ANDROID_EXE_SUFFIX));
......
......@@ -78,7 +78,8 @@ public:
unsigned partitionSize;
};
struct AndroidDeviceInfo {
struct AndroidDeviceInfo
{
QString serialNumber;
QString cpuABI;
int sdk;
......@@ -87,9 +88,8 @@ struct AndroidDeviceInfo {
class AndroidConfigurations : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(AndroidConfigurations)
public:
public:
static AndroidConfigurations &instance(QObject *parent = 0);
AndroidConfig config() const { return m_config; }
void setConfig(const AndroidConfig &config);
......
......@@ -31,7 +31,7 @@
#ifndef ANDROIDCONSTANTS_H
#define ANDROIDCONSTANTS_H
#include <QLatin1String>
#include <QtGlobal>
namespace Android {
namespace Internal {
......@@ -44,8 +44,6 @@ enum AndroidQemuStatus {
AndroidQemuUserReason
};
#define ANDROID_PREFIX "Qt4ProjectManager.AndroidRunConfiguration"
#ifdef Q_OS_WIN32
#define ANDROID_EXE_SUFFIX ".exe"
#define ANDROID_BAT_SUFFIX ".bat"
......@@ -54,8 +52,6 @@ enum AndroidQemuStatus {
#define ANDROID_BAT_SUFFIX ""
#endif
static const QLatin1String ANDROID_RC_ID_PREFIX(ANDROID_PREFIX ":");
} // namespace Internal
namespace Constants {
......@@ -68,8 +64,7 @@ const char ANDROIDQT[] = "Qt4ProjectManager.QtVersion.Android";
const char ANDROID_DEVICE_TYPE[] = "Android.Device.Type";
const char ANDROID_DEVICE_ID[] = "Android Device";
}
} // namespace Constants;
} // namespace Android
#endif // ANDROIDCONSTANTS_H
......@@ -41,6 +41,7 @@ QT_END_NAMESPACE
namespace Android {
namespace Internal {
class AndroidCreateKeystoreCertificate : public QDialog
{
Q_OBJECT
......
......@@ -191,4 +191,4 @@ QStringList AndroidDebugSupport::qtSoPaths(QtSupport::BaseQtVersion *qtVersion)
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace Android
......@@ -34,16 +34,12 @@
#include "androidrunconfiguration.h"
#include <QObject>
#include <QPointer>
namespace Debugger {
class DebuggerRunControl;
}
namespace Debugger { class DebuggerRunControl; }
namespace QtSupport {class BaseQtVersion; }
namespace ProjectExplorer { class RunControl; }
namespace Android {
namespace Internal {
class AndroidRunConfiguration;
......@@ -52,6 +48,7 @@ class AndroidRunner;
class AndroidDebugSupport : public QObject
{
Q_OBJECT
public:
static ProjectExplorer::RunControl *createDebugRunControl(AndroidRunConfiguration *runConfig);
......
......@@ -42,40 +42,36 @@
#include <qtsupport/qtprofileinformation.h>
#include <qtsupport/qtsupportconstants.h>
using namespace Android::Internal;
using namespace ProjectExplorer;
AndroidDeployConfiguration::AndroidDeployConfiguration(ProjectExplorer::Target *parent, Core::Id id)
:DeployConfiguration(parent, id)
namespace Android {
namespace Internal {
AndroidDeployConfiguration::AndroidDeployConfiguration(Target *parent, Core::Id id)
: DeployConfiguration(parent, id)
{
setDisplayName(tr("Deploy to Android device"));
setDefaultDisplayName(displayName());
}
AndroidDeployConfiguration::~AndroidDeployConfiguration()
AndroidDeployConfiguration::AndroidDeployConfiguration(Target *parent, DeployConfiguration *source)
: DeployConfiguration(parent, source)
{
}
AndroidDeployConfiguration::AndroidDeployConfiguration(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source)
:DeployConfiguration(parent, source)
{
}
AndroidDeployConfigurationFactory::AndroidDeployConfigurationFactory(QObject *parent) :
ProjectExplorer::DeployConfigurationFactory(parent)
AndroidDeployConfigurationFactory::AndroidDeployConfigurationFactory(QObject *parent)
: DeployConfigurationFactory(parent)
{
setObjectName(QLatin1String("AndroidDeployConfigurationFactory"));
}
bool AndroidDeployConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const Core::Id id) const
bool AndroidDeployConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
{
return availableCreationIds(parent).contains(id);
}
ProjectExplorer::DeployConfiguration *AndroidDeployConfigurationFactory::create(ProjectExplorer::Target *parent, const Core::Id id)
DeployConfiguration *AndroidDeployConfigurationFactory::create(Target *parent, const Core::Id id)
{
Q_UNUSED(id);
AndroidDeployConfiguration *dc = new AndroidDeployConfiguration(parent, id);
if (!dc)
return 0;
......@@ -85,17 +81,17 @@ ProjectExplorer::DeployConfiguration *AndroidDeployConfigurationFactory::create(
return dc;
}
bool AndroidDeployConfigurationFactory::canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const
bool AndroidDeployConfigurationFactory::canRestore(Target *parent, const QVariantMap &map) const
{
return canCreate(parent, ProjectExplorer::idFromMap(map));
return canCreate(parent, idFromMap(map));
}
ProjectExplorer::DeployConfiguration *AndroidDeployConfigurationFactory::restore(ProjectExplorer::Target *parent, const QVariantMap &map)
DeployConfiguration *AndroidDeployConfigurationFactory::restore(Target *parent, const QVariantMap &map)
{
if (!canRestore(parent, map))
return 0;
AndroidDeployConfiguration *dc = new AndroidDeployConfiguration(parent, ProjectExplorer::idFromMap(map));
AndroidDeployConfiguration *dc = new AndroidDeployConfiguration(parent, idFromMap(map));
if (dc->fromMap(map))
return dc;
......@@ -103,21 +99,21 @@ ProjectExplorer::DeployConfiguration *AndroidDeployConfigurationFactory::restore
return 0;
}
bool AndroidDeployConfigurationFactory::canClone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source) const
bool AndroidDeployConfigurationFactory::canClone(Target *parent, DeployConfiguration *source) const
{
if (!AndroidManager::supportsAndroid(parent))
return false;
return source->id() == ANDROID_DEPLOYCONFIGURATION_ID;
}
ProjectExplorer::DeployConfiguration *AndroidDeployConfigurationFactory::clone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source)
DeployConfiguration *AndroidDeployConfigurationFactory::clone(Target *parent, DeployConfiguration *source)
{
if (!canClone(parent, source))
return 0;
return new AndroidDeployConfiguration(parent, source);
}
QList<Core::Id> AndroidDeployConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
QList<Core::Id> AndroidDeployConfigurationFactory::availableCreationIds(Target *parent) const
{
QList<Core::Id> ids;
if (!qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project()))
......@@ -126,10 +122,9 @@ QList<Core::Id> AndroidDeployConfigurationFactory::availableCreationIds(ProjectE
if (!parent->project()->supportsProfile(parent->profile()))
return ids;
ProjectExplorer::ToolChain *tc
= ProjectExplorer::ToolChainProfileInformation::toolChain(parent->profile());
ToolChain *tc = ToolChainProfileInformation::toolChain(parent->profile());
if (!tc || tc->targetAbi().osFlavor() != ProjectExplorer::Abi::AndroidLinuxFlavor)
if (!tc || tc->targetAbi().osFlavor() != Abi::AndroidLinuxFlavor)
return ids;
if (QtSupport::QtProfileInformation::qtVersion(parent->profile())->type() != QLatin1String(Constants::ANDROIDQT))
......@@ -141,12 +136,15 @@ QList<Core::Id> AndroidDeployConfigurationFactory::availableCreationIds(ProjectE
QString AndroidDeployConfigurationFactory::displayNameForId(const Core::Id id) const
{
if (id.toString().startsWith(QLatin1String(ANDROID_DC_PREFIX)))
if (id.name().startsWith(ANDROID_DC_PREFIX))
return tr("Deploy on Android");
return QString();
}
bool AndroidDeployConfigurationFactory::canHandle(ProjectExplorer::Target *parent) const
bool AndroidDeployConfigurationFactory::canHandle(Target *parent) const
{
return AndroidManager::supportsAndroid(parent);
}
} // namespace Internal
} // namespace Android
......@@ -28,15 +28,14 @@
**
**************************************************************************/
#ifndef QT4PROJECTMANAGER_QT4ANDROIDDEPLOYCONFIGURATION_H
#define QT4PROJECTMANAGER_QT4ANDROIDDEPLOYCONFIGURATION_H
#ifndef ANDROIDDEPLOYCONFIGURATION_H
#define ANDROIDDEPLOYCONFIGURATION_H
#include <projectexplorer/deployconfiguration.h>
namespace Android {
namespace Internal {
class Target;
const char ANDROID_DEPLOYCONFIGURATION_ID[] = "Qt4ProjectManager.AndroidDeployConfiguration";
const char ANDROID_DC_PREFIX[] = "Qt4ProjectManager.AndroidDeployConfiguration.";
......@@ -47,7 +46,7 @@ class AndroidDeployConfiguration : public ProjectExplorer::DeployConfiguration
public:
AndroidDeployConfiguration(ProjectExplorer::Target *parent, Core::Id id);
virtual ~AndroidDeployConfiguration();
protected:
AndroidDeployConfiguration(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source);
......@@ -78,4 +77,4 @@ private:
} // namespace Internal
} // namespace Android
#endif // QT4PROJECTMANAGER_QT4ANDROIDDEPLOYCONFIGURATION_H
#endif // ANDROIDDEPLOYCONFIGURATION_H
......@@ -77,6 +77,7 @@ bool AndroidDeployStepFactory::canCreate(BuildStepList *parent, const Core::Id i
BuildStep *AndroidDeployStepFactory::create(BuildStepList *parent, const Core::Id id)
{
Q_ASSERT(canCreate(parent, id));
Q_UNUSED(id);
return new AndroidDeployStep(parent);
}
......
......@@ -34,9 +34,7 @@
#include <projectexplorer/buildstep.h>
QT_BEGIN_NAMESPACE
namespace Ui {
class AndroidDeployStepWidget;
}
namespace Ui { class AndroidDeployStepWidget; }
QT_END_NAMESPACE
namespace Android {
......
......@@ -49,7 +49,7 @@ AndroidDevice::AndroidDevice()
}
AndroidDevice::AndroidDevice(const AndroidDevice &other)
: ProjectExplorer::IDevice(other)
: IDevice(other)
{ }
......
......@@ -32,7 +32,6 @@
#include "androiddevice.h"
#include "androidconstants.h"
#include <coreplugin/id.h>
namespace Android {