diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-10-25 16:24:37 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-26 12:50:01 +0200 |
| commit | 060927726d0b053d599867f8b05d07da6e0b6a78 (patch) | |
| tree | 5e759990a73dd487e774081b180a9bf589bb0a88 /src/declarative/qml/qdeclarativeproperty_p.h | |
| parent | 4ae7aecb68b506f21bd5411bf92a1e8d9fe807bb (diff) | |
Rename QDeclarativePropertyCache::Data to QDeclarativePropertyData
This class is now too large to be nicely nested.
Change-Id: I32cfa5caa524b8bf447d1f8c53ef2763f60bdac1
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeproperty_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeproperty_p.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h index 5bfbf47c0d..f2e86dda19 100644 --- a/src/declarative/qml/qdeclarativeproperty_p.h +++ b/src/declarative/qml/qdeclarativeproperty_p.h @@ -81,7 +81,7 @@ public: QDeclarativeGuard<QObject> object; bool isNameCached:1; - QDeclarativePropertyCache::Data core; + QDeclarativePropertyData core; QString nameCache; void initProperty(QObject *obj, const QString &name); @@ -99,10 +99,10 @@ public: static bool writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, const QVariant &value, int flags); static bool writeValueProperty(QObject *, QDeclarativeEngine *, - const QDeclarativePropertyCache::Data &, + const QDeclarativePropertyData &, const QVariant &, QDeclarativeContextData *, WriteFlags flags = 0); - static bool write(QObject *, const QDeclarativePropertyCache::Data &, const QVariant &, + static bool write(QObject *, const QDeclarativePropertyData &, const QVariant &, QDeclarativeContextData *, WriteFlags flags = 0); static void findAliasTarget(QObject *, int, QObject **, int *); static QDeclarativeAbstractBinding *setBinding(QObject *, int coreIndex, int valueTypeIndex /* -1 */, @@ -112,10 +112,10 @@ public: QDeclarativeAbstractBinding *); static QDeclarativeAbstractBinding *binding(QObject *, int coreIndex, int valueTypeIndex /* -1 */); - static QDeclarativePropertyCache::Data saveValueType(const QMetaObject *, int, - const QMetaObject *, int, - QDeclarativeEngine *); - static QDeclarativeProperty restore(const QDeclarativePropertyCache::Data &, + static QDeclarativePropertyData saveValueType(const QMetaObject *, int, + const QMetaObject *, int, + QDeclarativeEngine *); + static QDeclarativeProperty restore(const QDeclarativePropertyData &, QObject *, QDeclarativeContextData *); @@ -138,13 +138,13 @@ public: QDeclarativeJavaScriptExpression *expression, v8::Handle<v8::Value> result, bool isUndefined, WriteFlags flags); - static bool writeBinding(QObject *, const QDeclarativePropertyCache::Data &, + static bool writeBinding(QObject *, const QDeclarativePropertyData &, QDeclarativeJavaScriptExpression *expression, v8::Handle<v8::Value> result, bool isUndefined, WriteFlags flags); static int valueTypeCoreIndex(const QDeclarativeProperty &that); static int bindingIndex(const QDeclarativeProperty &that); - static int bindingIndex(const QDeclarativePropertyCache::Data &that); + static int bindingIndex(const QDeclarativePropertyData &that); static QMetaMethod findSignalByName(const QMetaObject *mo, const QByteArray &); static bool connect(const QObject *sender, int signal_index, const QObject *receiver, int method_index, |