From fdc8193f1304f9f540e86b1b488e9b2be2839c52 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 17 Feb 2022 18:31:57 +0100 Subject: [PATCH] ProcessInterface: Drop ProcessMode from c'tor Drop it also from registerHandle() methods, as it wasn't used there. Change-Id: I34b72c38368b82f22d73314fe3cd429ed43cadbc Reviewed-by: hjk Reviewed-by: Qt CI Bot --- src/libs/utils/launcherinterface.cpp | 5 ++--- src/libs/utils/launcherinterface.h | 3 +-- src/libs/utils/launchersocket.cpp | 2 +- src/libs/utils/launchersocket.h | 2 +- src/libs/utils/qtcprocess.cpp | 18 +++++++++--------- src/libs/utils/qtcprocess.h | 5 +---- 6 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/libs/utils/launcherinterface.cpp b/src/libs/utils/launcherinterface.cpp index a77650745a7..06afe18d6e3 100644 --- a/src/libs/utils/launcherinterface.cpp +++ b/src/libs/utils/launcherinterface.cpp @@ -240,11 +240,10 @@ void LauncherInterface::sendData(const QByteArray &data) instance()->m_private->socket()->sendData(data); } -Utils::Internal::CallerHandle *LauncherInterface::registerHandle(QObject *parent, quintptr token, - ProcessMode mode) +Utils::Internal::CallerHandle *LauncherInterface::registerHandle(QObject *parent, quintptr token) { QMutexLocker locker(&s_instanceMutex); - return instance()->m_private->socket()->registerHandle(parent, token, mode); + return instance()->m_private->socket()->registerHandle(parent, token); } void LauncherInterface::unregisterHandle(quintptr token) diff --git a/src/libs/utils/launcherinterface.h b/src/libs/utils/launcherinterface.h index 541501efeec..cf57c5fae0e 100644 --- a/src/libs/utils/launcherinterface.h +++ b/src/libs/utils/launcherinterface.h @@ -55,8 +55,7 @@ private: static bool isStarted(); static bool isReady(); static void sendData(const QByteArray &data); - static Utils::Internal::CallerHandle *registerHandle(QObject *parent, quintptr token, - ProcessMode mode); + static Utils::Internal::CallerHandle *registerHandle(QObject *parent, quintptr token); static void unregisterHandle(quintptr token); LauncherInterface(); diff --git a/src/libs/utils/launchersocket.cpp b/src/libs/utils/launchersocket.cpp index 17c16aec867..06cbd33a4aa 100644 --- a/src/libs/utils/launchersocket.cpp +++ b/src/libs/utils/launchersocket.cpp @@ -763,7 +763,7 @@ void LauncherSocket::sendData(const QByteArray &data) QMetaObject::invokeMethod(this, &LauncherSocket::handleRequests); } -CallerHandle *LauncherSocket::registerHandle(QObject *parent, quintptr token, ProcessMode mode) +CallerHandle *LauncherSocket::registerHandle(QObject *parent, quintptr token) { QTC_ASSERT(!isCalledFromLaunchersThread(), return nullptr); QMutexLocker locker(&m_mutex); diff --git a/src/libs/utils/launchersocket.h b/src/libs/utils/launchersocket.h index 8198f04440a..eaf84319e09 100644 --- a/src/libs/utils/launchersocket.h +++ b/src/libs/utils/launchersocket.h @@ -238,7 +238,7 @@ public: void sendData(const QByteArray &data); // Called from caller's thread exclusively. - CallerHandle *registerHandle(QObject *parent, quintptr token, ProcessMode mode); + CallerHandle *registerHandle(QObject *parent, quintptr token); void unregisterHandle(quintptr token); signals: diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 20e06382b83..b6f8b55bcfa 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -219,7 +219,7 @@ class TerminalImpl : public ProcessInterface public: TerminalImpl(QObject *parent, QtcProcess::ProcessImpl processImpl, QtcProcess::TerminalMode terminalMode) - : ProcessInterface(parent, ProcessMode::Reader) + : ProcessInterface(parent) , m_terminal(this, processImpl, terminalMode) { connect(&m_terminal, &Internal::TerminalProcess::started, @@ -274,8 +274,8 @@ private: class QProcessImpl : public ProcessInterface { public: - QProcessImpl(QObject *parent, ProcessMode processMode) - : ProcessInterface(parent, processMode) + QProcessImpl(QObject *parent) + : ProcessInterface(parent) , m_process(new ProcessHelper(parent)) { connect(m_process, &QProcess::started, @@ -332,7 +332,7 @@ private: void doDefaultStart(const QString &program, const QStringList &arguments) override { ProcessStartHandler *handler = m_process->processStartHandler(); - handler->setProcessMode(m_processMode); + handler->setProcessMode(m_setup.m_processMode); handler->setWriteData(m_setup.m_writeData); if (m_setup.m_belowNormalPriority) handler->setBelowNormalPriority(); @@ -368,10 +368,10 @@ class ProcessLauncherImpl : public ProcessInterface { Q_OBJECT public: - ProcessLauncherImpl(QObject *parent, ProcessMode processMode) - : ProcessInterface(parent, processMode), m_token(uniqueToken()) + ProcessLauncherImpl(QObject *parent) + : ProcessInterface(parent), m_token(uniqueToken()) { - m_handle = LauncherInterface::registerHandle(parent, token(), processMode); + m_handle = LauncherInterface::registerHandle(parent, token()); connect(m_handle, &CallerHandle::errorOccurred, this, &ProcessInterface::errorOccurred); connect(m_handle, &CallerHandle::started, @@ -460,8 +460,8 @@ public: if (m_setup.m_terminalMode != QtcProcess::TerminalOff) return new TerminalImpl(parent(), impl, m_setup.m_terminalMode); else if (impl == QtcProcess::QProcessImpl) - return new QProcessImpl(parent(), m_setup.m_processMode); - return new ProcessLauncherImpl(parent(), m_setup.m_processMode); + return new QProcessImpl(parent()); + return new ProcessLauncherImpl(parent()); } void setProcessInterface(ProcessInterface *process) diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index 20989f7d29d..411f34b60ef 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -275,9 +275,7 @@ class QTCREATOR_UTILS_EXPORT ProcessInterface : public QObject Q_OBJECT public: - ProcessInterface(QObject *parent, ProcessMode processMode) - : QObject(parent) - , m_processMode(processMode) {} + ProcessInterface(QObject *parent) : QObject(parent) {} virtual QByteArray readAllStandardOutput() = 0; virtual QByteArray readAllStandardError() = 0; @@ -304,7 +302,6 @@ public: virtual void interruptProcess() { QTC_CHECK(false); } virtual qint64 applicationMainThreadID() const { QTC_CHECK(false); return -1; } - const ProcessMode m_processMode; ProcessSetupData m_setup; signals: