forked from qt-creator/qt-creator
Add a virtual destructor for the LauncherSignal base class
Move qDeleteAll into cpp file, as LauncherSignal is defined there. Change-Id: I59ed1de2025c3f62196e1c676accf26b3fb813ac Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -41,6 +41,7 @@ class LauncherSignal
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
CallerHandle::SignalType signalType() const { return m_signalType; }
|
CallerHandle::SignalType signalType() const { return m_signalType; }
|
||||||
|
virtual ~LauncherSignal() = default;
|
||||||
protected:
|
protected:
|
||||||
LauncherSignal(CallerHandle::SignalType signalType) : m_signalType(signalType) {}
|
LauncherSignal(CallerHandle::SignalType signalType) : m_signalType(signalType) {}
|
||||||
private:
|
private:
|
||||||
@@ -105,6 +106,11 @@ private:
|
|||||||
const int m_exitCode;
|
const int m_exitCode;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
CallerHandle::~CallerHandle()
|
||||||
|
{
|
||||||
|
qDeleteAll(m_signals);
|
||||||
|
}
|
||||||
|
|
||||||
bool CallerHandle::waitForStarted(int msecs)
|
bool CallerHandle::waitForStarted(int msecs)
|
||||||
{
|
{
|
||||||
return waitForSignal(msecs, SignalType::Started);
|
return waitForSignal(msecs, SignalType::Started);
|
||||||
|
@@ -68,7 +68,7 @@ public:
|
|||||||
};
|
};
|
||||||
Q_ENUM(SignalType)
|
Q_ENUM(SignalType)
|
||||||
CallerHandle(quintptr token, ProcessMode mode) : QObject(), m_token(token), m_processMode(mode) {}
|
CallerHandle(quintptr token, ProcessMode mode) : QObject(), m_token(token), m_processMode(mode) {}
|
||||||
~CallerHandle() override { qDeleteAll(m_signals); }
|
~CallerHandle() override;
|
||||||
|
|
||||||
LauncherHandle *launcherHandle() const { return m_launcherHandle; }
|
LauncherHandle *launcherHandle() const { return m_launcherHandle; }
|
||||||
void setLauncherHandle(LauncherHandle *handle) { QMutexLocker locker(&m_mutex); m_launcherHandle = handle; }
|
void setLauncherHandle(LauncherHandle *handle) { QMutexLocker locker(&m_mutex); m_launcherHandle = handle; }
|
||||||
|
Reference in New Issue
Block a user