diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-04-13 13:30:25 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-25 14:10:47 +0000 |
| commit | 57890547ebb31608df179da2fd3f8a4cd25995dc (patch) | |
| tree | 595ff9191ac9f2630f62e9c1266b3a68a6a35238 /src/qml/qml/qqmlbinding.cpp | |
| parent | 54daa0035c9649ab92a70ae050534832b37c09be (diff) | |
Remove the QQmlContextData pointer from QQmlBinding
The pointer is never used in practice, so let's get rid of it and
save some memory.
Change-Id: I8dccafb4cd3e14397fcf1c30633d60ea7ea9ce0c
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlbinding.cpp')
| -rw-r--r-- | src/qml/qml/qqmlbinding.cpp | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index 9123825f65..558fbaf713 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -63,7 +63,10 @@ QQmlAbstractBinding::VTable QQmlBinding_vtable = { QQmlBinding::Identifier QQmlBinding::Invalid = -1; QQmlBinding::QQmlBinding(const QString &str, QObject *obj, QQmlContext *ctxt) -: QQmlJavaScriptExpression(), QQmlAbstractBinding(Binding) + : QQmlJavaScriptExpression(), + QQmlAbstractBinding(Binding), + m_updating(false), + m_enabled(false) { setNotifyOnValueChanged(true); QQmlJavaScriptExpression::setContext(QQmlContextData::get(ctxt)); @@ -74,7 +77,10 @@ QQmlBinding::QQmlBinding(const QString &str, QObject *obj, QQmlContext *ctxt) } QQmlBinding::QQmlBinding(const QQmlScriptString &script, QObject *obj, QQmlContext *ctxt) -: QQmlJavaScriptExpression(), QQmlAbstractBinding(Binding) + : QQmlJavaScriptExpression(), + QQmlAbstractBinding(Binding), + m_updating(false), + m_enabled(false) { if (ctxt && !ctxt->isValid()) return; @@ -108,7 +114,10 @@ QQmlBinding::QQmlBinding(const QQmlScriptString &script, QObject *obj, QQmlConte } QQmlBinding::QQmlBinding(const QString &str, QObject *obj, QQmlContextData *ctxt) -: QQmlJavaScriptExpression(), QQmlAbstractBinding(Binding) + : QQmlJavaScriptExpression(), + QQmlAbstractBinding(Binding), + m_updating(false), + m_enabled(false) { setNotifyOnValueChanged(true); QQmlJavaScriptExpression::setContext(ctxt); @@ -121,7 +130,10 @@ QQmlBinding::QQmlBinding(const QString &str, QObject *obj, QQmlContextData *ctxt QQmlBinding::QQmlBinding(const QString &str, QObject *obj, QQmlContextData *ctxt, const QString &url, quint16 lineNumber, quint16 columnNumber) -: QQmlJavaScriptExpression(), QQmlAbstractBinding(Binding) + : QQmlJavaScriptExpression(), + QQmlAbstractBinding(Binding), + m_updating(false), + m_enabled(false) { Q_UNUSED(columnNumber); setNotifyOnValueChanged(true); @@ -133,7 +145,10 @@ QQmlBinding::QQmlBinding(const QString &str, QObject *obj, } QQmlBinding::QQmlBinding(const QV4::Value &functionPtr, QObject *obj, QQmlContextData *ctxt) -: QQmlJavaScriptExpression(), QQmlAbstractBinding(Binding) + : QQmlJavaScriptExpression(), + QQmlAbstractBinding(Binding), + m_updating(false), + m_enabled(false) { setNotifyOnValueChanged(true); QQmlJavaScriptExpression::setContext(ctxt); @@ -323,20 +338,18 @@ void QQmlBinding::retargetBinding(QObject *t, int i) void QQmlBinding::setTarget(const QQmlProperty &prop) { - setTarget(prop.object(), QQmlPropertyPrivate::get(prop)->core, - QQmlPropertyPrivate::get(prop)->context); + setTarget(prop.object(), QQmlPropertyPrivate::get(prop)->core); } -void QQmlBinding::setTarget(QObject *object, const QQmlPropertyData &core, QQmlContextData *ctxt) +void QQmlBinding::setTarget(QObject *object, const QQmlPropertyData &core) { m_coreObject = object; m_core = core; - m_ctxt = ctxt; } QQmlProperty QQmlBinding::property() const { - return QQmlPropertyPrivate::restore(object(), m_core, *m_ctxt); + return QQmlPropertyPrivate::restore(object(), m_core, 0); } QT_END_NAMESPACE |