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

ConsoleProcess: Uniform the common interface of QtcProcess

Browse Source 
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>
This commit is contained in:
Jarek Kobus
2022-01-20 12:28:47 +01:00
parent 7457d3d8b6
commit 28fd0abbbe
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/consoleprocess.cpp
View File

@@ -866,18 +866,6 @@ void ConsoleProcess::stubExited()
#endif #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() void ConsoleProcess::cleanupInferior()
{ {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN

5
src/libs/utils/consoleprocess.h
View File

@@ -93,11 +93,8 @@ public:
void kickoffProcess(); void kickoffProcess();
void interruptProcess(); void interruptProcess();
void killProcess();
void killStub();
qint64 applicationMainThreadID() const; qint64 applicationMainThreadID() const;
void detachStub();
int exitCode() const; int exitCode() const;
QProcess::ExitStatus exitStatus() const; QProcess::ExitStatus exitStatus() const;
@@ -125,6 +122,8 @@ private:
void stubExited(); void stubExited();
void cleanupAfterStartFailure(const QString &errorMessage); void cleanupAfterStartFailure(const QString &errorMessage);
void finish(int exitCode, QProcess::ExitStatus exitStatus); void finish(int exitCode, QProcess::ExitStatus exitStatus);
void killProcess();
void killStub();
static QString modeOption(Mode m); static QString modeOption(Mode m);
static QString msgCommChannelFailed(const QString &error); static QString msgCommChannelFailed(const QString &error);