diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-15 05:58:35 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-17 00:20:49 (GMT) |
| commit | 26cd94ef47ffc969dc835e98b58eded14e669964 (patch) | |
| tree | 9ec8e418ec0ce385bd07289d5368e221a5ce017e /src/declarative/qml/qdeclarativeexpression_p.h | |
| parent | 06766918436dc6c5de2e605e7ed3421c548c6782 (diff) | |
| download | Qt-26cd94ef47ffc969dc835e98b58eded14e669964.zip Qt-26cd94ef47ffc969dc835e98b58eded14e669964.tar.gz Qt-26cd94ef47ffc969dc835e98b58eded14e669964.tar.bz2 | |
Optimization: Reduce unnecessary QObject allocations
Diffstat (limited to 'src/declarative/qml/qdeclarativeexpression_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeexpression_p.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/declarative/qml/qdeclarativeexpression_p.h b/src/declarative/qml/qdeclarativeexpression_p.h index d170559..5adaa89 100644 --- a/src/declarative/qml/qdeclarativeexpression_p.h +++ b/src/declarative/qml/qdeclarativeexpression_p.h @@ -70,15 +70,16 @@ public: bool isValid() const; - QDeclarativeContext *context() const; - void setContext(QDeclarativeContext *); + QDeclarativeContextData *context() const; + void setContext(QDeclarativeContextData *); virtual void refresh(); private: friend class QDeclarativeContext; + friend class QDeclarativeContextData; friend class QDeclarativeContextPrivate; - QDeclarativeContext *m_context; + QDeclarativeContextData *m_context; QDeclarativeAbstractExpression **m_prevExpression; QDeclarativeAbstractExpression *m_nextExpression; }; @@ -143,8 +144,8 @@ public: QDeclarativeExpressionPrivate(QDeclarativeExpressionData *); ~QDeclarativeExpressionPrivate(); - void init(QDeclarativeContext *, const QString &, QObject *); - void init(QDeclarativeContext *, void *, QDeclarativeRefCount *, QObject *, const QString &, int); + void init(QDeclarativeContextData *, const QString &, QObject *); + void init(QDeclarativeContextData *, void *, QDeclarativeRefCount *, QObject *, const QString &, int); QDeclarativeExpressionData *data; @@ -164,8 +165,8 @@ public: virtual void emitValueChanged(); static void exceptionToError(QScriptEngine *, QDeclarativeError &); - static QScriptValue evalInObjectScope(QDeclarativeContext *, QObject *, const QString &, QScriptValue * = 0); - static QScriptValue evalInObjectScope(QDeclarativeContext *, QObject *, const QScriptProgram &, QScriptValue * = 0); + static QScriptValue evalInObjectScope(QDeclarativeContextData *, QObject *, const QString &, QScriptValue * = 0); + static QScriptValue evalInObjectScope(QDeclarativeContextData *, QObject *, const QScriptProgram &, QScriptValue * = 0); }; QT_END_NAMESPACE |