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

QMetaCallEvent: remove the QMetaCallEvent::create() function

Browse Source 
It is unused since 0bd1fc006097e481d8b92ee1c5246ffa1ae9379f, and
duplicates a lot of code.

The last usages were replaced by QMetaObject::invokeMethod().

Change-Id: Idad7c75a7b43670269b0cfcea9543114839e604c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Aurélien Brooke 2025-05-24 09:13:50 +02:00
parent 3c1e2b8a24
commit c100bb306a
2 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -626,25 +626,6 @@ void QMetaCallEvent::placeMetaCall(QObject *object)
} }
} }
QMetaCallEvent* QMetaCallEvent::create_impl(QtPrivate::SlotObjUniquePtr slotObj,
const QObject *sender, int signal_index,
size_t argc, const void* const argp[],
const QMetaType metaTypes[])
{
auto metaCallEvent = std::make_unique<QMetaCallEvent>(std::move(slotObj), sender,
signal_index, int(argc));
void **args = metaCallEvent->args();
QMetaType *types = metaCallEvent->types();
for (size_t i = 0; i < argc; ++i) {
types[i] = metaTypes[i];
args[i] = types[i].create(argp[i]);
Q_CHECK_PTR(!i || args[i]);
}
return metaCallEvent.release();
}
/*! /*!
\class QSignalBlocker \class QSignalBlocker
\brief Exception-safe wrapper around QObject::blockSignals(). \brief Exception-safe wrapper around QObject::blockSignals().

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

@ -382,25 +382,6 @@ public:
~QMetaCallEvent() override; ~QMetaCallEvent() override;
template<typename ...Args>
static QMetaCallEvent *create(QtPrivate::QSlotObjectBase *slotObj, const QObject *sender,
int signal_index, const Args &...argv)
{
const void* const argp[] = { nullptr, std::addressof(argv)... };
const QMetaType metaTypes[] = { QMetaType::fromType<void>(), QMetaType::fromType<Args>()... };
constexpr auto argc = sizeof...(Args) + 1;
return create_impl(slotObj, sender, signal_index, argc, argp, metaTypes);
}
template<typename ...Args>
static QMetaCallEvent *create(QtPrivate::SlotObjUniquePtr slotObj, const QObject *sender,
int signal_index, const Args &...argv)
{
const void* const argp[] = { nullptr, std::addressof(argv)... };
const QMetaType metaTypes[] = { QMetaType::fromType<void>(), QMetaType::fromType<Args>()... };
constexpr auto argc = sizeof...(Args) + 1;
return create_impl(std::move(slotObj), sender, signal_index, argc, argp, metaTypes);
}
inline int id() const { return d.method_offset_ + d.method_relative_; } inline int id() const { return d.method_offset_ + d.method_relative_; }
inline const void * const* args() const { return d.args_; } inline const void * const* args() const { return d.args_; }
inline void ** args() { return d.args_; } inline void ** args() { return d.args_; }
@ -410,18 +391,6 @@ public:
virtual void placeMetaCall(QObject *object) override; virtual void placeMetaCall(QObject *object) override;
private: private:
static QMetaCallEvent *create_impl(QtPrivate::QSlotObjectBase *slotObj, const QObject *sender,
int signal_index, size_t argc, const void * const argp[],
const QMetaType metaTypes[])
{
if (slotObj)
slotObj->ref();
return create_impl(QtPrivate::SlotObjUniquePtr{slotObj}, sender,
signal_index, argc, argp, metaTypes);
}
static QMetaCallEvent *create_impl(QtPrivate::SlotObjUniquePtr slotObj, const QObject *sender,
int signal_index, size_t argc, const void * const argp[],
const QMetaType metaTypes[]);
inline void allocArgs(); inline void allocArgs();
struct Data { struct Data {