1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reimplement QVariantAnimation::updateState() properly

Browse Source 
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>
This commit is contained in:
Bradley T. Hughes 2011-12-20 09:22:20 +01:00 committed by Qt by Nokia
parent 58170cea15
commit 103c2e3690
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/benchmarks/gui/animation/qanimation/dummyanimation.cpp
View File

@ -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);
}

2
tests/benchmarks/gui/animation/qanimation/dummyanimation.h
View File

@ -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;