AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove obsolete API after qtdeclarative migrated

Browse Source 
This is a follow-up to commit b7d073e990,
which refactored memory allocation of QMetaCallEvent.

Change-Id: I363256c80ee941b545e6f9c659c65556fff5c907
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Volker Hilsheimer 2019-08-11 08:59:07 +02:00
parent 62015adadd
commit d97009a9f1
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -524,28 +524,6 @@ inline void QMetaCallEvent::allocArgs()
d.args_ = static_cast<void **>(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

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

@ -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,