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

QSlotObjectBase: add Deleter and typedef for a unique_ptr using it

Browse Source 
Use it in QMetaCallEvent, to have some automatic test coverage. Other
code that might benefit has undergone changes since 5.15, so will be
ported one-by-one to avoid conflicts on cherry-picks.

Change-Id: I566bab1803e3675f75a9fdf294a4b0f047d21c11
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit c58074b42dcd48a293fe493795d51ca2b101a280)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-07-16 10:04:09 +02:00 committed by Qt Cherry-pick Bot
parent d32e1153c1
commit e2b8476151
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -551,7 +551,7 @@ QMetaCallEvent::QMetaCallEvent(QtPrivate::QSlotObjectBase *slotO,
const QObject *sender, int signalId, const QObject *sender, int signalId,
void **args, QSemaphore *semaphore) void **args, QSemaphore *semaphore)
: QAbstractMetaCallEvent(sender, signalId, semaphore), : QAbstractMetaCallEvent(sender, signalId, semaphore),
d({slotO, args, nullptr, 0, 0, ushort(-1)}), d({QtPrivate::SlotObjUniquePtr{slotO}, args, nullptr, 0, 0, ushort(-1)}),
prealloc_() prealloc_()
{ {
if (d.slotObj_) if (d.slotObj_)
@ -585,7 +585,7 @@ QMetaCallEvent::QMetaCallEvent(QtPrivate::QSlotObjectBase *slotO,
const QObject *sender, int signalId, const QObject *sender, int signalId,
int nargs) int nargs)
: QAbstractMetaCallEvent(sender, signalId), : QAbstractMetaCallEvent(sender, signalId),
d({slotO, nullptr, nullptr, nargs, 0, ushort(-1)}), d({QtPrivate::SlotObjUniquePtr(slotO), nullptr, nullptr, nargs, 0, ushort(-1)}),
prealloc_() prealloc_()
{ {
if (d.slotObj_) if (d.slotObj_)
@ -607,8 +607,6 @@ QMetaCallEvent::~QMetaCallEvent()
if (reinterpret_cast<void *>(d.args_) != reinterpret_cast<void *>(prealloc_)) if (reinterpret_cast<void *>(d.args_) != reinterpret_cast<void *>(prealloc_))
free(d.args_); free(d.args_);
} }
if (d.slotObj_)
d.slotObj_->destroyIfLastRef();
} }
/*! /*!

2
src/corelib/kernel/qobject_p.h
View File

@ -420,7 +420,7 @@ private:
inline void allocArgs(); inline void allocArgs();
struct Data { struct Data {
QtPrivate::QSlotObjectBase *slotObj_; QtPrivate::SlotObjUniquePtr slotObj_;
void **args_; void **args_;
QObjectPrivate::StaticMetaCallFunction callFunction_; QObjectPrivate::StaticMetaCallFunction callFunction_;
int nargs_; int nargs_;

14
src/corelib/kernel/qobjectdefs_impl.h
View File

@ -14,6 +14,8 @@
#include <QtCore/qfunctionaltools_impl.h> #include <QtCore/qfunctionaltools_impl.h>
#include <memory>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QObject; class QObject;
class QObjectPrivate; class QObjectPrivate;
@ -413,6 +415,15 @@ namespace QtPrivate {
public: public:
explicit QSlotObjectBase(ImplFn fn) : m_impl(fn) {} explicit QSlotObjectBase(ImplFn fn) : m_impl(fn) {}
// A custom deleter compatible with std protocols (op()()) we well as
// the legacy QScopedPointer protocol (cleanup()).
struct Deleter {
void operator()(QSlotObjectBase *p) const noexcept
{ if (p) p->destroyIfLastRef(); }
// for the non-standard QScopedPointer protocol:
static void cleanup(QSlotObjectBase *p) noexcept { Deleter{}(p); }
};
inline int ref() noexcept { return m_ref.ref(); } inline int ref() noexcept { return m_ref.ref(); }
#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
inline void destroyIfLastRef() noexcept inline void destroyIfLastRef() noexcept
@ -439,6 +450,9 @@ namespace QtPrivate {
Q_DISABLE_COPY_MOVE(QSlotObjectBase) Q_DISABLE_COPY_MOVE(QSlotObjectBase)
}; };
using SlotObjUniquePtr = std::unique_ptr<QSlotObjectBase,
QSlotObjectBase::Deleter>;
// Implementation of QSlotObjectBase for which the slot is a callable (function, PMF, functor, or lambda). // Implementation of QSlotObjectBase for which the slot is a callable (function, PMF, functor, or lambda).
// Args and R are the List of arguments and the return type of the signal to which the slot is connected. // Args and R are the List of arguments and the return type of the signal to which the slot is connected.
template <typename Func, typename Args, typename R> template <typename Func, typename Args, typename R>