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/quick/util/qdeclarativesmoothedanimation_p_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/quick/util/qdeclarativesmoothedanimation_p_p.h')
-rw-r--r-- | src/quick/util/qdeclarativesmoothedanimation_p_p.h | 154 |
1 files changed, 0 insertions, 154 deletions
diff --git a/src/quick/util/qdeclarativesmoothedanimation_p_p.h b/src/quick/util/qdeclarativesmoothedanimation_p_p.h deleted file mode 100644 index 9afb6506a7..0000000000 --- a/src/quick/util/qdeclarativesmoothedanimation_p_p.h +++ /dev/null @@ -1,154 +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 QDECLARATIVESMOOTHEDANIMATION2_P_H -#define QDECLARATIVESMOOTHEDANIMATION2_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include "qdeclarativesmoothedanimation_p.h" -#include "qdeclarativeanimation_p.h" - -#include "qdeclarativeanimation_p_p.h" - -#include "private/qparallelanimationgroupjob_p.h" - -#include <private/qobject_p.h> -#include <QBasicTimer> - -QT_BEGIN_NAMESPACE -class QSmoothedAnimation; -class QSmoothedAnimationTimer : public QTimer -{ - Q_OBJECT -public: - explicit QSmoothedAnimationTimer(QSmoothedAnimation *animation, QObject *parent = 0); - ~QSmoothedAnimationTimer(); -public Q_SLOTS: - void stopAnimation(); -private: - QSmoothedAnimation *m_animation; -}; - -class QDeclarativeSmoothedAnimationPrivate; -class Q_AUTOTEST_EXPORT QSmoothedAnimation : public QAbstractAnimationJob -{ - Q_DISABLE_COPY(QSmoothedAnimation) -public: - QSmoothedAnimation(QDeclarativeSmoothedAnimationPrivate * = 0); - - ~QSmoothedAnimation(); - qreal to; - qreal velocity; - int userDuration; - - int maximumEasingTime; - QDeclarativeSmoothedAnimation::ReversingMode reversingMode; - - qreal initialVelocity; - qreal trackVelocity; - - QDeclarativeProperty target; - - int duration() const; - void restart(); - void init(); - - void prepareForRestart(); - void clearTemplate() { animationTemplate = 0; } - -protected: - virtual void updateCurrentTime(int); - virtual void updateState(QAbstractAnimationJob::State, QAbstractAnimationJob::State); - -private: - qreal easeFollow(qreal); - qreal initialValue; - - bool invert; - - int finalDuration; - - // Parameters for use in updateCurrentTime() - qreal a; // Acceleration - qreal d; // Deceleration - qreal tf; // Total time - qreal tp; // Time at which peak velocity occurs - qreal td; // Time at which deceleration begins - qreal vp; // Velocity at tp - qreal sp; // Displacement at tp - qreal sd; // Displacement at td - qreal vi; // "Normalized" initialvelocity - qreal s; // Total s - - int lastTime; - bool useDelta; - - bool recalc(); - void delayedStop(); - QSmoothedAnimationTimer *delayedStopTimer; - QDeclarativeSmoothedAnimationPrivate *animationTemplate; -}; - -class QDeclarativeSmoothedAnimationPrivate : public QDeclarativePropertyAnimationPrivate -{ - Q_DECLARE_PUBLIC(QDeclarativeSmoothedAnimation) -public: - QDeclarativeSmoothedAnimationPrivate(); - ~QDeclarativeSmoothedAnimationPrivate(); - void updateRunningAnimations(); - - QSmoothedAnimation *anim; - QHash<QDeclarativeProperty, QSmoothedAnimation*> activeAnimations; -}; - -QT_END_NAMESPACE - -#endif // QDECLARATIVESMOOTHEDANIMATION2_P_H |