summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeproperty_p.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-03-15 15:58:35 +1000
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-03-17 10:20:49 +1000
commit26cd94ef47ffc969dc835e98b58eded14e669964 (patch)
tree9ec8e418ec0ce385bd07289d5368e221a5ce017e /src/declarative/qml/qdeclarativeproperty_p.h
parent06766918436dc6c5de2e605e7ed3421c548c6782 (diff)
Optimization: Reduce unnecessary QObject allocations
Diffstat (limited to 'src/declarative/qml/qdeclarativeproperty_p.h')
-rw-r--r--src/declarative/qml/qdeclarativeproperty_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h
index 26b85b8aa5..1bbee64909 100644
--- a/src/declarative/qml/qdeclarativeproperty_p.h
+++ b/src/declarative/qml/qdeclarativeproperty_p.h
@@ -82,7 +82,7 @@ public:
valueType(other.valueType) {}
QDeclarativeProperty *q;
- QDeclarativeContext *context;
+ QDeclarativeContextData *context;
QDeclarativeEngine *engine;
QDeclarativeGuard<QObject> object;
@@ -109,7 +109,7 @@ public:
static bool writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object,
const QVariant &value, int flags);
static bool write(QObject *, const QDeclarativePropertyCache::Data &, const QVariant &,
- QDeclarativeContext *, WriteFlags flags = 0);
+ QDeclarativeContextData *, WriteFlags flags = 0);
static QDeclarativeAbstractBinding *setBinding(QObject *, int coreIndex, int valueTypeIndex /* -1 */,
QDeclarativeAbstractBinding *,
WriteFlags flags = DontRemoveBinding);
@@ -117,7 +117,7 @@ public:
static QByteArray saveValueType(const QMetaObject *, int,
const QMetaObject *, int);
static QByteArray saveProperty(const QMetaObject *, int);
- static QDeclarativeProperty restore(const QByteArray &, QObject *, QDeclarativeContext *);
+ static QDeclarativeProperty restore(const QByteArray &, QObject *, QDeclarativeContextData *);
static bool equal(const QMetaObject *, const QMetaObject *);
static bool canConvert(const QMetaObject *from, const QMetaObject *to);