From b855240b782395f94315f43ea3e7e182299fac48 Mon Sep 17 00:00:00 2001 From: Matthew Vogt Date: Thu, 16 Feb 2012 14:43:03 +1000 Subject: Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones --- .../animations/qabstractanimationjob_p.h | 232 --------------------- 1 file changed, 232 deletions(-) delete mode 100644 src/declarative/animations/qabstractanimationjob_p.h (limited to 'src/declarative/animations/qabstractanimationjob_p.h') diff --git a/src/declarative/animations/qabstractanimationjob_p.h b/src/declarative/animations/qabstractanimationjob_p.h deleted file mode 100644 index 675082f0b7..0000000000 --- a/src/declarative/animations/qabstractanimationjob_p.h +++ /dev/null @@ -1,232 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QABSTRACTANIMATIONJOB_P_H -#define QABSTRACTANIMATIONJOB_P_H - -#include -#include -#include "private/qpodvector_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Declarative) - -class QAnimationGroupJob; -class QAnimationJobChangeListener; -class Q_DECLARATIVE_EXPORT QAbstractAnimationJob -{ - Q_DISABLE_COPY(QAbstractAnimationJob) -public: - enum Direction { - Forward, - Backward - }; - - enum State { - Stopped, - Paused, - Running - }; - - QAbstractAnimationJob(); - virtual ~QAbstractAnimationJob(); - - //definition - inline QAnimationGroupJob *group() const {return m_group;} - - inline int loopCount() const {return m_loopCount;} - void setLoopCount(int loopCount); - - int totalDuration() const; - virtual int duration() const {return 0;} - - inline QAbstractAnimationJob::Direction direction() const {return m_direction;} - void setDirection(QAbstractAnimationJob::Direction direction); - - //state - inline int currentTime() const {return m_totalCurrentTime;} - inline int currentLoopTime() const {return m_currentTime;} - inline int currentLoop() const {return m_currentLoop;} - inline QAbstractAnimationJob::State state() const {return m_state;} - inline bool isRunning() { return m_state == Running; } - inline bool isStopped() { return m_state == Stopped; } - inline bool isPaused() { return m_state == Paused; } - - void setCurrentTime(int msecs); - - void start(); - void pause(); - void resume(); - void stop(); - - enum ChangeType { - Completion = 0x01, - StateChange = 0x02, - CurrentLoop = 0x04 - }; - Q_DECLARE_FLAGS(ChangeTypes, ChangeType) - - void addAnimationChangeListener(QAnimationJobChangeListener *listener, QAbstractAnimationJob::ChangeTypes); - void removeAnimationChangeListener(QAnimationJobChangeListener *listener, QAbstractAnimationJob::ChangeTypes); - - QAbstractAnimationJob *nextSibling() const { return m_nextSibling; } - QAbstractAnimationJob *previousSibling() const { return m_previousSibling; } - -protected: - virtual void updateCurrentTime(int) {} - virtual void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState); - virtual void updateDirection(QAbstractAnimationJob::Direction direction); - virtual void topLevelAnimationLoopChanged() {} - - void setState(QAbstractAnimationJob::State state); - - void finished(); - void stateChanged(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState); - void currentLoopChanged(int currentLoop); - void directionChanged(QAbstractAnimationJob::Direction); - - //definition - bool m_isPause; - bool m_isGroup; - int m_loopCount; - QAnimationGroupJob *m_group; - QAbstractAnimationJob::Direction m_direction; - - //state - QAbstractAnimationJob::State m_state; - int m_totalCurrentTime; - int m_currentTime; - int m_currentLoop; - bool m_hasRegisteredTimer; - //records the finish time for an uncontrolled animation (used by animation groups) - int m_uncontrolledFinishTime; - bool *m_wasDeleted; - - struct ChangeListener { - 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; } - }; - QPODVector changeListeners; - - QAbstractAnimationJob *m_nextSibling; - QAbstractAnimationJob *m_previousSibling; - - friend class QDeclarativeAnimationTimer; - friend class QAnimationGroupJob; -}; - -class Q_AUTOTEST_EXPORT QAnimationJobChangeListener -{ -public: - virtual void animationFinished(QAbstractAnimationJob *) {} - virtual void animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State, QAbstractAnimationJob::State) {} - virtual void animationCurrentLoopChanged(QAbstractAnimationJob *) {} -}; - -class Q_DECLARATIVE_EXPORT QDeclarativeAnimationTimer : public QAbstractAnimationTimer -{ - Q_OBJECT -private: - QDeclarativeAnimationTimer(); - -public: - static QDeclarativeAnimationTimer *instance(); - static QDeclarativeAnimationTimer *instance(bool create); - - static void registerAnimation(QAbstractAnimationJob *animation, bool isTopLevel); - static void unregisterAnimation(QAbstractAnimationJob *animation); - - /* - this is used for updating the currentTime of all animations in case the pause - timer is active or, otherwise, only of the animation passed as parameter. - */ - static void ensureTimerUpdate(); - - /* - this will evaluate the need of restarting the pause timer in case there is still - some pause animations running. - */ - static void updateAnimationTimer(); - - void restartAnimationTimer(); - void updateAnimationsTime(qint64 timeStep); - - int currentDelta() { return lastDelta; } - - //useful for profiling/debugging - int runningAnimationCount() { return animations.count(); } - -private Q_SLOTS: - void startAnimations(); - void stopTimer(); - -private: - qint64 lastTick; - int lastDelta; - int currentAnimationIdx; - bool insideTick; - bool startAnimationPending; - bool stopTimerPending; - - QList animations, animationsToStart; - - // this is the count of running animations that are not a group neither a pause animation - int runningLeafAnimations; - QList runningPauseAnimations; - - void registerRunningAnimation(QAbstractAnimationJob *animation); - void unregisterRunningAnimation(QAbstractAnimationJob *animation); - - int closestPauseAnimationTimeToFinish(); -}; - -Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractAnimationJob::ChangeTypes) - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QABSTRACTANIMATIONJOB_P_H -- cgit v1.2.3