Commit 90dae025 authored by hjk's avatar hjk

android: remove unneeded enums, declarations and associated code

Change-Id: I8ec2b90ccfe1498f4188b50624f77436c1c1a492
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent ab6330ab
......@@ -109,7 +109,6 @@ AndroidDebugSupport::AndroidDebugSupport(AndroidRunConfiguration *runConfig,
DebuggerRunControl *runControl)
: QObject(runControl), m_runControl(runControl),
m_runner(new AndroidRunner(this, runConfig, true)),
m_debuggingType(runConfig->debuggingType()),
m_gdbServerPort(5039), m_qmlPort(runConfig->debuggerAspect()->qmlDebugServerPort())
{
Q_ASSERT(runConfig->debuggerAspect()->useCppDebugger() || runConfig->debuggerAspect()->useQmlDebugger());
......
......@@ -69,7 +69,6 @@ private:
private:
Debugger::DebuggerRunControl* m_runControl;
AndroidRunner * const m_runner;
const AndroidRunConfiguration::DebuggingType m_debuggingType;
const QString m_dumperLib;
int m_gdbServerPort;
......
......@@ -121,15 +121,5 @@ QString AndroidRunConfiguration::proFilePath() const
return m_proFilePath;
}
AndroidRunConfiguration::DebuggingType AndroidRunConfiguration::debuggingType() const
{
if (debuggerAspect()->useCppDebugger()) {
if (debuggerAspect()->useQmlDebugger())
return DebugCppAndQml;
return DebugCppOnly;
}
return DebugQmlOnly;
}
} // namespace Internal
} // namespace Android
......@@ -39,10 +39,8 @@
namespace Android {
namespace Internal {
class AndroidDeviceConfigListModel;
class AndroidDeployStep;
class AndroidRunConfigurationFactory;
class AndroidToolChain;
class AndroidRunConfiguration : public ProjectExplorer::RunConfiguration
{
......@@ -50,13 +48,6 @@ class AndroidRunConfiguration : public ProjectExplorer::RunConfiguration
friend class AndroidRunConfigurationFactory;
public:
enum BaseEnvironmentBase {
CleanEnvironmentBase = 0,
SystemEnvironmentBase = 1
};
enum DebuggingType { DebugCppOnly, DebugQmlOnly, DebugCppAndQml };
AndroidRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &path);
QWidget *createConfigurationWidget();
......@@ -68,8 +59,6 @@ public:
AndroidConfig config() const;
QString proFilePath() const;
DebuggingType debuggingType() const;
const Utils::FileName gdbCmd() const;
const QString remoteChannel() const;
const QString dumperLib() const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment