summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libs/utils/launcherinterface.cpp5
-rw-r--r--src/libs/utils/launcherinterface.h3
-rw-r--r--src/libs/utils/launchersocket.cpp4
-rw-r--r--src/libs/utils/launchersocket.h5
-rw-r--r--src/libs/utils/processutils.h2
-rw-r--r--src/libs/utils/qtcprocess.cpp32
6 files changed, 28 insertions, 23 deletions
diff --git a/src/libs/utils/launcherinterface.cpp b/src/libs/utils/launcherinterface.cpp
index 0a6939f693..a12ef6e4c5 100644
--- a/src/libs/utils/launcherinterface.cpp
+++ b/src/libs/utils/launcherinterface.cpp
@@ -255,12 +255,13 @@ void LauncherInterface::sendData(const QByteArray &data)
s_instance->m_private->socket()->sendData(data);
}
-Utils::Internal::CallerHandle *LauncherInterface::registerHandle(quintptr token, ProcessMode mode)
+Utils::Internal::CallerHandle *LauncherInterface::registerHandle(QObject *parent, quintptr token,
+ ProcessMode mode)
{
QMutexLocker locker(&s_instanceMutex);
QTC_ASSERT(s_instance != nullptr, return nullptr);
- return s_instance->m_private->socket()->registerHandle(token, mode);
+ return s_instance->m_private->socket()->registerHandle(parent, token, mode);
}
void LauncherInterface::unregisterHandle(quintptr token)
diff --git a/src/libs/utils/launcherinterface.h b/src/libs/utils/launcherinterface.h
index 971525f750..0df595af85 100644
--- a/src/libs/utils/launcherinterface.h
+++ b/src/libs/utils/launcherinterface.h
@@ -58,7 +58,8 @@ private:
static bool isStarted();
static bool isReady();
static void sendData(const QByteArray &data);
- static Utils::Internal::CallerHandle *registerHandle(quintptr token, ProcessMode mode);
+ static Utils::Internal::CallerHandle *registerHandle(QObject *parent, quintptr token,
+ ProcessMode mode);
static void unregisterHandle(quintptr token);
LauncherInterface();
diff --git a/src/libs/utils/launchersocket.cpp b/src/libs/utils/launchersocket.cpp
index 3f442066a7..0a932360b1 100644
--- a/src/libs/utils/launchersocket.cpp
+++ b/src/libs/utils/launchersocket.cpp
@@ -810,14 +810,14 @@ void LauncherSocket::sendData(const QByteArray &data)
QMetaObject::invokeMethod(this, &LauncherSocket::handleRequests);
}
-CallerHandle *LauncherSocket::registerHandle(quintptr token, ProcessMode mode)
+CallerHandle *LauncherSocket::registerHandle(QObject *parent, quintptr token, ProcessMode mode)
{
QTC_ASSERT(!isCalledFromLaunchersThread(), return nullptr);
QMutexLocker locker(&m_mutex);
if (m_handles.contains(token))
return nullptr; // TODO: issue a warning
- CallerHandle *callerHandle = new CallerHandle(token, mode);
+ CallerHandle *callerHandle = new CallerHandle(parent, token, mode);
LauncherHandle *launcherHandle = new LauncherHandle(token, mode);
callerHandle->setLauncherHandle(launcherHandle);
launcherHandle->setCallerHandle(callerHandle);
diff --git a/src/libs/utils/launchersocket.h b/src/libs/utils/launchersocket.h
index 7865c0732a..9708cf0430 100644
--- a/src/libs/utils/launchersocket.h
+++ b/src/libs/utils/launchersocket.h
@@ -67,7 +67,8 @@ public:
Finished
};
Q_ENUM(SignalType)
- CallerHandle(quintptr token, ProcessMode mode) : QObject(), m_token(token), m_processMode(mode) {}
+ CallerHandle(QObject *parent, quintptr token, ProcessMode mode)
+ : QObject(parent), m_token(token), m_processMode(mode) {}
~CallerHandle() override;
LauncherHandle *launcherHandle() const { return m_launcherHandle; }
@@ -252,7 +253,7 @@ public:
void sendData(const QByteArray &data);
// Called from caller's thread exclusively.
- CallerHandle *registerHandle(quintptr token, ProcessMode mode);
+ CallerHandle *registerHandle(QObject *parent, quintptr token, ProcessMode mode);
void unregisterHandle(quintptr token);
signals:
diff --git a/src/libs/utils/processutils.h b/src/libs/utils/processutils.h
index df176f1d95..db3d18a7a3 100644
--- a/src/libs/utils/processutils.h
+++ b/src/libs/utils/processutils.h
@@ -54,7 +54,7 @@ private:
class ProcessHelper : public QProcess
{
public:
- ProcessHelper(QObject *parent = nullptr) : QProcess(parent)
+ ProcessHelper(QObject *parent) : QProcess(parent)
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && defined(Q_OS_UNIX)
setChildProcessModifier([this] { setupChildProcess_impl(); });
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 2f0c79b879..8d9ea7c508 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -214,8 +214,8 @@ class ProcessInterface : public QObject
{
Q_OBJECT
public:
- ProcessInterface(ProcessMode processMode)
- : QObject()
+ ProcessInterface(QObject *parent, ProcessMode processMode)
+ : QObject(parent)
, m_processMode(processMode) {}
virtual QByteArray readAllStandardOutput() = 0;
@@ -276,7 +276,9 @@ private:
class QProcessImpl : public ProcessInterface
{
public:
- QProcessImpl(ProcessMode processMode) : ProcessInterface(processMode)
+ QProcessImpl(QObject *parent, ProcessMode processMode)
+ : ProcessInterface(parent, processMode)
+ , m_process(parent)
{
connect(&m_process, &QProcess::started,
this, &QProcessImpl::handleStarted);
@@ -369,10 +371,10 @@ class ProcessLauncherImpl : public ProcessInterface
{
Q_OBJECT
public:
- ProcessLauncherImpl(ProcessMode processMode)
- : ProcessInterface(processMode), m_token(uniqueToken())
+ ProcessLauncherImpl(QObject *parent, ProcessMode processMode)
+ : ProcessInterface(parent, processMode), m_token(uniqueToken())
{
- m_handle = LauncherInterface::registerHandle(token(), processMode);
+ m_handle = LauncherInterface::registerHandle(parent, token(), processMode);
connect(m_handle, &CallerHandle::errorOccurred,
this, &ProcessInterface::errorOccurred);
connect(m_handle, &CallerHandle::started,
@@ -388,6 +390,7 @@ public:
{
cancel();
LauncherInterface::unregisterHandle(token());
+ m_handle = nullptr;
}
QByteArray readAllStandardOutput() override { return m_handle->readAllStandardOutput(); }
@@ -448,11 +451,12 @@ void ProcessLauncherImpl::cancel()
m_handle->cancel();
}
-static ProcessInterface *newProcessInstance(QtcProcess::ProcessImpl processImpl, ProcessMode mode)
+static ProcessInterface *newProcessInstance(QObject *parent, QtcProcess::ProcessImpl processImpl,
+ ProcessMode mode)
{
if (processImpl == QtcProcess::QProcessImpl)
- return new QProcessImpl(mode);
- return new ProcessLauncherImpl(mode);
+ return new QProcessImpl(parent, mode);
+ return new ProcessLauncherImpl(parent, mode);
}
class QtcProcessPrivate : public QObject
@@ -461,7 +465,10 @@ public:
explicit QtcProcessPrivate(QtcProcess *parent,
QtcProcess::ProcessImpl processImpl,
ProcessMode processMode)
- : q(parent), m_process(newProcessInstance(processImpl, processMode)), m_processMode(processMode)
+ : QObject(parent)
+ , q(parent)
+ , m_process(newProcessInstance(parent, processImpl, processMode))
+ , m_processMode(processMode)
{
connect(m_process, &ProcessInterface::started,
q, &QtcProcess::started);
@@ -477,11 +484,6 @@ public:
m_timer.setInterval(1000);
}
- ~QtcProcessPrivate()
- {
- delete m_process;
- }
-
void handleReadyReadStandardOutput()
{
m_stdOut.append(m_process->readAllStandardOutput());
View Lorry Controller Status