9 files changed, 11 insertions, 34 deletions
diff --git a/src/plugins/debugger/dap/gdbdapengine.cpp b/src/plugins/debugger/dap/gdbdapengine.cpp
index 7c072fb5cc0..5b51730ca40 100644
--- a/src/plugins/debugger/dap/gdbdapengine.cpp
+++ b/src/plugins/debugger/dap/gdbdapengine.cpp
@@ -113,7 +113,7 @@ GdbDapEngine::GdbDapEngine()
 
 void GdbDapEngine::handleDapInitialize()
 {
-    if (!isLocalAttachEngine()) {
+    if (!runParameters().isLocalAttachEngine()) {
         DapEngine::handleDapInitialize();
         return;
     }
@@ -123,14 +123,9 @@ void GdbDapEngine::handleDapInitialize()
     qCDebug(logCategory()) << "handleDapAttach";
 }
 
-bool GdbDapEngine::isLocalAttachEngine() const
-{
-    return runParameters().startMode() == AttachToLocalProcess;
-}
-
 void GdbDapEngine::handleDapConfigurationDone()
 {
-    if (!isLocalAttachEngine()) {
+    if (!runParameters().isLocalAttachEngine()) {
         DapEngine::handleDapConfigurationDone();
         return;
     }
@@ -145,7 +140,7 @@ void GdbDapEngine::setupEngine()
     const DebuggerRunParameters &rp = runParameters();
     CommandLine cmd{rp.debugger.command.executable(), {"-i", "dap"}};
 
-    if (isLocalAttachEngine())
+    if (runParameters().isLocalAttachEngine())
         cmd.addArgs({"-p", QString::number(rp.attachPID.pid())});
 
     QVersionNumber oldestVersion(14, 0, 50);
diff --git a/src/plugins/debugger/dap/gdbdapengine.h b/src/plugins/debugger/dap/gdbdapengine.h
index 29634a9da14..6820f585890 100644
--- a/src/plugins/debugger/dap/gdbdapengine.h
+++ b/src/plugins/debugger/dap/gdbdapengine.h
@@ -18,7 +18,6 @@ private:
     void handleDapInitialize() override;
     void handleDapConfigurationDone() override;
 
-    bool isLocalAttachEngine() const;
     bool acceptsBreakpoint(const BreakpointParameters &bp) const override;
     const QLoggingCategory &logCategory() override;
 };
diff --git a/src/plugins/debugger/dap/lldbdapengine.cpp b/src/plugins/debugger/dap/lldbdapengine.cpp
index 815d6d67870..3689619673c 100644
--- a/src/plugins/debugger/dap/lldbdapengine.cpp
+++ b/src/plugins/debugger/dap/lldbdapengine.cpp
@@ -151,7 +151,7 @@ void LldbDapEngine::handleDapInitialize()
     const QJsonArray map = sourceMap();
     const QJsonArray commands = preRunCommands();
 
-    if (!isLocalAttachEngine()) {
+    if (!runParameters().isLocalAttachEngine()) {
         const QJsonArray env = QJsonArray::fromStringList(rp.inferior.environment.toStringList());
         const QJsonArray args = QJsonArray::fromStringList(rp.inferior.command.splitArguments());
 
@@ -192,14 +192,9 @@ void LldbDapEngine::handleDapInitialize()
     qCDebug(logCategory()) << "handleDapAttach";
 }
 
-bool LldbDapEngine::isLocalAttachEngine() const
-{
-    return runParameters().startMode() == AttachToLocalProcess;
-}
-
 void LldbDapEngine::handleDapConfigurationDone()
 {
-    if (!isLocalAttachEngine()) {
+    if (!runParameters().isLocalAttachEngine()) {
         DapEngine::handleDapConfigurationDone();
         return;
     }
diff --git a/src/plugins/debugger/dap/lldbdapengine.h b/src/plugins/debugger/dap/lldbdapengine.h
index 0ebeb2d2ee1..80d3e898850 100644
--- a/src/plugins/debugger/dap/lldbdapengine.h
+++ b/src/plugins/debugger/dap/lldbdapengine.h
@@ -18,7 +18,6 @@ private:
     void handleDapInitialize() override;
     void handleDapConfigurationDone() override;
 
-    bool isLocalAttachEngine() const;
     bool acceptsBreakpoint(const BreakpointParameters &bp) const override;
     const QLoggingCategory &logCategory() override;
 
diff --git a/src/plugins/debugger/dap/pydapengine.cpp b/src/plugins/debugger/dap/pydapengine.cpp
index a6db8d899c2..08522912cb3 100644
--- a/src/plugins/debugger/dap/pydapengine.cpp
+++ b/src/plugins/debugger/dap/pydapengine.cpp
@@ -260,7 +260,7 @@ void PyDapEngine::setupEngine()
                      "-m", "debugpy",
                      "--listen", "127.0.0.1:5679"}};
 
-    if (isLocalAttachEngine()) {
+    if (runParameters().isLocalAttachEngine()) {
         cmd.addArgs({"--pid", QString::number(runParameters().attachPID.pid())});
     } else {
         cmd.addArgs({"--wait-for-client",
@@ -283,11 +283,6 @@ bool PyDapEngine::acceptsBreakpoint(const BreakpointParameters &bp) const
            || mimeType.matchesName(C_PY_MIMETYPE) || mimeType.matchesName(C_PY_MIME_ICON);
 }
 
-bool PyDapEngine::isLocalAttachEngine() const
-{
-    return runParameters().startMode() == AttachToLocalProcess;
-}
-
 const QLoggingCategory &PyDapEngine::logCategory()
 {
     static const QLoggingCategory logCategory = QLoggingCategory("qtc.dbg.dapengine.python",
diff --git a/src/plugins/debugger/dap/pydapengine.h b/src/plugins/debugger/dap/pydapengine.h
index fb2bd4be7b5..d357117b7f8 100644
--- a/src/plugins/debugger/dap/pydapengine.h
+++ b/src/plugins/debugger/dap/pydapengine.h
@@ -17,7 +17,6 @@ private:
     void quitDebugger() override;
 
     void setupEngine() override;
-    bool isLocalAttachEngine() const;
 
     bool acceptsBreakpoint(const BreakpointParameters &bp) const override;
 
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 064b38ccfc5..b303893296a 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -83,6 +83,7 @@ public:
 
     void setStartMode(DebuggerStartMode startMode);
     DebuggerStartMode startMode() const { return m_startMode; }
+    bool isLocalAttachEngine() const { return m_startMode == AttachToLocalProcess; }
 
     DebuggerCloseMode closeMode = KillAtClose;
 
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 8104b5e8496..6bd86b78515 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4378,7 +4378,7 @@ void GdbEngine::debugLastCommand()
 
 bool GdbEngine::isLocalRunEngine() const
 {
-    return !isCoreEngine() && !isLocalAttachEngine() && !isRemoteEngine();
+    return !isCoreEngine() && !runParameters().isLocalAttachEngine() && !isRemoteEngine();
 }
 
 bool GdbEngine::isPlainEngine() const
@@ -4397,11 +4397,6 @@ bool GdbEngine::isRemoteEngine() const
     return startMode == StartRemoteProcess || startMode == AttachToRemoteServer;
 }
 
-bool GdbEngine::isLocalAttachEngine() const
-{
-    return runParameters().startMode() == AttachToLocalProcess;
-}
-
 bool GdbEngine::isTermEngine() const
 {
     return isLocalRunEngine() && usesTerminal();
@@ -4468,7 +4463,7 @@ void GdbEngine::setupInferior()
 
         handleInferiorPrepared();
 
-    } else if (isLocalAttachEngine()) {
+    } else if (runParameters().isLocalAttachEngine()) {
         // Task 254674 does not want to remove them
         //qq->breakHandler()->removeAllBreakpoints();
         handleInferiorPrepared();
@@ -4604,7 +4599,7 @@ void GdbEngine::runEngine()
         QString channel = rp.remoteChannel;
         runCommand({"target remote " + channel});
 
-    } else if (isLocalAttachEngine()) {
+    } else if (runParameters().isLocalAttachEngine()) {
 
         const qint64 pid = rp.attachPID.pid();
         showStatusMessage(Tr::tr("Attaching to process %1.").arg(pid));
@@ -4733,7 +4728,7 @@ void GdbEngine::handleRemoteAttach(const DebuggerResponse &response)
 
 void GdbEngine::interruptInferior2()
 {
-    if (isLocalAttachEngine()) {
+    if (runParameters().isLocalAttachEngine()) {
 
         interruptLocalInferior(runParameters().attachPID.pid());
 
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 4beaaf29453..a514092c0b5 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -360,7 +360,6 @@ private: ////////// General Interface //////////
     bool isPlainEngine() const;
     bool isCoreEngine() const;
     bool isRemoteEngine() const;
-    bool isLocalAttachEngine() const;
     bool isTermEngine() const;
 
     void setupEngine() final;