From 703b4a0e20b2eae982ea48e075db480da9851a9a Mon Sep 17 00:00:00 2001
From: Charles Yin <charles.yin@nokia.com>
Date: Tue, 13 Mar 2012 13:12:09 +1000
Subject: Move variant animation interpolators from QtWidgets to QtGui

There is no reason these interpolators need to stay in QtWidgets library.

Change-Id: I27db49fea2cfd8f0ef417dc52edf66dd1835e7a1
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---
 src/gui/animation/animation.pri            |  2 +
 src/gui/animation/qguivariantanimation.cpp | 95 ++++++++++++++++++++++++++++++
 src/gui/gui.pro                            |  3 +-
 3 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 src/gui/animation/animation.pri
 create mode 100644 src/gui/animation/qguivariantanimation.cpp

(limited to 'src/gui')

diff --git a/src/gui/animation/animation.pri b/src/gui/animation/animation.pri
new file mode 100644
index 0000000000..add9ae7119
--- /dev/null
+++ b/src/gui/animation/animation.pri
@@ -0,0 +1,2 @@
+SOURCES += \
+        animation/qguivariantanimation.cpp
diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp
new file mode 100644
index 0000000000..c344a18b8a
--- /dev/null
+++ b/src/gui/animation/qguivariantanimation.cpp
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtGui 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$
+**
+****************************************************************************/
+#include <QtCore/qvariantanimation.h>
+#include <private/qvariantanimation_p.h>
+
+#ifndef QT_NO_ANIMATION
+
+#include <QtGui/qcolor.h>
+#include <QtGui/qvector2d.h>
+#include <QtGui/qvector3d.h>
+#include <QtGui/qvector4d.h>
+#include <QtGui/qquaternion.h>
+
+QT_BEGIN_NAMESPACE
+
+template<> Q_INLINE_TEMPLATE QColor _q_interpolate(const QColor &f,const QColor &t, qreal progress)
+{
+    return QColor(qBound(0,_q_interpolate(f.red(), t.red(), progress),255),
+                  qBound(0,_q_interpolate(f.green(), t.green(), progress),255),
+                  qBound(0,_q_interpolate(f.blue(), t.blue(), progress),255),
+                  qBound(0,_q_interpolate(f.alpha(), t.alpha(), progress),255));
+}
+
+template<> Q_INLINE_TEMPLATE QQuaternion _q_interpolate(const QQuaternion &f,const QQuaternion &t, qreal progress)
+{
+    return QQuaternion::slerp(f, t, progress);
+}
+
+static void qRegisterGuiGetInterpolator()
+{
+    qRegisterAnimationInterpolator<QColor>(_q_interpolateVariant<QColor>);
+    qRegisterAnimationInterpolator<QVector2D>(_q_interpolateVariant<QVector2D>);
+    qRegisterAnimationInterpolator<QVector3D>(_q_interpolateVariant<QVector3D>);
+    qRegisterAnimationInterpolator<QVector4D>(_q_interpolateVariant<QVector4D>);
+    qRegisterAnimationInterpolator<QQuaternion>(_q_interpolateVariant<QQuaternion>);
+}
+Q_CONSTRUCTOR_FUNCTION(qRegisterGuiGetInterpolator)
+
+static void qUnregisterGuiGetInterpolator()
+{
+    // casts required by Sun CC 5.5
+    qRegisterAnimationInterpolator<QColor>(
+        (QVariant (*)(const QColor &, const QColor &, qreal))0);
+    qRegisterAnimationInterpolator<QVector2D>(
+        (QVariant (*)(const QVector2D &, const QVector2D &, qreal))0);
+    qRegisterAnimationInterpolator<QVector3D>(
+        (QVariant (*)(const QVector3D &, const QVector3D &, qreal))0);
+    qRegisterAnimationInterpolator<QVector4D>(
+        (QVariant (*)(const QVector4D &, const QVector4D &, qreal))0);
+    qRegisterAnimationInterpolator<QQuaternion>(
+        (QVariant (*)(const QQuaternion &, const QQuaternion &, qreal))0);
+}
+Q_DESTRUCTOR_FUNCTION(qUnregisterGuiGetInterpolator)
+
+QT_END_NAMESPACE
+
+#endif //QT_NO_ANIMATION
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 2cee31fce1..e6a820b5c4 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -31,6 +31,7 @@ include(painting/painting.pri)
 include(util/util.pri)
 include(math3d/math3d.pri)
 include(opengl/opengl.pri)
+include(animation/animation.pri)
 
 QMAKE_LIBS += $$QMAKE_LIBS_GUI
 
@@ -150,4 +151,4 @@ win32:!contains(QT_CONFIG, directwrite) {
         sse2: SOURCES += $$SSE2_SOURCES
         ssse3: SOURCES += $$SSSE3_SOURCES
         iwmmxt: SOURCES += $$IWMMXT_SOURCES
-    }
+    }
\ No newline at end of file
-- 
cgit v1.2.3