aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlbinding_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-04-13 13:30:25 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-04-25 14:10:47 +0000
commit57890547ebb31608df179da2fd3f8a4cd25995dc (patch)
tree595ff9191ac9f2630f62e9c1266b3a68a6a35238 /src/qml/qml/qqmlbinding_p.h
parent54daa0035c9649ab92a70ae050534832b37c09be (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_p.h')
-rw-r--r--src/qml/qml/qqmlbinding_p.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/qml/qml/qqmlbinding_p.h b/src/qml/qml/qqmlbinding_p.h
index 4f1c27c248..65adcae2c6 100644
--- a/src/qml/qml/qqmlbinding_p.h
+++ b/src/qml/qml/qqmlbinding_p.h
@@ -74,7 +74,7 @@ public:
QQmlBinding(const QV4::Value &, QObject *, QQmlContextData *);
void setTarget(const QQmlProperty &);
- void setTarget(QObject *, const QQmlPropertyData &, QQmlContextData *);
+ void setTarget(QObject *, const QQmlPropertyData &);
QQmlProperty property() const;
void setNotifyOnValueChanged(bool);
@@ -126,30 +126,28 @@ private:
QPointerValuePair<QObject, Retarget> m_coreObject;
QQmlPropertyData m_core;
- // We store some flag bits in the following flag pointers.
- // m_ctxt:flag1 - updatingFlag
- // m_ctxt:flag2 - enabledFlag
- QFlagPointer<QQmlContextData> m_ctxt;
+ uint m_updating : 1;
+ uint m_enabled : 1;
};
bool QQmlBinding::updatingFlag() const
{
- return m_ctxt.flag();
+ return m_updating;
}
void QQmlBinding::setUpdatingFlag(bool v)
{
- m_ctxt.setFlagValue(v);
+ m_updating = v;
}
bool QQmlBinding::enabledFlag() const
{
- return m_ctxt.flag2();
+ return m_enabled;
}
void QQmlBinding::setEnabledFlag(bool v)
{
- m_ctxt.setFlag2Value(v);
+ m_enabled = v;
}
QT_END_NAMESPACE