DebuggerRunTool: Hide some methods in protected / private section

Change-Id: I9ab5fb1b8661191080e270307a3be8723d7b6f7c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-07-21 15:27:01 +02:00
parent be0e0490af
commit 062cea9601
2 changed files with 27 additions and 25 deletions

View File

@@ -32,19 +32,10 @@ public:
void startRunControl(); void startRunControl();
void showMessage(const QString &msg, int channel = LogDebug, int timeout = -1);
void start() override; void start() override;
void stop() override; void stop() override;
bool isCppDebugging() const;
bool isQmlDebugging() const;
void setUsePortsGatherer(bool useCpp, bool useQml);
DebugServerPortsGatherer *portsGatherer() const;
void setSolibSearchPath(const Utils::FilePaths &list); void setSolibSearchPath(const Utils::FilePaths &list);
void addSolibSearchDir(const QString &str);
static void setBreakOnMainNextTime(); static void setBreakOnMainNextTime();
@@ -53,12 +44,9 @@ public:
void setInferiorEnvironment(const Utils::Environment &env); // Used by GammaRay plugin void setInferiorEnvironment(const Utils::Environment &env); // Used by GammaRay plugin
void setRunControlName(const QString &name); void setRunControlName(const QString &name);
void setStartMessage(const QString &msg); void setStartMessage(const QString &msg);
void addQmlServerInferiorCommandLineArgumentIfNeeded();
void modifyDebuggerEnvironment(const Utils::EnvironmentItems &item);
void setCrashParameter(const QString &event); void setCrashParameter(const QString &event);
void addExpectedSignal(const QString &signal); void addExpectedSignal(const QString &signal);
void addSearchDirectory(const Utils::FilePath &dir);
void setStartMode(DebuggerStartMode startMode); void setStartMode(DebuggerStartMode startMode);
void setCloseMode(DebuggerCloseMode closeMode); void setCloseMode(DebuggerCloseMode closeMode);
@@ -68,18 +56,13 @@ public:
void setSysRoot(const Utils::FilePath &sysRoot); void setSysRoot(const Utils::FilePath &sysRoot);
void setSymbolFile(const Utils::FilePath &symbolFile); void setSymbolFile(const Utils::FilePath &symbolFile);
void setLldbPlatform(const QString &platform);
void setRemoteChannel(const QString &channel); void setRemoteChannel(const QString &channel);
void setRemoteChannel(const QString &host, int port); void setRemoteChannel(const QString &host, int port);
void setRemoteChannel(const QUrl &url);
QString remoteChannel() const; QString remoteChannel() const;
void setUseExtendedRemote(bool on); void setUseExtendedRemote(bool on);
void setUseContinueInsteadOfRun(bool on); void setUseContinueInsteadOfRun(bool on);
void setUseTargetAsync(bool on);
void setContinueAfterAttach(bool on); void setContinueAfterAttach(bool on);
void setSkipExecutableValidation(bool on);
void setUseCtrlCStub(bool on);
void setBreakOnMain(bool on); void setBreakOnMain(bool on);
void setUseTerminal(bool on); void setUseTerminal(bool on);
@@ -93,20 +76,40 @@ public:
void setCoreFilePath(const Utils::FilePath &core, bool isSnapshot = false); void setCoreFilePath(const Utils::FilePath &core, bool isSnapshot = false);
void setIosPlatform(const QString &platform);
void setDeviceSymbolsRoot(const QString &deviceSymbolsRoot);
void setTestCase(int testCase); void setTestCase(int testCase);
void setOverrideStartScript(const Utils::FilePath &script); void setOverrideStartScript(const Utils::FilePath &script);
void setAbi(const ProjectExplorer::Abi &abi);
Internal::TerminalRunner *terminalRunner() const; Internal::TerminalRunner *terminalRunner() const;
DebuggerEngineType cppEngineType() const;
Internal::DebuggerRunParameters &runParameters() { return m_runParameters; } Internal::DebuggerRunParameters &runParameters() { return m_runParameters; }
protected:
bool isCppDebugging() const;
bool isQmlDebugging() const;
void setUsePortsGatherer(bool useCpp, bool useQml);
DebugServerPortsGatherer *portsGatherer() const;
void addSolibSearchDir(const QString &str);
void addQmlServerInferiorCommandLineArgumentIfNeeded();
void modifyDebuggerEnvironment(const Utils::EnvironmentItems &item);
void addSearchDirectory(const Utils::FilePath &dir);
void setLldbPlatform(const QString &platform);
void setRemoteChannel(const QUrl &url);
void setUseTargetAsync(bool on);
void setSkipExecutableValidation(bool on);
void setUseCtrlCStub(bool on);
void setIosPlatform(const QString &platform);
void setDeviceSymbolsRoot(const QString &deviceSymbolsRoot);
void setAbi(const ProjectExplorer::Abi &abi);
DebuggerEngineType cppEngineType() const;
private: private:
void showMessage(const QString &msg, int channel = LogDebug, int timeout = -1);
bool fixupParameters(); bool fixupParameters();
void handleEngineStarted(Internal::DebuggerEngine *engine); void handleEngineStarted(Internal::DebuggerEngine *engine);
void handleEngineFinished(Internal::DebuggerEngine *engine); void handleEngineFinished(Internal::DebuggerEngine *engine);

View File

@@ -195,8 +195,8 @@ public:
: DebuggerRunTool(runControl) : DebuggerRunTool(runControl)
{ {
setId("QnxAttachDebugSupport"); setId("QnxAttachDebugSupport");
setUsePortsGatherer(isCppDebugging(), isQmlDebugging()); setUsePortsGatherer(isCppDebugging(), isQmlDebugging());
setUseCtrlCStub(true);
if (isCppDebugging()) { if (isCppDebugging()) {
auto pdebugRunner = new PDebugRunner(runControl, portsGatherer()); auto pdebugRunner = new PDebugRunner(runControl, portsGatherer());
@@ -239,7 +239,6 @@ void showAttachToProcessDialog()
debugger->setStartMode(AttachToRemoteServer); debugger->setStartMode(AttachToRemoteServer);
debugger->setCloseMode(DetachAtClose); debugger->setCloseMode(DetachAtClose);
debugger->setSymbolFile(localExecutable); debugger->setSymbolFile(localExecutable);
debugger->setUseCtrlCStub(true);
debugger->setAttachPid(pid); debugger->setAttachPid(pid);
// setRunControlName(Tr::tr("Remote: \"%1\" - Process %2").arg(remoteChannel).arg(m_process.pid)); // setRunControlName(Tr::tr("Remote: \"%1\" - Process %2").arg(remoteChannel).arg(m_process.pid));
debugger->setRunControlName(Tr::tr("Remote QNX process %1").arg(pid)); debugger->setRunControlName(Tr::tr("Remote QNX process %1").arg(pid));