This is different from QMetaMethod::methodIndex().
*/
QQmlPropertyData *
-QQmlPropertyCache::signal(int index) const
+QQmlPropertyCache::signal(int index, QQmlPropertyCache **c) const
{
if (index < 0 || index >= (signalHandlerIndexCacheStart + signalHandlerIndexCache.count()))
return 0;
if (index < signalHandlerIndexCacheStart)
- return _parent->signal(index);
+ return _parent->signal(index, c);
QQmlPropertyData *rv = const_cast<QQmlPropertyData *>(&methodIndexCache.at(index - signalHandlerIndexCacheStart));
if (rv->notFullyResolved()) resolve(rv);
Q_ASSERT(rv->isSignal() || rv->coreIndex == -1);
+ if (c) *c = const_cast<QQmlPropertyCache *>(this);
return rv;
}
*/
QString QQmlPropertyCache::signalParameterStringForJS(int index, int *count, QString *errorString)
{
- QQmlPropertyData *signalData = signal(index);
+ QQmlPropertyCache *c = 0;
+ QQmlPropertyData *signalData = signal(index, &c);
if (!signalData)
return QString();
args->parameterError = false;
args->names = new QList<QByteArray>(parameterNameList);
signalData->arguments = args;
+ args->next = c->argumentsCache;
+ c->argumentsCache = args;
}
QQmlRewrite::RewriteSignalHandler rewriter;
args->parameterError = false;
args->names = 0;
rv->arguments = args;
+ args->next = c->argumentsCache;
+ c->argumentsCache = args;
}
A *args = static_cast<A *>(rv->arguments);
args->arguments[ii + 1] = type;
}
args->argumentsValid = true;
-
- args->next = c->argumentsCache;
- c->argumentsCache = args;
return static_cast<A *>(rv->arguments)->arguments;
} else {
QQmlPropertyData *property(int) const;
QQmlPropertyData *method(int) const;
- QQmlPropertyData *signal(int) const;
+ QQmlPropertyData *signal(int index) const { return signal(index, 0); }
int methodIndexToSignalIndex(int) const;
QStringList propertyNames() const;
// Implemented in v8/qv8qobjectwrapper.cpp
v8::Local<v8::Object> newQObject(QObject *, QV8Engine *);
+ QQmlPropertyData *signal(int, QQmlPropertyCache **) const;
+
typedef QVector<QQmlPropertyData> IndexCache;
typedef QStringMultiHash<QPair<int, QQmlPropertyData *> > StringCache;
typedef QVector<int> AllowedRevisionCache;