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

Debugger et al: Move code from DebuggerRunControl to DebuggerRunTool

Browse Source 
It's tool specific, so put it into the tool (only) related code.

The additional level of indirection will go again, plus the original
one will be removed once the *DebugSupport classes can directly
use DebuggerRunTool as base.

Change-Id: Ieaa386a0f7d724b09cedaaba8fb7d1e6dc4ad55b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2017-04-21 17:20:57 +02:00
parent e720e72a25
commit 07884645af
13 changed files with 142 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/debugger/debuggerruncontrol.h
View File

@@ -58,10 +58,24 @@ public:
Internal::DebuggerEngine *engine() const { return m_engine; }
DebuggerRunControl *runControl() const;
void showMessage(const QString &msg, int channel, int timeout = -1);
void showMessage(const QString &msg, int channel = LogDebug, int timeout = -1);
void startIt();
void stopIt();
void handleFinished();
void startFailed();
void notifyEngineRemoteServerRunning(const QByteArray &msg, int pid);
void notifyEngineRemoteSetupFinished(const RemoteSetupResult &result);
void notifyInferiorIll();
Q_SLOT void notifyInferiorExited();
void quitDebugger();
void abortDebugger();
void debuggingFinished();
DebuggerStartParameters &startParameters(); // Used in Boot2Qt.
private:
Internal::DebuggerEngine *m_engine = nullptr; // Master engine
QStringList m_errors;
@@ -75,22 +89,10 @@ public:
DebuggerRunControl(ProjectExplorer::RunConfiguration *runConfig, Core::Id runMode);
~DebuggerRunControl() override;
// ProjectExplorer::RunControl
void start() override;
void stop() override; // Called from SnapshotWindow.
void startFailed();
void notifyEngineRemoteServerRunning(const QByteArray &msg, int pid);
void notifyEngineRemoteSetupFinished(const RemoteSetupResult &result);
void notifyInferiorIll();
Q_SLOT void notifyInferiorExited();
void quitDebugger();
void abortDebugger();
void debuggingFinished();
void showMessage(const QString &msg, int channel = LogDebug);
DebuggerStartParameters &startParameters(); // Used in Boot2Qt.
DebuggerRunTool *toolRunner() const;
signals:
void requestRemoteSetup();
@@ -98,7 +100,7 @@ signals:
void stateChanged(Debugger::DebuggerState state);
public:
Internal::DebuggerEngine *m_engine = nullptr; // FIXME: Remove.
DebuggerRunTool *m_debuggerTool = nullptr;
};
} // namespace Debugger