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 --- src/quick/util/qquicksmoothedanimation_p_p.h | 154 +++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 src/quick/util/qquicksmoothedanimation_p_p.h (limited to 'src/quick/util/qquicksmoothedanimation_p_p.h') diff --git a/src/quick/util/qquicksmoothedanimation_p_p.h b/src/quick/util/qquicksmoothedanimation_p_p.h new file mode 100644 index 0000000000..8112aa2885 --- /dev/null +++ b/src/quick/util/qquicksmoothedanimation_p_p.h @@ -0,0 +1,154 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtQml 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 QQUICKSMOOTHEDANIMATION2_P_H +#define QQUICKSMOOTHEDANIMATION2_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 "qquicksmoothedanimation_p.h" +#include "qquickanimation_p.h" + +#include "qquickanimation_p_p.h" + +#include "private/qparallelanimationgroupjob_p.h" + +#include +#include + +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 QQuickSmoothedAnimationPrivate; +class Q_AUTOTEST_EXPORT QSmoothedAnimation : public QAbstractAnimationJob +{ + Q_DISABLE_COPY(QSmoothedAnimation) +public: + QSmoothedAnimation(QQuickSmoothedAnimationPrivate * = 0); + + ~QSmoothedAnimation(); + qreal to; + qreal velocity; + int userDuration; + + int maximumEasingTime; + QQuickSmoothedAnimation::ReversingMode reversingMode; + + qreal initialVelocity; + qreal trackVelocity; + + QQmlProperty 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; + QQuickSmoothedAnimationPrivate *animationTemplate; +}; + +class QQuickSmoothedAnimationPrivate : public QQuickPropertyAnimationPrivate +{ + Q_DECLARE_PUBLIC(QQuickSmoothedAnimation) +public: + QQuickSmoothedAnimationPrivate(); + ~QQuickSmoothedAnimationPrivate(); + void updateRunningAnimations(); + + QSmoothedAnimation *anim; + QHash activeAnimations; +}; + +QT_END_NAMESPACE + +#endif // QQUICKSMOOTHEDANIMATION2_P_H -- cgit v1.2.3