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();
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();
}
class QDeclarativeEngine;
class QMetaProperty;
+
class Q_AUTOTEST_EXPORT QDeclarativePropertyCache : public QDeclarativeRefCount, public QDeclarativeCleanup
{
public:
struct Data {
inline Data();
-
inline bool operator==(const Data &);
enum Flag {
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 *);