From d97009a9f147af7f9785afb53df49e874aadd969 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sun, 11 Aug 2019 08:59:07 +0200 Subject: [PATCH] Remove obsolete API after qtdeclarative migrated This is a follow-up to commit b7d073e9905bf9812ba96cecdcf6871a95517d30, which refactored memory allocation of QMetaCallEvent. Change-Id: I363256c80ee941b545e6f9c659c65556fff5c907 Reviewed-by: Simon Hausmann --- src/corelib/kernel/qobject.cpp | 22 ---------------------- src/corelib/kernel/qobject_p.h | 6 ------ 2 files changed, 28 deletions(-) diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 4a26e9cdc0..9251a3c05f 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -524,28 +524,6 @@ inline void QMetaCallEvent::allocArgs() d.args_ = static_cast(memory); } -/*! - \internal - - Only used by QtDeclarative - to be removed when migrated. - */ -QMetaCallEvent::QMetaCallEvent(ushort method_offset, ushort method_relative, - QObjectPrivate::StaticMetaCallFunction callFunction, - const QObject *sender, int signalId, - int nargs, int *types_, void **args_) - : QAbstractMetaCallEvent(sender, signalId), - d({nullptr, nullptr, callFunction, nargs, method_offset, method_relative}), - prealloc_() -{ - allocArgs(); - for (int arg = 0; arg < nargs; ++arg) { - types()[arg] = types_[arg]; - args()[arg] = args_[arg]; - } - free(types_); - free(args_); -} - /*! \internal diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 5d0b3a8399..feafcaf323 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -509,12 +509,6 @@ private: class Q_CORE_EXPORT QMetaCallEvent : public QAbstractMetaCallEvent { public: - // kept for compatibility until QtDeclarative has moved over - QMetaCallEvent(ushort method_offset, ushort method_relative, - QObjectPrivate::StaticMetaCallFunction callFunction, - const QObject *sender, int signalId, - int nargs, int *types, void **args); - // blocking queued with semaphore - args always owned by caller QMetaCallEvent(ushort method_offset, ushort method_relative, QObjectPrivate::StaticMetaCallFunction callFunction,