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

Debugger: Add 'override' to *Engine classes

Browse Source 
Thanks to clang-modernize.

Change-Id: Ie1998c32d492cb458b9b4649c425c0de272ce976
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
hjk
2015-09-10 11:01:09 +02:00
committed by David Schulz
parent 0095953e22
commit d15cb20ee2
6 changed files with 242 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,12 +188,12 @@ public:
: m_engine(engine) : m_engine(engine)
{} {}
bool canHandle(const Task &task) const bool canHandle(const Task &task) const override
{ {
return m_debugInfoTasks.contains(task.taskId); return m_debugInfoTasks.contains(task.taskId);
} }
void handle(const Task &task) void handle(const Task &task) override
{ {
m_engine->requestDebugInformation(m_debugInfoTasks.value(task.taskId)); m_engine->requestDebugInformation(m_debugInfoTasks.value(task.taskId));
} }
@@ -203,7 +203,7 @@ public:
m_debugInfoTasks[id] = task; m_debugInfoTasks[id] = task;
} }
QAction *createAction(QObject *parent) const QAction *createAction(QObject *parent) const override
{ {
QAction *action = new QAction(DebuggerPlugin::tr("Install &Debug Information"), parent); QAction *action = new QAction(DebuggerPlugin::tr("Install &Debug Information"), parent);
action->setToolTip(DebuggerPlugin::tr("Tries to install missing debug information.")); action->setToolTip(DebuggerPlugin::tr("Tries to install missing debug information."));

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

@@ -73,22 +73,22 @@ public:
~GdbEngine(); ~GdbEngine();
private: ////////// General Interface ////////// private: ////////// General Interface //////////
virtual DebuggerEngine *cppEngine() { return this; } DebuggerEngine *cppEngine() override { return this; }
virtual void setupEngine() = 0; virtual void setupEngine() = 0;
virtual void handleGdbStartFailed(); virtual void handleGdbStartFailed();
virtual void setupInferior() = 0; virtual void setupInferior() = 0;
virtual void notifyInferiorSetupFailed(); virtual void notifyInferiorSetupFailed() override;
virtual bool hasCapability(unsigned) const; virtual bool hasCapability(unsigned) const override;
virtual void detachDebugger(); virtual void detachDebugger() override;
virtual void shutdownInferior(); virtual void shutdownInferior() override;
virtual void shutdownEngine() = 0; virtual void shutdownEngine() = 0;
virtual void abortDebugger(); virtual void abortDebugger() override;
virtual void resetInferior(); virtual void resetInferior() override;
virtual bool acceptsDebuggerCommands() const; virtual bool acceptsDebuggerCommands() const override;
virtual void executeDebuggerCommand(const QString &command, DebuggerLanguages languages); virtual void executeDebuggerCommand(const QString &command, DebuggerLanguages languages) override;
private: ////////// General State ////////// private: ////////// General State //////////
@@ -224,7 +224,7 @@ protected:
StackFrame parseStackFrame(const GdbMi &mi, int level); StackFrame parseStackFrame(const GdbMi &mi, int level);
void resetCommandQueue(); void resetCommandQueue();
bool isSynchronous() const { return true; } bool isSynchronous() const override { return true; }
// Gdb initialization sequence // Gdb initialization sequence
void handleShowVersion(const DebuggerResponse &response); void handleShowVersion(const DebuggerResponse &response);
@@ -237,29 +237,29 @@ protected:
private: ////////// Inferior Management ////////// private: ////////// Inferior Management //////////
// This should be always the last call in a function. // This should be always the last call in a function.
bool stateAcceptsBreakpointChanges() const; bool stateAcceptsBreakpointChanges() const override;
bool acceptsBreakpoint(Breakpoint bp) const; bool acceptsBreakpoint(Breakpoint bp) const override;
void insertBreakpoint(Breakpoint bp); void insertBreakpoint(Breakpoint bp) override;
void removeBreakpoint(Breakpoint bp); void removeBreakpoint(Breakpoint bp) override;
void changeBreakpoint(Breakpoint bp); void changeBreakpoint(Breakpoint bp) override;
void executeStep(); void executeStep() override;
void executeStepOut(); void executeStepOut() override;
void executeNext(); void executeNext() override;
void executeStepI(); void executeStepI() override;
void executeNextI(); void executeNextI() override;
protected: protected:
void continueInferiorInternal(); void continueInferiorInternal();
void autoContinueInferior(); void autoContinueInferior();
void continueInferior(); void continueInferior() override;
void interruptInferior(); void interruptInferior() override;
virtual void interruptInferior2() {} virtual void interruptInferior2() {}
void executeRunToLine(const ContextData &data); void executeRunToLine(const ContextData &data) override;
void executeRunToFunction(const QString &functionName); void executeRunToFunction(const QString &functionName) override;
void executeJumpToLine(const ContextData &data); void executeJumpToLine(const ContextData &data) override;
void executeReturn(); void executeReturn() override;
void handleExecuteContinue(const DebuggerResponse &response); void handleExecuteContinue(const DebuggerResponse &response);
void handleExecuteStep(const DebuggerResponse &response); void handleExecuteStep(const DebuggerResponse &response);
@@ -274,8 +274,8 @@ private: ////////// Inferior Management //////////
private: ////////// View & Data Stuff ////////// private: ////////// View & Data Stuff //////////
void selectThread(ThreadId threadId); void selectThread(ThreadId threadId) override;
void activateFrame(int index); void activateFrame(int index) override;
// //
// Breakpoint specific stuff // Breakpoint specific stuff
@@ -301,13 +301,13 @@ private: ////////// View & Data Stuff //////////
// Modules specific stuff // Modules specific stuff
// //
protected: protected:
void loadSymbols(const QString &moduleName); void loadSymbols(const QString &moduleName) override;
Q_SLOT void loadAllSymbols(); Q_SLOT void loadAllSymbols() override;
void loadSymbolsForStack(); void loadSymbolsForStack() override;
void requestModuleSymbols(const QString &moduleName); void requestModuleSymbols(const QString &moduleName) override;
void requestModuleSections(const QString &moduleName); void requestModuleSections(const QString &moduleName) override;
void reloadModules(); void reloadModules() override;
void examineModules(); void examineModules() override;
void reloadModulesInternal(); void reloadModulesInternal();
void handleModulesList(const DebuggerResponse &response); void handleModulesList(const DebuggerResponse &response);
@@ -316,14 +316,14 @@ private: ////////// View & Data Stuff //////////
// //
// Snapshot specific stuff // Snapshot specific stuff
// //
virtual void createSnapshot(); virtual void createSnapshot() override;
void handleMakeSnapshot(const DebuggerResponse &response, const QString &coreFile); void handleMakeSnapshot(const DebuggerResponse &response, const QString &coreFile);
// //
// Register specific stuff // Register specific stuff
// //
Q_SLOT void reloadRegisters(); Q_SLOT void reloadRegisters() override;
void setRegisterValue(const QByteArray &name, const QString &value); void setRegisterValue(const QByteArray &name, const QString &value) override;
void handleRegisterListNames(const DebuggerResponse &response); void handleRegisterListNames(const DebuggerResponse &response);
void handleRegisterListing(const DebuggerResponse &response); void handleRegisterListing(const DebuggerResponse &response);
void handleRegisterListValues(const DebuggerResponse &response); void handleRegisterListValues(const DebuggerResponse &response);
@@ -334,7 +334,7 @@ private: ////////// View & Data Stuff //////////
// Disassembler specific stuff // Disassembler specific stuff
// //
// Chain of fallbacks: PointMixed -> PointPlain -> RangeMixed -> RangePlain. // Chain of fallbacks: PointMixed -> PointPlain -> RangeMixed -> RangePlain.
void fetchDisassembler(DisassemblerAgent *agent); void fetchDisassembler(DisassemblerAgent *agent) override;
void fetchDisassemblerByCliPointMixed(const DisassemblerAgentCookie &ac); void fetchDisassemblerByCliPointMixed(const DisassemblerAgentCookie &ac);
void fetchDisassemblerByCliRangeMixed(const DisassemblerAgentCookie &ac); void fetchDisassemblerByCliRangeMixed(const DisassemblerAgentCookie &ac);
void fetchDisassemblerByCliRangePlain(const DisassemblerAgentCookie &ac); void fetchDisassemblerByCliRangePlain(const DisassemblerAgentCookie &ac);
@@ -345,7 +345,7 @@ private: ////////// View & Data Stuff //////////
// //
// Source file specific stuff // Source file specific stuff
// //
void reloadSourceFiles(); void reloadSourceFiles() override;
void reloadSourceFilesInternal(); void reloadSourceFilesInternal();
void handleQuerySources(const DebuggerResponse &response); void handleQuerySources(const DebuggerResponse &response);
@@ -363,7 +363,7 @@ private: ////////// View & Data Stuff //////////
// Stack specific stuff // Stack specific stuff
// //
protected: protected:
void updateAll(); void updateAll() override;
void handleStackListFrames(const DebuggerResponse &response, bool isFull); void handleStackListFrames(const DebuggerResponse &response, bool isFull);
void handleStackSelectThread(const DebuggerResponse &response); void handleStackSelectThread(const DebuggerResponse &response);
void handleThreadListIds(const DebuggerResponse &response); void handleThreadListIds(const DebuggerResponse &response);
@@ -371,8 +371,8 @@ protected:
void handleThreadNames(const DebuggerResponse &response); void handleThreadNames(const DebuggerResponse &response);
DebuggerCommand stackCommand(int depth); DebuggerCommand stackCommand(int depth);
Q_SLOT void reloadStack(); Q_SLOT void reloadStack();
Q_SLOT virtual void reloadFullStack(); Q_SLOT virtual void reloadFullStack() override;
virtual void loadAdditionalQmlStack(); virtual void loadAdditionalQmlStack() override;
void handleQmlStackFrameArguments(const DebuggerResponse &response); void handleQmlStackFrameArguments(const DebuggerResponse &response);
void handleQmlStackTrace(const DebuggerResponse &response); void handleQmlStackTrace(const DebuggerResponse &response);
int currentFrame() const; int currentFrame() const;
@@ -383,17 +383,17 @@ protected:
// Watch specific stuff // Watch specific stuff
// //
virtual void assignValueInDebugger(WatchItem *item, virtual void assignValueInDebugger(WatchItem *item,
const QString &expr, const QVariant &value); const QString &expr, const QVariant &value) override;
virtual void fetchMemory(MemoryAgent *agent, QObject *token, virtual void fetchMemory(MemoryAgent *agent, QObject *token,
quint64 addr, quint64 length); quint64 addr, quint64 length) override;
void fetchMemoryHelper(const MemoryAgentCookie &cookie); void fetchMemoryHelper(const MemoryAgentCookie &cookie);
void handleChangeMemory(const DebuggerResponse &response); void handleChangeMemory(const DebuggerResponse &response);
virtual void changeMemory(MemoryAgent *agent, QObject *token, virtual void changeMemory(MemoryAgent *agent, QObject *token,
quint64 addr, const QByteArray &data); quint64 addr, const QByteArray &data) override;
void handleFetchMemory(const DebuggerResponse &response, MemoryAgentCookie ac); void handleFetchMemory(const DebuggerResponse &response, MemoryAgentCookie ac);
virtual void watchPoint(const QPoint &); virtual void watchPoint(const QPoint &) override;
void handleWatchPoint(const DebuggerResponse &response); void handleWatchPoint(const DebuggerResponse &response);
void showToolTip(); void showToolTip();
@@ -406,7 +406,7 @@ protected:
Q_SLOT void createFullBacktrace(); Q_SLOT void createFullBacktrace();
void handleCreateFullBacktrace(const DebuggerResponse &response); void handleCreateFullBacktrace(const DebuggerResponse &response);
void doUpdateLocals(const UpdateParameters &parameters); void doUpdateLocals(const UpdateParameters &parameters) override;
void handleStackFrame(const DebuggerResponse &response); void handleStackFrame(const DebuggerResponse &response);
void setLocals(const QList<GdbMi> &locals); void setLocals(const QList<GdbMi> &locals);
@@ -414,7 +414,7 @@ protected:
// //
// Dumper Management // Dumper Management
// //
void reloadDebuggingHelpers(); void reloadDebuggingHelpers() override;
QString m_gdb; QString m_gdb;
@@ -467,7 +467,7 @@ protected:
static QString msgConnectRemoteServerFailed(const QString &why); static QString msgConnectRemoteServerFailed(const QString &why);
static QByteArray dotEscape(QByteArray str); static QByteArray dotEscape(QByteArray str);
void debugLastCommand(); void debugLastCommand() override;
DebuggerCommand m_lastDebuggableCommand; DebuggerCommand m_lastDebuggableCommand;
protected: protected:

90
src/plugins/debugger/lldb/lldbengine.h
View File

@@ -71,64 +71,64 @@ signals:
void outputReady(const QByteArray &data); void outputReady(const QByteArray &data);
private: private:
DebuggerEngine *cppEngine() { return this; } DebuggerEngine *cppEngine() override { return this; }
void executeStep(); void executeStep() override;
void executeStepOut(); void executeStepOut() override;
void executeNext(); void executeNext() override;
void executeStepI(); void executeStepI() override;
void executeNextI(); void executeNextI() override;
void setupEngine(); void setupEngine() override;
void startLldb(); void startLldb();
void startLldbStage2(); void startLldbStage2();
void setupInferior(); void setupInferior() override;
void runEngine(); void runEngine() override;
void shutdownInferior(); void shutdownInferior() override;
void shutdownEngine(); void shutdownEngine() override;
void abortDebugger(); void abortDebugger() override;
bool canHandleToolTip(const DebuggerToolTipContext &) const; bool canHandleToolTip(const DebuggerToolTipContext &) const override;
void continueInferior(); void continueInferior() override;
void interruptInferior(); void interruptInferior() override;
void executeRunToLine(const ContextData &data); void executeRunToLine(const ContextData &data) override;
void executeRunToFunction(const QString &functionName); void executeRunToFunction(const QString &functionName) override;
void executeJumpToLine(const ContextData &data); void executeJumpToLine(const ContextData &data) override;
void activateFrame(int index); void activateFrame(int index) override;
void selectThread(ThreadId threadId); void selectThread(ThreadId threadId) override;
void fetchFullBacktrace(); void fetchFullBacktrace();
// This should be always the last call in a function. // This should be always the last call in a function.
bool stateAcceptsBreakpointChanges() const; bool stateAcceptsBreakpointChanges() const override;
bool acceptsBreakpoint(Breakpoint bp) const; bool acceptsBreakpoint(Breakpoint bp) const override;
void insertBreakpoint(Breakpoint bp); void insertBreakpoint(Breakpoint bp) override;
void removeBreakpoint(Breakpoint bp); void removeBreakpoint(Breakpoint bp) override;
void changeBreakpoint(Breakpoint bp); void changeBreakpoint(Breakpoint bp) override;
void assignValueInDebugger(WatchItem *item, const QString &expr, const QVariant &value); void assignValueInDebugger(WatchItem *item, const QString &expr, const QVariant &value) override;
void executeDebuggerCommand(const QString &command, DebuggerLanguages languages); void executeDebuggerCommand(const QString &command, DebuggerLanguages languages) override;
void loadSymbols(const QString &moduleName); void loadSymbols(const QString &moduleName) override;
void loadAllSymbols(); void loadAllSymbols() override;
void requestModuleSymbols(const QString &moduleName); void requestModuleSymbols(const QString &moduleName) override;
void reloadModules(); void reloadModules() override;
void reloadRegisters(); void reloadRegisters() override;
void reloadSourceFiles() {} void reloadSourceFiles() override {}
void reloadFullStack(); void reloadFullStack() override;
void reloadDebuggingHelpers(); void reloadDebuggingHelpers() override;
void fetchDisassembler(Internal::DisassemblerAgent *); void fetchDisassembler(Internal::DisassemblerAgent *) override;
bool isSynchronous() const { return true; } bool isSynchronous() const override { return true; }
void setRegisterValue(const QByteArray &name, const QString &value); void setRegisterValue(const QByteArray &name, const QString &value) override;
void fetchMemory(Internal::MemoryAgent *, QObject *, quint64 addr, quint64 length); void fetchMemory(Internal::MemoryAgent *, QObject *, quint64 addr, quint64 length) override;
void changeMemory(Internal::MemoryAgent *, QObject *, quint64 addr, const QByteArray &data); void changeMemory(Internal::MemoryAgent *, QObject *, quint64 addr, const QByteArray &data) override;
QString errorMessage(QProcess::ProcessError error) const; QString errorMessage(QProcess::ProcessError error) const;
bool hasCapability(unsigned cap) const; bool hasCapability(unsigned cap) const override;
void handleLldbFinished(int exitCode, QProcess::ExitStatus exitStatus); void handleLldbFinished(int exitCode, QProcess::ExitStatus exitStatus);
void handleLldbError(QProcess::ProcessError error); void handleLldbError(QProcess::ProcessError error);
@@ -140,15 +140,15 @@ private:
void handleOutputNotification(const GdbMi &output); void handleOutputNotification(const GdbMi &output);
void handleResponse(const QByteArray &data); void handleResponse(const QByteArray &data);
void updateAll(); void updateAll() override;
void doUpdateLocals(const UpdateParameters &params); void doUpdateLocals(const UpdateParameters &params) override;
void updateBreakpointData(Breakpoint bp, const GdbMi &bkpt, bool added); void updateBreakpointData(Breakpoint bp, const GdbMi &bkpt, bool added);
void fetchStack(int limit); void fetchStack(int limit);
void notifyEngineRemoteSetupFinished(const RemoteSetupResult &result); void notifyEngineRemoteSetupFinished(const RemoteSetupResult &result) override;
void runCommand(const DebuggerCommand &cmd); void runCommand(const DebuggerCommand &cmd);
void debugLastCommand(); void debugLastCommand() override;
private: private:
DebuggerCommand m_lastDebuggableCommand; DebuggerCommand m_lastDebuggableCommand;

70
src/plugins/debugger/pdb/pdbengine.h
View File

@@ -54,49 +54,49 @@ public:
private: private:
// DebuggerEngine implementation // DebuggerEngine implementation
void executeStep(); void executeStep() override;
void executeStepOut(); void executeStepOut() override;
void executeNext(); void executeNext() override;
void executeStepI(); void executeStepI() override;
void executeNextI(); void executeNextI() override;
void setupEngine(); void setupEngine() override;
void setupInferior(); void setupInferior() override;
void runEngine(); void runEngine() override;
void shutdownInferior(); void shutdownInferior() override;
void shutdownEngine(); void shutdownEngine() override;
bool canHandleToolTip(const DebuggerToolTipContext &) const; bool canHandleToolTip(const DebuggerToolTipContext &) const override;
void continueInferior(); void continueInferior() override;
void interruptInferior(); void interruptInferior() override;
void executeRunToLine(const ContextData &data); void executeRunToLine(const ContextData &data) override;
void executeRunToFunction(const QString &functionName); void executeRunToFunction(const QString &functionName) override;
void executeJumpToLine(const ContextData &data); void executeJumpToLine(const ContextData &data) override;
void activateFrame(int index); void activateFrame(int index) override;
void selectThread(ThreadId threadId); void selectThread(ThreadId threadId) override;
bool acceptsBreakpoint(Breakpoint bp) const; bool acceptsBreakpoint(Breakpoint bp) const override;
void insertBreakpoint(Breakpoint bp); void insertBreakpoint(Breakpoint bp) override;
void removeBreakpoint(Breakpoint bp); void removeBreakpoint(Breakpoint bp) override;
void assignValueInDebugger(WatchItem *item, void assignValueInDebugger(WatchItem *item,
const QString &expr, const QVariant &value); const QString &expr, const QVariant &value) override;
void executeDebuggerCommand(const QString &command, DebuggerLanguages languages); void executeDebuggerCommand(const QString &command, DebuggerLanguages languages) override;
void loadSymbols(const QString &moduleName); void loadSymbols(const QString &moduleName) override;
void loadAllSymbols(); void loadAllSymbols() override;
void requestModuleSymbols(const QString &moduleName); void requestModuleSymbols(const QString &moduleName) override;
void reloadModules(); void reloadModules() override;
void reloadRegisters() {} void reloadRegisters() override {}
void reloadSourceFiles() {} void reloadSourceFiles() override {}
void reloadFullStack() {} void reloadFullStack() override {}
bool supportsThreads() const { return true; } bool supportsThreads() const { return true; }
bool isSynchronous() const { return true; } bool isSynchronous() const override { return true; }
void updateItem(const QByteArray &iname); void updateItem(const QByteArray &iname) override;
void runCommand(const DebuggerCommand &cmd); void runCommand(const DebuggerCommand &cmd);
void postDirectCommand(const QByteArray &command); void postDirectCommand(const QByteArray &command);
@@ -109,7 +109,7 @@ private:
void refreshSymbols(const GdbMi &symbols); void refreshSymbols(const GdbMi &symbols);
QString errorMessage(QProcess::ProcessError error) const; QString errorMessage(QProcess::ProcessError error) const;
bool hasCapability(unsigned cap) const; bool hasCapability(unsigned cap) const override;
void handlePdbFinished(int, QProcess::ExitStatus status); void handlePdbFinished(int, QProcess::ExitStatus status);
void handlePdbError(QProcess::ProcessError error); void handlePdbError(QProcess::ProcessError error);
@@ -118,8 +118,8 @@ private:
void handleOutput2(const QByteArray &data); void handleOutput2(const QByteArray &data);
void handleResponse(const QByteArray &ba); void handleResponse(const QByteArray &ba);
void handleOutput(const QByteArray &data); void handleOutput(const QByteArray &data);
void updateAll(); void updateAll() override;
void updateLocals(); void updateLocals() override;
QByteArray m_inbuffer; QByteArray m_inbuffer;
QProcess m_proc; QProcess m_proc;

126
src/plugins/debugger/qml/qmlcppengine.h
View File

@@ -46,93 +46,93 @@ public:
QmlCppEngine(const DebuggerRunParameters &sp, QStringList *errors); QmlCppEngine(const DebuggerRunParameters &sp, QStringList *errors);
~QmlCppEngine(); ~QmlCppEngine();
bool canDisplayTooltip() const; bool canDisplayTooltip() const override;
bool canHandleToolTip(const DebuggerToolTipContext &) const; bool canHandleToolTip(const DebuggerToolTipContext &) const override;
void updateItem(const QByteArray &iname); void updateItem(const QByteArray &iname) override;
void expandItem(const QByteArray &iname); void expandItem(const QByteArray &iname) override;
void selectWatchData(const QByteArray &iname); void selectWatchData(const QByteArray &iname) override;
void watchPoint(const QPoint &); void watchPoint(const QPoint &) override;
void fetchMemory(MemoryAgent *, QObject *, quint64 addr, quint64 length); void fetchMemory(MemoryAgent *, QObject *, quint64 addr, quint64 length) override;
void fetchDisassembler(DisassemblerAgent *); void fetchDisassembler(DisassemblerAgent *) override;
void activateFrame(int index); void activateFrame(int index) override;
void reloadModules(); void reloadModules() override;
void examineModules(); void examineModules() override;
void loadSymbols(const QString &moduleName); void loadSymbols(const QString &moduleName) override;
void loadAllSymbols(); void loadAllSymbols() override;
void requestModuleSymbols(const QString &moduleName); void requestModuleSymbols(const QString &moduleName) override;
void reloadRegisters(); void reloadRegisters() override;
void reloadSourceFiles(); void reloadSourceFiles() override;
void reloadFullStack(); void reloadFullStack() override;
void setRegisterValue(const QByteArray &name, const QString &value); void setRegisterValue(const QByteArray &name, const QString &value) override;
bool hasCapability(unsigned cap) const; bool hasCapability(unsigned cap) const override;
bool isSynchronous() const; bool isSynchronous() const override;
QByteArray qtNamespace() const; QByteArray qtNamespace() const override;
void createSnapshot(); void createSnapshot() override;
void updateAll(); void updateAll() override;
void attemptBreakpointSynchronization(); void attemptBreakpointSynchronization() override;
bool acceptsBreakpoint(Breakpoint bp) const; bool acceptsBreakpoint(Breakpoint bp) const override;
void selectThread(ThreadId threadId); void selectThread(ThreadId threadId) override;
void assignValueInDebugger(WatchItem *item, void assignValueInDebugger(WatchItem *item,
const QString &expr, const QVariant &value); const QString &expr, const QVariant &value) override;
DebuggerEngine *cppEngine() { return m_cppEngine; } DebuggerEngine *cppEngine() override { return m_cppEngine; }
DebuggerEngine *qmlEngine() const; DebuggerEngine *qmlEngine() const;
void notifyEngineRemoteSetupFinished(const RemoteSetupResult &result); void notifyEngineRemoteSetupFinished(const RemoteSetupResult &result) override;
void showMessage(const QString &msg, int channel = LogDebug, void showMessage(const QString &msg, int channel = LogDebug,
int timeout = -1) const; int timeout = -1) const override;
void resetLocation(); void resetLocation() override;
void notifyInferiorIll(); void notifyInferiorIll() override;
protected: protected:
void detachDebugger(); void detachDebugger() override;
void reloadDebuggingHelpers(); void reloadDebuggingHelpers() override;
void debugLastCommand(); void debugLastCommand() override;
void executeStep(); void executeStep() override;
void executeStepOut(); void executeStepOut() override;
void executeNext(); void executeNext() override;
void executeStepI(); void executeStepI() override;
void executeNextI(); void executeNextI() override;
void executeReturn(); void executeReturn() override;
void continueInferior(); void continueInferior() override;
void interruptInferior(); void interruptInferior() override;
void requestInterruptInferior(); void requestInterruptInferior() override;
void executeRunToLine(const ContextData &data); void executeRunToLine(const ContextData &data) override;
void executeRunToFunction(const QString &functionName); void executeRunToFunction(const QString &functionName) override;
void executeJumpToLine(const ContextData &data); void executeJumpToLine(const ContextData &data) override;
void executeDebuggerCommand(const QString &command, DebuggerLanguages languages); void executeDebuggerCommand(const QString &command, DebuggerLanguages languages) override;
void setupEngine(); void setupEngine() override;
void setupInferior(); void setupInferior() override;
void runEngine(); void runEngine() override;
void shutdownInferior(); void shutdownInferior() override;
void shutdownEngine(); void shutdownEngine() override;
void quitDebugger(); void quitDebugger() override;
void abortDebugger(); void abortDebugger() override;
void notifyInferiorRunOk(); void notifyInferiorRunOk() override;
void notifyInferiorSpontaneousStop(); void notifyInferiorSpontaneousStop() override;
void notifyEngineRunAndInferiorRunOk(); void notifyEngineRunAndInferiorRunOk() override;
void notifyInferiorShutdownOk(); void notifyInferiorShutdownOk() override;
void notifyInferiorSetupOk(); void notifyInferiorSetupOk() override;
void notifyEngineRemoteServerRunning(const QByteArray &, int pid); void notifyEngineRemoteServerRunning(const QByteArray &, int pid) override;
private: private:
void engineStateChanged(DebuggerState newState); void engineStateChanged(DebuggerState newState);
void setState(DebuggerState newState, bool forced = false); void setState(DebuggerState newState, bool forced = false) override;
void slaveEngineStateChanged(DebuggerEngine *slaveEngine, DebuggerState state); void slaveEngineStateChanged(DebuggerEngine *slaveEngine, DebuggerState state) override;
void setActiveEngine(DebuggerEngine *engine); void setActiveEngine(DebuggerEngine *engine);

92
src/plugins/debugger/qml/qmlengine.h
View File

@@ -53,7 +53,7 @@ class QmlEngine : public DebuggerEngine, QmlJS::IScriptEvaluator
public: public:
explicit QmlEngine(const DebuggerRunParameters &runParameters, explicit QmlEngine(const DebuggerRunParameters &runParameters,
DebuggerEngine *masterEngine = 0); DebuggerEngine *masterEngine = nullptr);
~QmlEngine(); ~QmlEngine();
void filterApplicationMessage(const QString &msg, int channel) const; void filterApplicationMessage(const QString &msg, int channel) const;
@@ -79,66 +79,66 @@ private slots:
void appendMessage(const QString &msg, Utils::OutputFormat); void appendMessage(const QString &msg, Utils::OutputFormat);
private: private:
void notifyEngineRemoteServerRunning(const QByteArray &, int pid); void notifyEngineRemoteServerRunning(const QByteArray &, int pid) override;
void notifyEngineRemoteSetupFinished(const RemoteSetupResult &result); void notifyEngineRemoteSetupFinished(const RemoteSetupResult &result) override;
void showMessage(const QString &msg, int channel = LogDebug, void showMessage(const QString &msg, int channel = LogDebug,
int timeout = -1) const; int timeout = -1) const override;
void gotoLocation(const Internal::Location &location); void gotoLocation(const Internal::Location &location) override;
void insertBreakpoint(Breakpoint bp); void insertBreakpoint(Breakpoint bp) override;
bool isSynchronous() const { return false; } bool isSynchronous() const override { return false; }
bool canDisplayTooltip() const { return false; } bool canDisplayTooltip() const override { return false; }
void executeStep(); void executeStep() override;
void executeStepOut(); void executeStepOut() override;
void executeNext(); void executeNext() override;
void executeStepI(); void executeStepI() override;
void executeNextI(); void executeNextI() override;
void setupEngine(); void setupEngine() override;
void setupInferior(); void setupInferior() override;
void runEngine(); void runEngine() override;
void shutdownInferior(); void shutdownInferior() override;
void shutdownEngine(); void shutdownEngine() override;
bool canHandleToolTip(const DebuggerToolTipContext &) const; bool canHandleToolTip(const DebuggerToolTipContext &) const override;
void continueInferior(); void continueInferior() override;
void interruptInferior(); void interruptInferior() override;
void executeRunToLine(const ContextData &data); void executeRunToLine(const ContextData &data) override;
void executeRunToFunction(const QString &functionName); void executeRunToFunction(const QString &functionName) override;
void executeJumpToLine(const ContextData &data); void executeJumpToLine(const ContextData &data) override;
void activateFrame(int index); void activateFrame(int index) override;
void selectThread(ThreadId threadId); void selectThread(ThreadId threadId) override;
void attemptBreakpointSynchronization(); void attemptBreakpointSynchronization() override;
void removeBreakpoint(Breakpoint bp); void removeBreakpoint(Breakpoint bp) override;
void changeBreakpoint(Breakpoint bp); void changeBreakpoint(Breakpoint bp) override;
bool acceptsBreakpoint(Breakpoint bp) const; bool acceptsBreakpoint(Breakpoint bp) const override;
void assignValueInDebugger(WatchItem *item, void assignValueInDebugger(WatchItem *item,
const QString &expr, const QVariant &value); const QString &expr, const QVariant &value) override;
void loadSymbols(const QString &moduleName); void loadSymbols(const QString &moduleName) override;
void loadAllSymbols(); void loadAllSymbols() override;
void requestModuleSymbols(const QString &moduleName); void requestModuleSymbols(const QString &moduleName) override;
void reloadModules(); void reloadModules() override;
void reloadRegisters() {} void reloadRegisters() override {}
void reloadSourceFiles(); void reloadSourceFiles() override;
void reloadFullStack() {} void reloadFullStack() override {}
void updateAll(); void updateAll() override;
void updateItem(const QByteArray &iname); void updateItem(const QByteArray &iname) override;
void expandItem(const QByteArray &iname); void expandItem(const QByteArray &iname) override;
void selectWatchData(const QByteArray &iname); void selectWatchData(const QByteArray &iname) override;
void executeDebuggerCommand(const QString &command, DebuggerLanguages languages); void executeDebuggerCommand(const QString &command, DebuggerLanguages languages) override;
bool evaluateScript(const QString &expression); bool evaluateScript(const QString &expression) override;
bool hasCapability(unsigned) const; bool hasCapability(unsigned) const override;
void quitDebugger(); void quitDebugger() override;
void closeConnection(); void closeConnection();
void startApplicationLauncher(); void startApplicationLauncher();