diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/declarative/animations/qanimationgroupjob_p.h | |
parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) |
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 <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/animations/qanimationgroupjob_p.h')
-rw-r--r-- | src/declarative/animations/qanimationgroupjob_p.h | 93 |
1 files changed, 0 insertions, 93 deletions
diff --git a/src/declarative/animations/qanimationgroupjob_p.h b/src/declarative/animations/qanimationgroupjob_p.h deleted file mode 100644 index d1917a5249..0000000000 --- a/src/declarative/animations/qanimationgroupjob_p.h +++ /dev/null @@ -1,93 +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 QANIMATIONGROUPJOB_P_H -#define QANIMATIONGROUPJOB_P_H - -#include "private/qabstractanimationjob_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Declarative) - -class Q_DECLARATIVE_EXPORT QAnimationGroupJob : public QAbstractAnimationJob -{ - Q_DISABLE_COPY(QAnimationGroupJob) -public: - QAnimationGroupJob(); - ~QAnimationGroupJob(); - - void appendAnimation(QAbstractAnimationJob *animation); - void prependAnimation(QAbstractAnimationJob *animation); - void removeAnimation(QAbstractAnimationJob *animation); - - QAbstractAnimationJob *firstChild() const { return m_firstChild; } - QAbstractAnimationJob *lastChild() const { return m_lastChild; } - - void clear(); - - //called by QAbstractAnimationJob - virtual void uncontrolledAnimationFinished(QAbstractAnimationJob *animation); -protected: - void topLevelAnimationLoopChanged(); - - virtual void animationInserted(QAbstractAnimationJob*) { } - virtual void animationRemoved(QAbstractAnimationJob*, QAbstractAnimationJob*, QAbstractAnimationJob*); - - //TODO: confirm location of these (should any be moved into QAbstractAnimationJob?) - void resetUncontrolledAnimationsFinishTime(); - void resetUncontrolledAnimationFinishTime(QAbstractAnimationJob *anim); - int uncontrolledAnimationFinishTime(QAbstractAnimationJob *anim) const { return anim->m_uncontrolledFinishTime; } - void setUncontrolledAnimationFinishTime(QAbstractAnimationJob *anim, int time); - -private: - //definition - QAbstractAnimationJob *m_firstChild; - QAbstractAnimationJob *m_lastChild; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif //QANIMATIONGROUPJOB_P_H |