forked from qt-creator/qt-creator
ProcessInterface: Drop ProcessMode from c'tor
Drop it also from registerHandle() methods, as it wasn't used there. Change-Id: I34b72c38368b82f22d73314fe3cd429ed43cadbc Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
@@ -240,11 +240,10 @@ void LauncherInterface::sendData(const QByteArray &data)
|
|||||||
instance()->m_private->socket()->sendData(data);
|
instance()->m_private->socket()->sendData(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
Utils::Internal::CallerHandle *LauncherInterface::registerHandle(QObject *parent, quintptr token,
|
Utils::Internal::CallerHandle *LauncherInterface::registerHandle(QObject *parent, quintptr token)
|
||||||
ProcessMode mode)
|
|
||||||
{
|
{
|
||||||
QMutexLocker locker(&s_instanceMutex);
|
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)
|
void LauncherInterface::unregisterHandle(quintptr token)
|
||||||
|
@@ -55,8 +55,7 @@ private:
|
|||||||
static bool isStarted();
|
static bool isStarted();
|
||||||
static bool isReady();
|
static bool isReady();
|
||||||
static void sendData(const QByteArray &data);
|
static void sendData(const QByteArray &data);
|
||||||
static Utils::Internal::CallerHandle *registerHandle(QObject *parent, quintptr token,
|
static Utils::Internal::CallerHandle *registerHandle(QObject *parent, quintptr token);
|
||||||
ProcessMode mode);
|
|
||||||
static void unregisterHandle(quintptr token);
|
static void unregisterHandle(quintptr token);
|
||||||
|
|
||||||
LauncherInterface();
|
LauncherInterface();
|
||||||
|
@@ -763,7 +763,7 @@ void LauncherSocket::sendData(const QByteArray &data)
|
|||||||
QMetaObject::invokeMethod(this, &LauncherSocket::handleRequests);
|
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);
|
QTC_ASSERT(!isCalledFromLaunchersThread(), return nullptr);
|
||||||
QMutexLocker locker(&m_mutex);
|
QMutexLocker locker(&m_mutex);
|
||||||
|
@@ -238,7 +238,7 @@ public:
|
|||||||
void sendData(const QByteArray &data);
|
void sendData(const QByteArray &data);
|
||||||
|
|
||||||
// Called from caller's thread exclusively.
|
// Called from caller's thread exclusively.
|
||||||
CallerHandle *registerHandle(QObject *parent, quintptr token, ProcessMode mode);
|
CallerHandle *registerHandle(QObject *parent, quintptr token);
|
||||||
void unregisterHandle(quintptr token);
|
void unregisterHandle(quintptr token);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
|
@@ -219,7 +219,7 @@ class TerminalImpl : public ProcessInterface
|
|||||||
public:
|
public:
|
||||||
TerminalImpl(QObject *parent, QtcProcess::ProcessImpl processImpl,
|
TerminalImpl(QObject *parent, QtcProcess::ProcessImpl processImpl,
|
||||||
QtcProcess::TerminalMode terminalMode)
|
QtcProcess::TerminalMode terminalMode)
|
||||||
: ProcessInterface(parent, ProcessMode::Reader)
|
: ProcessInterface(parent)
|
||||||
, m_terminal(this, processImpl, terminalMode)
|
, m_terminal(this, processImpl, terminalMode)
|
||||||
{
|
{
|
||||||
connect(&m_terminal, &Internal::TerminalProcess::started,
|
connect(&m_terminal, &Internal::TerminalProcess::started,
|
||||||
@@ -274,8 +274,8 @@ private:
|
|||||||
class QProcessImpl : public ProcessInterface
|
class QProcessImpl : public ProcessInterface
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
QProcessImpl(QObject *parent, ProcessMode processMode)
|
QProcessImpl(QObject *parent)
|
||||||
: ProcessInterface(parent, processMode)
|
: ProcessInterface(parent)
|
||||||
, m_process(new ProcessHelper(parent))
|
, m_process(new ProcessHelper(parent))
|
||||||
{
|
{
|
||||||
connect(m_process, &QProcess::started,
|
connect(m_process, &QProcess::started,
|
||||||
@@ -332,7 +332,7 @@ private:
|
|||||||
void doDefaultStart(const QString &program, const QStringList &arguments) override
|
void doDefaultStart(const QString &program, const QStringList &arguments) override
|
||||||
{
|
{
|
||||||
ProcessStartHandler *handler = m_process->processStartHandler();
|
ProcessStartHandler *handler = m_process->processStartHandler();
|
||||||
handler->setProcessMode(m_processMode);
|
handler->setProcessMode(m_setup.m_processMode);
|
||||||
handler->setWriteData(m_setup.m_writeData);
|
handler->setWriteData(m_setup.m_writeData);
|
||||||
if (m_setup.m_belowNormalPriority)
|
if (m_setup.m_belowNormalPriority)
|
||||||
handler->setBelowNormalPriority();
|
handler->setBelowNormalPriority();
|
||||||
@@ -368,10 +368,10 @@ class ProcessLauncherImpl : public ProcessInterface
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
ProcessLauncherImpl(QObject *parent, ProcessMode processMode)
|
ProcessLauncherImpl(QObject *parent)
|
||||||
: ProcessInterface(parent, processMode), m_token(uniqueToken())
|
: ProcessInterface(parent), m_token(uniqueToken())
|
||||||
{
|
{
|
||||||
m_handle = LauncherInterface::registerHandle(parent, token(), processMode);
|
m_handle = LauncherInterface::registerHandle(parent, token());
|
||||||
connect(m_handle, &CallerHandle::errorOccurred,
|
connect(m_handle, &CallerHandle::errorOccurred,
|
||||||
this, &ProcessInterface::errorOccurred);
|
this, &ProcessInterface::errorOccurred);
|
||||||
connect(m_handle, &CallerHandle::started,
|
connect(m_handle, &CallerHandle::started,
|
||||||
@@ -460,8 +460,8 @@ public:
|
|||||||
if (m_setup.m_terminalMode != QtcProcess::TerminalOff)
|
if (m_setup.m_terminalMode != QtcProcess::TerminalOff)
|
||||||
return new TerminalImpl(parent(), impl, m_setup.m_terminalMode);
|
return new TerminalImpl(parent(), impl, m_setup.m_terminalMode);
|
||||||
else if (impl == QtcProcess::QProcessImpl)
|
else if (impl == QtcProcess::QProcessImpl)
|
||||||
return new QProcessImpl(parent(), m_setup.m_processMode);
|
return new QProcessImpl(parent());
|
||||||
return new ProcessLauncherImpl(parent(), m_setup.m_processMode);
|
return new ProcessLauncherImpl(parent());
|
||||||
}
|
}
|
||||||
|
|
||||||
void setProcessInterface(ProcessInterface *process)
|
void setProcessInterface(ProcessInterface *process)
|
||||||
|
@@ -275,9 +275,7 @@ class QTCREATOR_UTILS_EXPORT ProcessInterface : public QObject
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ProcessInterface(QObject *parent, ProcessMode processMode)
|
ProcessInterface(QObject *parent) : QObject(parent) {}
|
||||||
: QObject(parent)
|
|
||||||
, m_processMode(processMode) {}
|
|
||||||
|
|
||||||
virtual QByteArray readAllStandardOutput() = 0;
|
virtual QByteArray readAllStandardOutput() = 0;
|
||||||
virtual QByteArray readAllStandardError() = 0;
|
virtual QByteArray readAllStandardError() = 0;
|
||||||
@@ -304,7 +302,6 @@ public:
|
|||||||
virtual void interruptProcess() { QTC_CHECK(false); }
|
virtual void interruptProcess() { QTC_CHECK(false); }
|
||||||
virtual qint64 applicationMainThreadID() const { QTC_CHECK(false); return -1; }
|
virtual qint64 applicationMainThreadID() const { QTC_CHECK(false); return -1; }
|
||||||
|
|
||||||
const ProcessMode m_processMode;
|
|
||||||
ProcessSetupData m_setup;
|
ProcessSetupData m_setup;
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
|
Reference in New Issue
Block a user