Revert "cache the arguments in property cache data"

This reverts commit 30327650798ba63281c7b9344c9d824d00dce82a.

diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp
index f39cdd9..9cbb4fa 100644 (file)
--- a/src/declarative/qml/qdeclarativepropertycache.cpp
+++ b/src/declarative/qml/qdeclarativepropertycache.cpp
@@ -93,26 +93,6 @@ 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();
@@ -127,17 +107,8 @@ 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();
 }
 

diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h
index 86ccfe0..65a8725 100644 (file)
--- a/src/declarative/qml/qdeclarativepropertycache_p.h
+++ b/src/declarative/qml/qdeclarativepropertycache_p.h
@@ -64,6 +64,7 @@ QT_BEGIN_NAMESPACE
 
 class QDeclarativeEngine;
 class QMetaProperty;
+
 class Q_AUTOTEST_EXPORT QDeclarativePropertyCache : public QDeclarativeRefCount, public QDeclarativeCleanup
 {
 public:
@@ -73,7 +74,6 @@ public:
 
     struct Data {
         inline Data(); 
-
         inline bool operator==(const Data &);
 
         enum Flag { 
@@ -115,9 +115,8 @@ 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 *);