1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port SlotObjectGuard to SlotObjUniquePtr

Browse Source 
Change-Id: I81e64db7e1be9076494bee15bbca372ebffeb3e0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit cec711092f7df10ee90ccac6784da4bbea491e16)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-07-16 14:25:25 +02:00 committed by Qt Cherry-pick Bot
parent d760569dee
commit 46af7d3d1f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/kernel/qobject.cpp
View File

@ -3770,17 +3770,14 @@ struct SlotObjectGuard {
} }
QtPrivate::QSlotObjectBase const *operator->() const QtPrivate::QSlotObjectBase const *operator->() const
{ return m_slotObject; } { return m_slotObject.get(); }
QtPrivate::QSlotObjectBase *operator->() QtPrivate::QSlotObjectBase *operator->()
{ return m_slotObject; } { return m_slotObject.get(); }
~SlotObjectGuard() { ~SlotObjectGuard() = default;
if (m_slotObject)
m_slotObject->destroyIfLastRef();
}
private: private:
QtPrivate::QSlotObjectBase *m_slotObject = nullptr; QtPrivate::SlotObjUniquePtr m_slotObject;
}; };
/*! /*!