diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-04-15 22:23:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-27 05:20:21 +0000 |
| commit | 4ee9c09a0b6f4e2cdf67ee9d87186691f3e1c0f9 (patch) | |
| tree | 80280d357991ba441a6ead74baacef8867f67b81 /src | |
| parent | 3bc239a0f16fb93f84def55a5980ef8561e7a7b4 (diff) | |
Make update() non virtual
It's only ever called on QQmlBinding objects.
Change-Id: I50dd2996db9644e0df14ec930de17a7e621a0f47
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/qml/qqmlabstractbinding.cpp | 4 | ||||
| -rw-r--r-- | src/qml/qml/qqmlabstractbinding_p.h | 1 | ||||
| -rw-r--r-- | src/qml/qml/qqmlbinding_p.h | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlabstractbinding.cpp b/src/qml/qml/qqmlabstractbinding.cpp index 051125a8d9..877ded7af3 100644 --- a/src/qml/qml/qqmlabstractbinding.cpp +++ b/src/qml/qml/qqmlabstractbinding.cpp @@ -196,8 +196,4 @@ QString QQmlAbstractBinding::expression() const return QLatin1String("<Unknown>"); } -void QQmlAbstractBinding::update(QQmlPropertyPrivate::WriteFlags) -{ -} - QT_END_NAMESPACE diff --git a/src/qml/qml/qqmlabstractbinding_p.h b/src/qml/qml/qqmlabstractbinding_p.h index 0d8766a854..2a04dacec3 100644 --- a/src/qml/qml/qqmlabstractbinding_p.h +++ b/src/qml/qml/qqmlabstractbinding_p.h @@ -80,7 +80,6 @@ public: virtual QObject *targetObject() const = 0; virtual void setEnabled(bool e, QQmlPropertyPrivate::WriteFlags f = QQmlPropertyPrivate::DontRemoveBinding) = 0; - virtual void update(QQmlPropertyPrivate::WriteFlags = QQmlPropertyPrivate::DontRemoveBinding); void addToObject(); void removeFromObject(); diff --git a/src/qml/qml/qqmlbinding_p.h b/src/qml/qml/qqmlbinding_p.h index 8c0a3fbe7e..e48c0d4066 100644 --- a/src/qml/qml/qqmlbinding_p.h +++ b/src/qml/qml/qqmlbinding_p.h @@ -87,7 +87,7 @@ public: virtual QString expression() const; virtual QObject *targetObject() const; virtual int targetPropertyIndex() const; - virtual void update(QQmlPropertyPrivate::WriteFlags flags = QQmlPropertyPrivate::DontRemoveBinding); + void update(QQmlPropertyPrivate::WriteFlags flags = QQmlPropertyPrivate::DontRemoveBinding); typedef int Identifier; static Identifier Invalid; |