diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-04-14 15:48:49 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-26 15:18:46 +0000 |
| commit | f65f0d4e1da39a5f5fa92e0b8d9ba4ad346d78ef (patch) | |
| tree | 661d5f2556aa16b0a65f9b1030aa23b6717061e6 /src/qml/qml/qqmlbinding.cpp | |
| parent | 65f0629144cb6169707c425fd3def9915dec3e45 (diff) | |
Cleanup
Rename QQmlAbstractBinding::object() and propertyIndex() to
targetObject() and targetPropertyIndex()
Change-Id: Ic50da69e7a7c6412b5abb36f433be046e6566763
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlbinding.cpp')
| -rw-r--r-- | src/qml/qml/qqmlbinding.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index c895663586..e021858509 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -161,7 +161,7 @@ void QQmlBinding::update(QQmlPropertyPrivate::WriteFlags flags) return; // Check that the target has not been deleted - if (QQmlData::wasDeleted(object())) + if (QQmlData::wasDeleted(targetObject())) return; QQmlEnginePrivate *ep = QQmlEnginePrivate::get(context()->engine); @@ -277,13 +277,13 @@ QString QQmlBinding::expression() const return v->toQStringNoThrow(); } -QObject *QQmlBinding::object() const +QObject *QQmlBinding::targetObject() const { if (m_coreObject.hasValue()) return m_coreObject.constValue()->target; else return *m_coreObject; } -int QQmlBinding::propertyIndex() const +int QQmlBinding::targetPropertyIndex() const { if (m_coreObject.hasValue()) return m_coreObject.constValue()->targetProperty; else return m_core.encodedIndex(); @@ -308,7 +308,7 @@ void QQmlBinding::setTarget(QObject *object, const QQmlPropertyData &core) QQmlProperty QQmlBinding::property() const { - return QQmlPropertyPrivate::restore(object(), m_core, 0); + return QQmlPropertyPrivate::restore(targetObject(), m_core, 0); } QT_END_NAMESPACE |