From 74ff1216a449d6098975b3c9baca7abb1399211b Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Mon, 6 Feb 2012 13:27:34 +1000 Subject: [PATCH] Don't hide virtual method. Task-number: QTBUG-20994 Change-Id: Iaeeb23ed758ef52e0a3a61c4310aafec383e8a28 Reviewed-by: Yann Bodson --- src/quick/util/qdeclarativeanimation.cpp | 4 ++-- src/quick/util/qdeclarativeanimation_p.h | 8 ++++---- .../tst_qdeclarativeanimations.cpp | 18 +++++++++--------- .../tst_qdeclarativesmoothedanimation.cpp | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/quick/util/qdeclarativeanimation.cpp b/src/quick/util/qdeclarativeanimation.cpp index 9f6421b..ad86c56 100644 --- a/src/quick/util/qdeclarativeanimation.cpp +++ b/src/quick/util/qdeclarativeanimation.cpp @@ -989,7 +989,7 @@ QObject *QDeclarativePropertyAction::target() const return d->target; } -void QDeclarativePropertyAction::setTarget(QObject *o) +void QDeclarativePropertyAction::setTargetObject(QObject *o) { Q_D(QDeclarativePropertyAction); if (d->target == o) @@ -2208,7 +2208,7 @@ QObject *QDeclarativePropertyAnimation::target() const return d->target; } -void QDeclarativePropertyAnimation::setTarget(QObject *o) +void QDeclarativePropertyAnimation::setTargetObject(QObject *o) { Q_D(QDeclarativePropertyAnimation); if (d->target == o) diff --git a/src/quick/util/qdeclarativeanimation_p.h b/src/quick/util/qdeclarativeanimation_p.h index 5b69c5f..8bd6d4f 100644 --- a/src/quick/util/qdeclarativeanimation_p.h +++ b/src/quick/util/qdeclarativeanimation_p.h @@ -195,7 +195,7 @@ class Q_QUICK_PRIVATE_EXPORT QDeclarativePropertyAction : public QDeclarativeAbs Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativePropertyAction) - Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged) + Q_PROPERTY(QObject *target READ target WRITE setTargetObject NOTIFY targetChanged) Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged) Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged) Q_PROPERTY(QDeclarativeListProperty targets READ targets) @@ -207,7 +207,7 @@ public: virtual ~QDeclarativePropertyAction(); QObject *target() const; - void setTarget(QObject *); + void setTargetObject(QObject *); QString property() const; void setProperty(const QString &); @@ -243,7 +243,7 @@ class Q_QUICK_PRIVATE_EXPORT QDeclarativePropertyAnimation : public QDeclarative Q_PROPERTY(QVariant from READ from WRITE setFrom NOTIFY fromChanged) Q_PROPERTY(QVariant to READ to WRITE setTo NOTIFY toChanged) Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged) - Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged) + Q_PROPERTY(QObject *target READ target WRITE setTargetObject NOTIFY targetChanged) Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged) Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged) Q_PROPERTY(QDeclarativeListProperty targets READ targets) @@ -266,7 +266,7 @@ public: void setEasing(const QEasingCurve &); QObject *target() const; - void setTarget(QObject *); + void setTargetObject(QObject *); QString property() const; void setProperty(const QString &); diff --git a/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp index 5ae6662..c7a0717 100644 --- a/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp +++ b/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp @@ -120,7 +120,7 @@ void tst_qdeclarativeanimations::simpleProperty() { QQuickRectangle rect; QDeclarativePropertyAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("x"); animation.setTo(200); QVERIFY(animation.target() == &rect); @@ -145,7 +145,7 @@ void tst_qdeclarativeanimations::simpleNumber() { QQuickRectangle rect; QDeclarativeNumberAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("x"); animation.setTo(200); QVERIFY(animation.target() == &rect); @@ -170,7 +170,7 @@ void tst_qdeclarativeanimations::simpleColor() { QQuickRectangle rect; QDeclarativeColorAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("color"); animation.setTo(QColor("red")); QVERIFY(animation.target() == &rect); @@ -207,7 +207,7 @@ void tst_qdeclarativeanimations::simpleRotation() { QQuickRectangle rect; QDeclarativeRotationAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("rotation"); animation.setTo(270); QVERIFY(animation.target() == &rect); @@ -555,7 +555,7 @@ void tst_qdeclarativeanimations::alwaysRunToEnd() { QQuickRectangle rect; QDeclarativePropertyAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("x"); animation.setTo(200); animation.setDuration(1000); @@ -575,7 +575,7 @@ void tst_qdeclarativeanimations::complete() { QQuickRectangle rect; QDeclarativePropertyAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("x"); animation.setFrom(1); animation.setTo(200); @@ -596,7 +596,7 @@ void tst_qdeclarativeanimations::resume() { QQuickRectangle rect; QDeclarativePropertyAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("x"); animation.setFrom(10); animation.setTo(200); @@ -623,7 +623,7 @@ void tst_qdeclarativeanimations::dotProperty() { QQuickRectangle rect; QDeclarativeNumberAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("border.width"); animation.setTo(10); animation.start(); @@ -1232,7 +1232,7 @@ void tst_qdeclarativeanimations::alwaysRunToEndRestartBug() { QQuickRectangle rect; QDeclarativePropertyAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("x"); animation.setTo(200); animation.setDuration(1000); diff --git a/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp b/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp index f60955c..3d37517 100644 --- a/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp +++ b/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp @@ -131,7 +131,7 @@ void tst_qdeclarativesmoothedanimation::simpleAnimation() QDeclarativeSmoothedAnimation *animation = obj->findChild("anim"); QVERIFY(animation); - animation->setTarget(rect); + animation->setTargetObject(rect); animation->setProperty("x"); animation->setTo(200); animation->setDuration(250); -- 2.7.4