summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2011-12-20 09:22:20 +0100
committerQt by Nokia <qt-info@nokia.com>2011-12-21 20:32:31 +0100
commit103c2e3690d24c454f49a9a888f696fbaf6a3324 (patch)
tree8e12a716a96e9e46120481bb4fe9e55dddad0a4b /tests/benchmarks
parent58170cea15f5b39d3802df036c90fee63886b9b3 (diff)
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>
Diffstat (limited to 'tests/benchmarks')
-rw-r--r--tests/benchmarks/gui/animation/qanimation/dummyanimation.cpp5
-rw-r--r--tests/benchmarks/gui/animation/qanimation/dummyanimation.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/benchmarks/gui/animation/qanimation/dummyanimation.cpp b/tests/benchmarks/gui/animation/qanimation/dummyanimation.cpp
index a190a0337a..fa0c8d16ce 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 ecd4e0189e..87fe6d2537 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;