Commit 30327650 authored by Charles Yin's avatar Charles Yin

cache the arguments in property cache data

Change-Id: Ie02b94c2ddb1d5d7b7bb6556a01a5ae86a438c57
(cherry picked from commit 39fed3e2601935c1d6834bb5e75266e5b280e5cd)
parent 4890cbe4
......@@ -93,6 +93,26 @@ void QDeclarativePropertyCache::Data::load(const QMetaProperty &p, QDeclarativeE
revision = p.revision();
}
int QDeclarativePropertyCache::Data::enumType(const QMetaObject *meta, const QString &strname)
{
QByteArray str = strname.toUtf8();
QByteArray scope;
QByteArray name;
int scopeIdx = str.lastIndexOf("::");
if (scopeIdx != -1) {
scope = str.left(scopeIdx);
name = str.mid(scopeIdx + 2);
} else {
name = str;
}
for (int i = meta->enumeratorCount() - 1; i >= 0; --i) {
QMetaEnum m = meta->enumerator(i);
if ((m.name() == name) && (scope.isEmpty() || (m.scope() == scope)))
return QVariant::Int;
}
return QVariant::Invalid;
}
void QDeclarativePropertyCache::Data::load(const QMetaMethod &m)
{
coreIndex = m.methodIndex();
......@@ -107,8 +127,17 @@ void QDeclarativePropertyCache::Data::load(const QMetaMethod &m)
propType = QMetaType::type(returnType);
QList<QByteArray> params = m.parameterTypes();
if (!params.isEmpty())
if (!params.isEmpty()) {
flags |= Data::HasArguments;
paramTypes.resize(params.size());
for (int i = 0; i < params.size(); ++i) {
paramTypes[i] = QMetaType::type(params.at(i));
if (paramTypes[i] == QVariant::Invalid)
paramTypes[i] = enumType(m.enclosingMetaObject(), QString::fromLatin1(params.at(i)));
if (paramTypes[i] == QVariant::Invalid)
paramTypes[i] = -1; //Unknown method parameter type
}
}
revision = m.revision();
}
......
......@@ -64,7 +64,6 @@ QT_BEGIN_NAMESPACE
class QDeclarativeEngine;
class QMetaProperty;
class Q_AUTOTEST_EXPORT QDeclarativePropertyCache : public QDeclarativeRefCount, public QDeclarativeCleanup
{
public:
......@@ -74,6 +73,7 @@ public:
struct Data {
inline Data();
inline bool operator==(const Data &);
enum Flag {
......@@ -115,8 +115,9 @@ public:
int overrideIndex : 31;
int revision;
int metaObjectOffset;
QVector<int> paramTypes;
static Flags flagsForProperty(const QMetaProperty &, QDeclarativeEngine *engine = 0);
int enumType(const QMetaObject *meta, const QString &strname);
void load(const QMetaProperty &, QDeclarativeEngine *engine = 0);
void load(const QMetaMethod &);
QString name(QObject *);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment