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

android: remove unneeded enums, declarations and associated code

Browse Source 
Change-Id: I8ec2b90ccfe1498f4188b50624f77436c1c1a492
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-08-14 14:09:30 +02:00
parent ab6330abe7
commit 90dae02528
4 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/android/androiddebugsupport.cpp
View File

@@ -109,7 +109,6 @@ AndroidDebugSupport::AndroidDebugSupport(AndroidRunConfiguration *runConfig,
DebuggerRunControl *runControl) DebuggerRunControl *runControl)
: QObject(runControl), m_runControl(runControl), : QObject(runControl), m_runControl(runControl),
m_runner(new AndroidRunner(this, runConfig, true)), m_runner(new AndroidRunner(this, runConfig, true)),
m_debuggingType(runConfig->debuggingType()),
m_gdbServerPort(5039), m_qmlPort(runConfig->debuggerAspect()->qmlDebugServerPort()) m_gdbServerPort(5039), m_qmlPort(runConfig->debuggerAspect()->qmlDebugServerPort())
{ {
Q_ASSERT(runConfig->debuggerAspect()->useCppDebugger() || runConfig->debuggerAspect()->useQmlDebugger()); Q_ASSERT(runConfig->debuggerAspect()->useCppDebugger() || runConfig->debuggerAspect()->useQmlDebugger());

1
src/plugins/android/androiddebugsupport.h
View File

@@ -69,7 +69,6 @@ private:
private: private:
Debugger::DebuggerRunControl* m_runControl; Debugger::DebuggerRunControl* m_runControl;
AndroidRunner * const m_runner; AndroidRunner * const m_runner;
const AndroidRunConfiguration::DebuggingType m_debuggingType;
const QString m_dumperLib; const QString m_dumperLib;
int m_gdbServerPort; int m_gdbServerPort;

10
src/plugins/android/androidrunconfiguration.cpp
View File

@@ -121,15 +121,5 @@ QString AndroidRunConfiguration::proFilePath() const
return m_proFilePath; return m_proFilePath;
} }
AndroidRunConfiguration::DebuggingType AndroidRunConfiguration::debuggingType() const
{
if (debuggerAspect()->useCppDebugger()) {
if (debuggerAspect()->useQmlDebugger())
return DebugCppAndQml;
return DebugCppOnly;
}
return DebugQmlOnly;
}
} // namespace Internal } // namespace Internal
} // namespace Android } // namespace Android

11
src/plugins/android/androidrunconfiguration.h
View File

@@ -39,10 +39,8 @@
namespace Android { namespace Android {
namespace Internal { namespace Internal {
class AndroidDeviceConfigListModel;
class AndroidDeployStep; class AndroidDeployStep;
class AndroidRunConfigurationFactory; class AndroidRunConfigurationFactory;
class AndroidToolChain;
class AndroidRunConfiguration : public ProjectExplorer::RunConfiguration class AndroidRunConfiguration : public ProjectExplorer::RunConfiguration
{ {
@@ -50,13 +48,6 @@ class AndroidRunConfiguration : public ProjectExplorer::RunConfiguration
friend class AndroidRunConfigurationFactory; friend class AndroidRunConfigurationFactory;
public: public:
enum BaseEnvironmentBase {
CleanEnvironmentBase = 0,
SystemEnvironmentBase = 1
};
enum DebuggingType { DebugCppOnly, DebugQmlOnly, DebugCppAndQml };
AndroidRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &path); AndroidRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &path);
QWidget *createConfigurationWidget(); QWidget *createConfigurationWidget();
@@ -68,8 +59,6 @@ public:
AndroidConfig config() const; AndroidConfig config() const;
QString proFilePath() const; QString proFilePath() const;
DebuggingType debuggingType() const;
const Utils::FileName gdbCmd() const; const Utils::FileName gdbCmd() const;
const QString remoteChannel() const; const QString remoteChannel() const;
const QString dumperLib() const; const QString dumperLib() const;