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

ConsoleProcess: Cleanup internal fields

Browse Source 
Remove unused members. Rename one member. Init some members
with sensible default values.

Change-Id: Ia7a6e561fcbb612c90aeb7a2c4c6b041d2018a7f
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-01-20 16:49:29 +01:00
parent ca653a6a2c
commit 92e450951c
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,14 +135,13 @@ class ConsoleProcessPrivate
public: public:
ConsoleProcessPrivate() = default; ConsoleProcessPrivate() = default;
static QString m_defaultConsoleProcess;
ConsoleProcess::Mode m_mode = ConsoleProcess::Run; ConsoleProcess::Mode m_mode = ConsoleProcess::Run;
FilePath m_workingDir; FilePath m_workingDir;
Environment m_environment; Environment m_environment;
qint64 m_appPid = 0; qint64 m_appPid = 0;
int m_appCode; int m_exitCode = 0;
CommandLine m_commandLine; CommandLine m_commandLine;
QProcess::ExitStatus m_appStatus; QProcess::ExitStatus m_appStatus = QProcess::NormalExit;
QLocalServer m_stubServer; QLocalServer m_stubServer;
QLocalSocket *m_stubSocket = nullptr; QLocalSocket *m_stubSocket = nullptr;
QTemporaryFile *m_tempFile = nullptr; QTemporaryFile *m_tempFile = nullptr;
@@ -154,10 +153,8 @@ public:
// Used on Unix only // Used on Unix only
QtcProcess m_process; QtcProcess m_process;
bool m_stubConnected = false;
QTimer *m_stubConnectTimer = nullptr; QTimer *m_stubConnectTimer = nullptr;
QByteArray m_stubServerDir; QByteArray m_stubServerDir;
qint64 m_stubPid = 0;
// Used on Windows only // Used on Windows only
qint64 m_appMainThreadId = 0; qint64 m_appMainThreadId = 0;
@@ -661,7 +658,7 @@ void ConsoleProcess::cleanupAfterStartFailure(const QString &errorMessage)
void ConsoleProcess::finish(int exitCode, QProcess::ExitStatus exitStatus) void ConsoleProcess::finish(int exitCode, QProcess::ExitStatus exitStatus)
{ {
d->m_appPid = 0; d->m_appPid = 0;
d->m_appCode = exitCode; d->m_exitCode = exitCode;
d->m_appStatus = exitStatus; d->m_appStatus = exitStatus;
emit finished(); emit finished();
} }
@@ -720,7 +717,6 @@ void ConsoleProcess::killStub()
d->m_stubSocket->flush(); d->m_stubSocket->flush();
} }
stubServerShutdown(); stubServerShutdown();
d->m_stubPid = 0;
#endif #endif
} }
@@ -805,8 +801,6 @@ void ConsoleProcess::stubServerShutdown()
void ConsoleProcess::stubConnectionAvailable() void ConsoleProcess::stubConnectionAvailable()
{ {
d->m_stubConnected = true;
if (d->m_stubConnectTimer) { if (d->m_stubConnectTimer) {
delete d->m_stubConnectTimer; delete d->m_stubConnectTimer;
d->m_stubConnectTimer = nullptr; d->m_stubConnectTimer = nullptr;
@@ -877,8 +871,6 @@ void ConsoleProcess::readStubOutput()
} else if (out.startsWith("spid ")) { } else if (out.startsWith("spid ")) {
delete d->m_tempFile; delete d->m_tempFile;
d->m_tempFile = nullptr; d->m_tempFile = nullptr;
d->m_stubPid = out.mid(4).toInt();
} else if (out.startsWith("pid ")) { } else if (out.startsWith("pid ")) {
d->m_appPid = out.mid(4).toInt(); d->m_appPid = out.mid(4).toInt();
emit started(); emit started();
@@ -888,7 +880,6 @@ void ConsoleProcess::readStubOutput()
finish(out.mid(6).toInt(), QProcess::CrashExit); finish(out.mid(6).toInt(), QProcess::CrashExit);
} else { } else {
emitError(QProcess::UnknownError, msgUnexpectedOutput(out)); emitError(QProcess::UnknownError, msgUnexpectedOutput(out));
d->m_stubPid = 0;
d->m_process.terminate(); d->m_process.terminate();
break; break;
} }
@@ -912,7 +903,6 @@ void ConsoleProcess::stubExited()
} }
#else #else
stubServerShutdown(); stubServerShutdown();
d->m_stubPid = 0;
delete d->m_tempFile; delete d->m_tempFile;
d->m_tempFile = nullptr; d->m_tempFile = nullptr;
if (d->m_appPid) if (d->m_appPid)
@@ -962,7 +952,7 @@ qint64 ConsoleProcess::applicationPID() const
int ConsoleProcess::exitCode() const int ConsoleProcess::exitCode() const
{ {
return d->m_appCode; return d->m_exitCode;
} // This will be the signal number if exitStatus == CrashExit } // This will be the signal number if exitStatus == CrashExit
QProcess::ExitStatus ConsoleProcess::exitStatus() const QProcess::ExitStatus ConsoleProcess::exitStatus() const