diff options
| author | Aurélien Brooke <aurelien@bahiasoft.fr> | 2025-05-24 09:13:50 +0200 |
|---|---|---|
| committer | Aurélien Brooke <aurelien@bahiasoft.fr> | 2025-05-26 13:27:17 +0200 |
| commit | c100bb306ad62fd5372bbd6a2828722735c52bbf (patch) | |
| tree | 95206d0f97d4bfe68144834f920ef4606e2ca13f /src | |
| parent | 3c1e2b8a240feac8b898741030831e050e3bed6d (diff) | |
QMetaCallEvent: remove the QMetaCallEvent::create() function
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 19 | ||||
| -rw-r--r-- | src/corelib/kernel/qobject_p.h | 31 |
2 files changed, 0 insertions, 50 deletions
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<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 \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<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 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 { |