Commit 1284e952 authored by hjk's avatar hjk

Debugger: Fix QByteArray/QString overload mixup

And take the opportunity to sprinkle more 'override' over the code.

Change-Id: I8b6b80653ca671e7681b7de2de5ad4288b281ccf
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent 78a800cb
......@@ -57,7 +57,7 @@ public:
typedef std::function<void(const DebuggerResponse &)> CommandHandler;
CdbEngine(const DebuggerRunParameters &sp);
~CdbEngine();
~CdbEngine() override;
// Factory function that returns 0 if the debug engine library cannot be found.
......
......@@ -44,11 +44,11 @@ public:
explicit GdbAttachEngine(const DebuggerRunParameters &runParameters);
private:
void setupEngine();
void setupInferior();
void runEngine();
void interruptInferior2();
void shutdownEngine();
void setupEngine() override;
void setupInferior() override;
void runEngine() override;
void interruptInferior2() override;
void shutdownEngine() override;
void handleAttach(const DebuggerResponse &response);
};
......
......@@ -38,7 +38,7 @@ class GdbCoreEngine : public GdbEngine
public:
explicit GdbCoreEngine(const DebuggerRunParameters &runParameters);
~GdbCoreEngine();
~GdbCoreEngine() override;
struct CoreInfo
{
......@@ -49,11 +49,11 @@ public:
static CoreInfo readExecutableNameFromCore(const QString &debuggerCmd, const QString &coreFile);
private:
void setupEngine();
void setupInferior();
void runEngine();
void interruptInferior();
void shutdownEngine();
void setupEngine() override;
void setupInferior() override;
void runEngine() override;
void interruptInferior() override;
void shutdownEngine() override;
void handleFileExecAndSymbols(const DebuggerResponse &response);
void handleTargetCore(const DebuggerResponse &response);
......
......@@ -64,7 +64,7 @@ class GdbEngine : public DebuggerEngine
public:
explicit GdbEngine(const DebuggerRunParameters &runParameters);
~GdbEngine();
~GdbEngine() override;
private: ////////// General Interface //////////
DebuggerEngine *cppEngine() override { return this; }
......
......@@ -43,12 +43,12 @@ private:
void handleExecRun(const DebuggerResponse &response);
void handleFileExecAndSymbols(const DebuggerResponse &response);
void setupInferior();
void runEngine();
void setupEngine();
void handleGdbStartFailed();
void interruptInferior2();
void shutdownEngine();
void setupInferior() override;
void runEngine() override;
void setupEngine() override;
void handleGdbStartFailed() override;
void interruptInferior2() override;
void shutdownEngine() override;
OutputCollector m_outputCollector;
};
......
......@@ -448,11 +448,11 @@ void GdbRemoteServerEngine::shutdownEngine()
}
void GdbRemoteServerEngine::notifyEngineRemoteServerRunning
(const QByteArray &serverChannel, int inferiorPid)
(const QString &serverChannel, int inferiorPid)
{
// Currently only used by Android support.
runParameters().attachPID = inferiorPid;
runParameters().remoteChannel = QString::fromLatin1(serverChannel);
runParameters().remoteChannel = serverChannel;
runParameters().multiProcess = true;
showMessage("NOTE: REMOTE SERVER RUNNING IN MULTIMODE");
m_startAttempted = true;
......
......@@ -38,11 +38,11 @@ public:
explicit GdbRemoteServerEngine(const DebuggerRunParameters &runParameters);
private:
void setupEngine();
void setupInferior();
void runEngine();
void interruptInferior2();
void shutdownEngine();
void setupEngine() override;
void setupInferior() override;
void runEngine() override;
void interruptInferior2() override;
void shutdownEngine() override;
void readUploadStandardOutput();
void readUploadStandardError();
......@@ -50,8 +50,8 @@ private:
void uploadProcFinished();
void callTargetRemote();
void notifyEngineRemoteServerRunning(const QByteArray &serverChannel, int inferiorPid);
void notifyEngineRemoteSetupFinished(const RemoteSetupResult &result);
void notifyEngineRemoteServerRunning(const QString &serverChannel, int inferiorPid) override;
void notifyEngineRemoteSetupFinished(const RemoteSetupResult &result) override;
void handleSetTargetAsync(const DebuggerResponse &response);
void handleFileExecAndSymbols(const DebuggerResponse &response);
......
......@@ -44,15 +44,15 @@ class GdbTermEngine : public GdbEngine
public:
explicit GdbTermEngine(const DebuggerRunParameters &runParameters);
~GdbTermEngine();
~GdbTermEngine() override;
private:
void setupEngine();
void handleGdbStartFailed();
void setupInferior();
void runEngine();
void interruptInferior2();
void shutdownEngine();
void setupEngine() override;
void handleGdbStartFailed() override;
void setupInferior() override;
void runEngine() override;
void interruptInferior2() override;
void shutdownEngine() override;
void handleStubAttached(const DebuggerResponse &response);
......
......@@ -59,7 +59,7 @@ class LldbEngine : public DebuggerEngine
public:
explicit LldbEngine(const DebuggerRunParameters &runParameters);
~LldbEngine();
~LldbEngine() override;
signals:
void outputReady(const QString &data);
......
......@@ -38,7 +38,7 @@ class QmlCppEngine : public DebuggerEngine
public:
QmlCppEngine(const DebuggerRunParameters &sp, QStringList *errors);
~QmlCppEngine();
~QmlCppEngine() override;
bool canDisplayTooltip() const override;
bool canHandleToolTip(const DebuggerToolTipContext &) const override;
......
......@@ -45,7 +45,7 @@ class QmlEngine : public DebuggerEngine
public:
explicit QmlEngine(const DebuggerRunParameters &runParameters,
DebuggerEngine *masterEngine = nullptr);
~QmlEngine();
~QmlEngine() override;
void filterApplicationMessage(const QString &msg, int channel) 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