From: Bradley T. Hughes <bradley.hughes@nokia.com>
Date: Tue, 20 Dec 2011 08:22:20 +0000 (+0100)
Subject: Reimplement QVariantAnimation::updateState() properly
X-Git-Tag: qt-v5.0.0-alpha1~2179
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=103c2e3690d24c454f49a9a888f696fbaf6a3324;p=profile%2Fivi%2Fqtbase.git

Reimplement QVariantAnimation::updateState() properly

The updateState() takes 2 arguments, not 1.

tests/benchmarks/gui/animation/qanimation/dummyanimation.h:54: warning:
'DummyAnimation::updateState' hides overloaded virtual function
[-Woverloaded-virtual]
    void updateState(State state);
         ^
src/corelib/animation/qvariantanimation.h:106: hidden overloaded virtual
function 'QVariantAnimation::updateState' declared here
    void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
         ^

Change-Id: Ieb2e4e0b1f017c51c4fed5bdb874ba30cb056916
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---

diff --git a/tests/benchmarks/gui/animation/qanimation/dummyanimation.cpp b/tests/benchmarks/gui/animation/qanimation/dummyanimation.cpp
index a190a03..fa0c8d1 100644
--- a/tests/benchmarks/gui/animation/qanimation/dummyanimation.cpp
+++ b/tests/benchmarks/gui/animation/qanimation/dummyanimation.cpp
@@ -55,7 +55,8 @@ void DummyAnimation::updateCurrentValue(const QVariant &value)
         m_dummy->setRect(value.toRect());
 }
 
-void DummyAnimation::updateState(State state)
+void DummyAnimation::updateState(State newstate, State oldstate)
 {
-    Q_UNUSED(state);
+    Q_UNUSED(newstate);
+    Q_UNUSED(oldstate);
 }
diff --git a/tests/benchmarks/gui/animation/qanimation/dummyanimation.h b/tests/benchmarks/gui/animation/qanimation/dummyanimation.h
index ecd4e01..87fe6d2 100644
--- a/tests/benchmarks/gui/animation/qanimation/dummyanimation.h
+++ b/tests/benchmarks/gui/animation/qanimation/dummyanimation.h
@@ -51,7 +51,7 @@ public:
     DummyAnimation(DummyObject *d);
 
     void updateCurrentValue(const QVariant &value);
-    void updateState(State state);
+    void updateState(State newstate, State oldstate);
 
 private:
     DummyObject *m_dummy;