}
}
-void QAbstractAnimationJob::addAnimationChangeListener(QAnimation2ChangeListener *listener, QAbstractAnimationJob::ChangeTypes changes)
+void QAbstractAnimationJob::addAnimationChangeListener(QAnimationJobChangeListener *listener, QAbstractAnimationJob::ChangeTypes changes)
{
changeListeners.append(ChangeListener(listener, changes));
}
-void QAbstractAnimationJob::removeAnimationChangeListener(QAnimation2ChangeListener *listener, QAbstractAnimationJob::ChangeTypes changes)
+void QAbstractAnimationJob::removeAnimationChangeListener(QAnimationJobChangeListener *listener, QAbstractAnimationJob::ChangeTypes changes)
{
changeListeners.removeOne(ChangeListener(listener, changes));
}
QT_MODULE(Declarative)
class QAnimationGroupJob;
-class QAnimation2ChangeListener;
+class QAnimationJobChangeListener;
class Q_DECLARATIVE_EXPORT QAbstractAnimationJob
{
Q_DISABLE_COPY(QAbstractAnimationJob)
};
Q_DECLARE_FLAGS(ChangeTypes, ChangeType)
- void addAnimationChangeListener(QAnimation2ChangeListener *listener, QAbstractAnimationJob::ChangeTypes);
- void removeAnimationChangeListener(QAnimation2ChangeListener *listener, QAbstractAnimationJob::ChangeTypes);
+ void addAnimationChangeListener(QAnimationJobChangeListener *listener, QAbstractAnimationJob::ChangeTypes);
+ void removeAnimationChangeListener(QAnimationJobChangeListener *listener, QAbstractAnimationJob::ChangeTypes);
QAbstractAnimationJob *nextSibling() const { return m_nextSibling; }
QAbstractAnimationJob *previousSibling() const { return m_previousSibling; }
bool *m_wasDeleted;
struct ChangeListener {
- ChangeListener(QAnimation2ChangeListener *l, QAbstractAnimationJob::ChangeTypes t) : listener(l), types(t) {}
- QAnimation2ChangeListener *listener;
+ ChangeListener(QAnimationJobChangeListener *l, QAbstractAnimationJob::ChangeTypes t) : listener(l), types(t) {}
+ QAnimationJobChangeListener *listener;
QAbstractAnimationJob::ChangeTypes types;
bool operator==(const ChangeListener &other) const { return listener == other.listener && types == other.types; }
};
friend class QAnimationGroupJob;
};
-class Q_AUTOTEST_EXPORT QAnimation2ChangeListener
+class Q_AUTOTEST_EXPORT QAnimationJobChangeListener
{
public:
virtual void animationFinished(QAbstractAnimationJob *) {}
T *m_instance;
};
-class QDeclarativeAbstractAnimationPrivate : public QObjectPrivate, public QAnimation2ChangeListener
+class QDeclarativeAbstractAnimationPrivate : public QObjectPrivate, public QAnimationJobChangeListener
{
Q_DECLARE_PUBLIC(QDeclarativeAbstractAnimation)
public:
QT_BEGIN_NAMESPACE
-class QDeclarativeBehaviorPrivate : public QObjectPrivate, public QAnimation2ChangeListener
+class QDeclarativeBehaviorPrivate : public QObjectPrivate, public QAnimationJobChangeListener
{
Q_DECLARE_PUBLIC(QDeclarativeBehavior)
public:
-class QDeclarativeTimerPrivate : public QObjectPrivate, public QAnimation2ChangeListener
+class QDeclarativeTimerPrivate : public QObjectPrivate, public QAnimationJobChangeListener
{
Q_DECLARE_PUBLIC(QDeclarativeTimer)
public:
int id;
};
-class StateChangeListener: public QAnimation2ChangeListener
+class StateChangeListener: public QAnimationJobChangeListener
{
public:
virtual void animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State newState, QAbstractAnimationJob::State)
int id;
};
-class StateChangeListener: public QAnimation2ChangeListener
+class StateChangeListener: public QAnimationJobChangeListener
{
public:
virtual void animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State newState, QAbstractAnimationJob::State)
QList<QAbstractAnimationJob::State> states;
};
-class FinishedListener: public QAnimation2ChangeListener
+class FinishedListener: public QAnimationJobChangeListener
{
public:
FinishedListener() : m_count(0) {}
}
};
-class StateChangeListener: public QAnimation2ChangeListener
+class StateChangeListener: public QAnimationJobChangeListener
{
public:
virtual void animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State newState, QAbstractAnimationJob::State)
QList<QAbstractAnimationJob::State> states;
};
-class FinishedListener: public QAnimation2ChangeListener
+class FinishedListener: public QAnimationJobChangeListener
{
public:
FinishedListener() : m_count(0) {}
group.appendAnimation(new TestAnimation);
}
-class ClearFinishedListener: public QAnimation2ChangeListener
+class ClearFinishedListener: public QAnimationJobChangeListener
{
public:
ClearFinishedListener(QSequentialAnimationGroupJob *g) : group(g) {}
QSequentialAnimationGroupJob *group;
};
-class RefillFinishedListener: public QAnimation2ChangeListener
+class RefillFinishedListener: public QAnimationJobChangeListener
{
public:
RefillFinishedListener(QSequentialAnimationGroupJob *g) : group(g) {}