diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 78a28cc50e5..8d133a24ee1 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -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(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 \brief Exception-safe wrapper around QObject::blockSignals(). diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 2b6e1eebd03..20c454506ab 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -382,25 +382,6 @@ public: ~QMetaCallEvent() override; - template - 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(), QMetaType::fromType()... }; - constexpr auto argc = sizeof...(Args) + 1; - return create_impl(slotObj, sender, signal_index, argc, argp, metaTypes); - } - template - 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(), QMetaType::fromType()... }; - 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 const void * const* args() const { return d.args_; } inline void ** args() { return d.args_; } @@ -410,18 +391,6 @@ public: virtual void placeMetaCall(QObject *object) override; 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(); struct Data {