diff options
author | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-07-05 10:35:56 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-07-06 09:31:08 +0000 |
commit | 0d7dd44d781a73c4bd065c0660d4a2f824a86f05 (patch) | |
tree | d27ce3fe261289eb494c4e57bc0e8629bbe865ab /src/qml/qml/qqmlpropertycache.cpp | |
parent | bd8cf4e04062c2d844628f6b5167888b8f342f8a (diff) |
QML: Clarify a parameter's usage in QQmlPropertyCache
Give the template type a fitting name, use a parameter name that is
slightly more descriptive than "dummy", and pass it around by pointer
like we do in other places.
Change-Id: Ie7051a6053fc8d2f9c3ea92ee3ce18e57dc5e62a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlpropertycache.cpp')
-rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 313eec8f69..84081e707d 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -1463,7 +1463,8 @@ int QQmlMetaObject::methodReturnType(const QQmlPropertyData &data, QByteArray *u return type; } -int *QQmlMetaObject::methodParameterTypes(int index, QVarLengthArray<int, 9> &dummy, QByteArray *unknownTypeError) const +int *QQmlMetaObject::methodParameterTypes(int index, ArgTypeStorage *argStorage, + QByteArray *unknownTypeError) const { Q_ASSERT(!_m.isNull() && index >= 0); @@ -1518,15 +1519,19 @@ int *QQmlMetaObject::methodParameterTypes(int index, QVarLengthArray<int, 9> &du } else { QMetaMethod m = _m.asT2()->method(index); - return methodParameterTypes(m, dummy, unknownTypeError); + return methodParameterTypes(m, argStorage, unknownTypeError); } } -int* QQmlMetaObject::methodParameterTypes(const QMetaMethod &m, QVarLengthArray<int, 9> &dummy, QByteArray *unknownTypeError) const { +int *QQmlMetaObject::methodParameterTypes(const QMetaMethod &m, ArgTypeStorage *argStorage, + QByteArray *unknownTypeError) const +{ + Q_ASSERT(argStorage); + int argc = m.parameterCount(); - dummy.resize(argc + 1); - dummy[0] = argc; + argStorage->resize(argc + 1); + argStorage->operator[](0) = argc; QList<QByteArray> argTypeNames; // Only loaded if needed for (int ii = 0; ii < argc; ++ii) { @@ -1546,10 +1551,10 @@ int* QQmlMetaObject::methodParameterTypes(const QMetaMethod &m, QVarLengthArray< if (unknownTypeError) *unknownTypeError = argTypeNames.at(ii); return 0; } - dummy[ii + 1] = type; + argStorage->operator[](ii + 1) = type; } - return dummy.data(); + return argStorage->data(); } void QQmlObjectOrGadget::metacall(QMetaObject::Call type, int index, void **argv) const @@ -1568,7 +1573,9 @@ void QQmlObjectOrGadget::metacall(QMetaObject::Call type, int index, void **argv } } -int* QQmlStaticMetaObject::constructorParameterTypes(int index, QVarLengthArray<int, 9> &dummy, QByteArray *unknownTypeError) const { +int *QQmlStaticMetaObject::constructorParameterTypes(int index, ArgTypeStorage *dummy, + QByteArray *unknownTypeError) const +{ QMetaMethod m = _m.asT2()->constructor(index); return methodParameterTypes(m, dummy, unknownTypeError); } |