From 28fd0abbbe22f1083a230fdad08351a5e6f22846 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 20 Jan 2022 12:28:47 +0100
Subject: [PATCH] ConsoleProcess: Uniform the common interface of QtcProcess

This is a preliminary step before merging ConsoleProcess
into QtcProcess.

Remove unused detachStub().
Move killProcess() and killStub() to private section.
They are not used outside.

Change-Id: I45f55027fa537cc800cd1776478390725f7236c4
Reviewed-by: hjk <hjk@qt.io>
---
 src/libs/utils/consoleprocess.cpp | 12 ------------
 src/libs/utils/consoleprocess.h   |  5 ++---
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp
index 1cb5f8184b8..0cfc3ee143b 100644
--- a/src/libs/utils/consoleprocess.cpp
+++ b/src/libs/utils/consoleprocess.cpp
@@ -866,18 +866,6 @@ void ConsoleProcess::stubExited()
 #endif
 }
 
-void ConsoleProcess::detachStub()
-{
-    if (HostOsInfo::isAnyUnixHost()) {
-        if (d->m_stubSocket && d->m_stubSocket->isWritable()) {
-            d->m_stubSocket->write("d", 1);
-            d->m_stubSocket->flush();
-        }
-        stubServerShutdown();
-        d->m_stubPid = 0;
-    }
-}
-
 void ConsoleProcess::cleanupInferior()
 {
 #ifdef Q_OS_WIN
diff --git a/src/libs/utils/consoleprocess.h b/src/libs/utils/consoleprocess.h
index 030e10001ec..2f5a3812a50 100644
--- a/src/libs/utils/consoleprocess.h
+++ b/src/libs/utils/consoleprocess.h
@@ -93,11 +93,8 @@ public:
 
     void kickoffProcess();
     void interruptProcess();
-    void killProcess();
-    void killStub();
 
     qint64 applicationMainThreadID() const;
-    void detachStub();
 
     int exitCode() const;
     QProcess::ExitStatus exitStatus() const;
@@ -125,6 +122,8 @@ private:
     void stubExited();
     void cleanupAfterStartFailure(const QString &errorMessage);
     void finish(int exitCode, QProcess::ExitStatus exitStatus);
+    void killProcess();
+    void killStub();
 
     static QString modeOption(Mode m);
     static QString msgCommChannelFailed(const QString &error);