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

Debugger: Simplify GdbEngine construction

Browse Source 
Change-Id: I4af1cb7d7480b1db68693881254cbc89d985c33e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-09-26 15:22:14 +02:00
parent b11f304ffb
commit 0c8283234a
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -77,7 +77,7 @@ namespace Debugger {
namespace Internal { namespace Internal {
DebuggerEngine *createCdbEngine(QStringList *error, DebuggerStartMode sm); DebuggerEngine *createCdbEngine(QStringList *error, DebuggerStartMode sm);
DebuggerEngine *createGdbEngine(DebuggerStartMode sm); DebuggerEngine *createGdbEngine();
DebuggerEngine *createPdbEngine(); DebuggerEngine *createPdbEngine();
DebuggerEngine *createQmlEngine(bool useTerminal); DebuggerEngine *createQmlEngine(bool useTerminal);
DebuggerEngine *createQmlCppEngine(DebuggerEngine *cppEngine, bool useTerminal); DebuggerEngine *createQmlCppEngine(DebuggerEngine *cppEngine, bool useTerminal);
@@ -482,7 +482,7 @@ void DebuggerRunTool::start()
switch (m_runParameters.cppEngineType) { switch (m_runParameters.cppEngineType) {
case GdbEngineType: case GdbEngineType:
cppEngine = createGdbEngine(m_runParameters.startMode); cppEngine = createGdbEngine();
break; break;
case CdbEngineType: { case CdbEngineType: {
QStringList errors; QStringList errors;

9
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -189,8 +189,7 @@ private:
// //
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
GdbEngine::GdbEngine(DebuggerStartMode startMode) GdbEngine::GdbEngine()
: m_startMode(startMode)
{ {
setObjectName("GdbEngine"); setObjectName("GdbEngine");
@@ -4317,6 +4316,8 @@ bool GdbEngine::isTermEngine() const
void GdbEngine::setupEngine() void GdbEngine::setupEngine()
{ {
m_startMode = runParameters().startMode;
CHECK_STATE(EngineSetupRequested); CHECK_STATE(EngineSetupRequested);
showMessage("TRYING TO START ADAPTER"); showMessage("TRYING TO START ADAPTER");
@@ -5161,9 +5162,9 @@ QString GdbEngine::mainFunction() const
// Factory // Factory
// //
DebuggerEngine *createGdbEngine(DebuggerStartMode startMode) DebuggerEngine *createGdbEngine()
{ {
return new GdbEngine(startMode); return new GdbEngine;
} }
} // namespace Internal } // namespace Internal

4
src/plugins/debugger/gdb/gdbengine.h
View File

@@ -72,7 +72,7 @@ class GdbEngine : public DebuggerEngine
Q_OBJECT Q_OBJECT
public: public:
explicit GdbEngine(DebuggerStartMode startMode); GdbEngine();
~GdbEngine() final; ~GdbEngine() final;
private: ////////// General Interface ////////// private: ////////// General Interface //////////
@@ -92,7 +92,6 @@ private: ////////// General Interface //////////
////////// General State ////////// ////////// General State //////////
const DebuggerStartMode m_startMode;
bool m_registerNamesListed = false; bool m_registerNamesListed = false;
////////// Gdb Process Management ////////// ////////// Gdb Process Management //////////
@@ -462,6 +461,7 @@ private: ////////// General Interface //////////
Utils::QtcProcess m_gdbProc; Utils::QtcProcess m_gdbProc;
OutputCollector m_outputCollector; OutputCollector m_outputCollector;
QString m_errorString; QString m_errorString;
DebuggerStartMode m_startMode = NoStartMode;
}; };
} // namespace Internal } // namespace Internal