Removing QT_EXPERIMENTAL_SOLUTION from the animation api

13 files changed, 10 insertions, 84 deletions

diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index f5b9323..759cf18 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -352,42 +352,22 @@ void QAbstractAnimationPrivate::setState(QAbstractAnimation::State newState)
 
     \sa QVariantAnimation, QAnimationGroup
 */
-#ifdef QT_EXPERIMENTAL_SOLUTION
-QAbstractAnimation::QAbstractAnimation(QObject *parent)
-    : d_ptr(new QAbstractAnimationPrivate)
-{
-    // Allow auto-add on reparent
-    setParent(parent);
-    d_ptr->q_ptr = this;
-}
-#else
 QAbstractAnimation::QAbstractAnimation(QObject *parent)
     : QObject(*new QAbstractAnimationPrivate, 0)
 {
     // Allow auto-add on reparent
     setParent(parent);
 }
-#endif
 
 /*!
     \internal
 */
-#ifdef QT_EXPERIMENTAL_SOLUTION
-QAbstractAnimation::QAbstractAnimation(QAbstractAnimationPrivate &dd, QObject *parent)
-    : d_ptr(&dd)
-{
-    // Allow auto-add on reparent
-   setParent(parent);
-   d_ptr->q_ptr = this;
-}
-#else
 QAbstractAnimation::QAbstractAnimation(QAbstractAnimationPrivate &dd, QObject *parent)
     : QObject(dd, 0)
 {
     // Allow auto-add on reparent
    setParent(parent);
 }
-#endif
 
 /*!
     Stops the animation if it's running, then destroys the
diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h
index a7f0082..d6d50dc 100644
--- a/src/corelib/animation/qabstractanimation.h
+++ b/src/corelib/animation/qabstractanimation.h
@@ -123,10 +123,6 @@ protected:
     virtual void updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState);
     virtual void updateDirection(QAbstractAnimation::Direction direction);
 
-#ifdef QT_EXPERIMENTAL_SOLUTION
-     QAbstractAnimationPrivate *d_ptr;
-#endif
-
 private:
     Q_DISABLE_COPY(QAbstractAnimation)
     Q_DECLARE_PRIVATE(QAbstractAnimation)
diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h
index 41983a5..e64554c 100644
--- a/src/corelib/animation/qabstractanimation_p.h
+++ b/src/corelib/animation/qabstractanimation_p.h
@@ -56,19 +56,13 @@
 #include <QtCore/qbasictimer.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qtimer.h>
-#ifndef QT_EXPERIMENTAL_SOLUTION
 #include <private/qobject_p.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 
 class QAnimationGroup;
 class QAbstractAnimation;
-#ifdef QT_EXPERIMENTAL_SOLUTION
-class QAbstractAnimationPrivate
-#else
 class QAbstractAnimationPrivate : public QObjectPrivate
-#endif
 {
 public:
     QAbstractAnimationPrivate()
@@ -101,9 +95,6 @@ public:
     int currentLoop;
 
     QAnimationGroup *group;
-#ifdef QT_EXPERIMENTAL_SOLUTION
-    QAbstractAnimation *q_ptr;
-#endif
 
 private:
     Q_DECLARE_PUBLIC(QAbstractAnimation)
diff --git a/src/corelib/animation/qanimationgroup.h b/src/corelib/animation/qanimationgroup.h
index 7dee070..263bc38 100644
--- a/src/corelib/animation/qanimationgroup.h
+++ b/src/corelib/animation/qanimationgroup.h
@@ -42,11 +42,7 @@
 #ifndef QANIMATIONGROUP_H
 #define QANIMATIONGROUP_H
 
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qabstractanimation.h"
-#else
-# include <QtCore/qabstractanimation.h>
-#endif
+#include <QtCore/qabstractanimation.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/corelib/animation/qparallelanimationgroup.h b/src/corelib/animation/qparallelanimationgroup.h
index 48d66a3..57a8146 100644
--- a/src/corelib/animation/qparallelanimationgroup.h
+++ b/src/corelib/animation/qparallelanimationgroup.h
@@ -42,11 +42,7 @@
 #ifndef QPARALLELANIMATIONGROUP_H
 #define QPARALLELANIMATIONGROUP_H
 
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qanimationgroup.h"
-#else
-# include <QtCore/qanimationgroup.h>
-#endif
+#include <QtCore/qanimationgroup.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/corelib/animation/qpauseanimation.h b/src/corelib/animation/qpauseanimation.h
index 595f2d0..cb6e041 100644
--- a/src/corelib/animation/qpauseanimation.h
+++ b/src/corelib/animation/qpauseanimation.h
@@ -42,11 +42,7 @@
 #ifndef QPAUSEANIMATION_P_H
 #define QPAUSEANIMATION_P_H
 
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qanimationgroup.h"
-#else
-# include <QtCore/qanimationgroup.h>
-#endif
+#include <QtCore/qanimationgroup.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/corelib/animation/qpropertyanimation.h b/src/corelib/animation/qpropertyanimation.h
index b619256..dbd118c 100644
--- a/src/corelib/animation/qpropertyanimation.h
+++ b/src/corelib/animation/qpropertyanimation.h
@@ -42,11 +42,7 @@
 #ifndef QPROPERTYANIMATION_H
 #define QPROPERTYANIMATION_H
 
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qvariantanimation.h"
-#else
-# include <QtCore/qvariantanimation.h>
-#endif
+#include <QtCore/qvariantanimation.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/corelib/animation/qsequentialanimationgroup.h b/src/corelib/animation/qsequentialanimationgroup.h
index 4c52d1b..4701a76 100644
--- a/src/corelib/animation/qsequentialanimationgroup.h
+++ b/src/corelib/animation/qsequentialanimationgroup.h
@@ -42,11 +42,7 @@
 #ifndef QSEQUENTIALANIMATIONGROUP_H
 #define QSEQUENTIALANIMATIONGROUP_H
 
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qanimationgroup.h"
-#else
-# include <QtCore/qanimationgroup.h>
-#endif
+#include <QtCore/qanimationgroup.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index 8ac8ca1..864575a 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -230,10 +230,7 @@ void QVariantAnimationPrivate::setCurrentValueForProgress(const qreal progress)
                                    localProgress);
     qSwap(currentValue, ret);
     q->updateCurrentValue(currentValue);
-#ifndef QT_EXPERIMENTAL_SOLUTION
-        if (connectedSignals & changedSignalMask)
-#endif
-    if (currentValue != ret) {
+    if ((connectedSignals & changedSignalMask) && currentValue != ret) {
         //the value has changed
         emit q->valueChanged(currentValue);
     }
diff --git a/src/corelib/animation/qvariantanimation.h b/src/corelib/animation/qvariantanimation.h
index 69dbbf3..5b90930 100644
--- a/src/corelib/animation/qvariantanimation.h
+++ b/src/corelib/animation/qvariantanimation.h
@@ -42,13 +42,8 @@
 #ifndef QANIMATION_H
 #define QANIMATION_H
 
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qabstractanimation.h"
-# include "qeasingcurve.h"
-#else
-# include <QtCore/qeasingcurve.h>
-# include <QtCore/qabstractanimation.h>
-#endif
+#include <QtCore/qeasingcurve.h>
+#include <QtCore/qabstractanimation.h>
 #include <QtCore/qvector.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qpair.h>
diff --git a/src/corelib/animation/qvariantanimation_p.h b/src/corelib/animation/qvariantanimation_p.h
index 8b2915b..e0b9c51 100644
--- a/src/corelib/animation/qvariantanimation_p.h
+++ b/src/corelib/animation/qvariantanimation_p.h
@@ -54,11 +54,7 @@
 //
 
 #include "qvariantanimation.h"
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qeasingcurve.h"
-#else
-# include <QtCore/qeasingcurve.h>
-#endif
+#include <QtCore/qeasingcurve.h>
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qvector.h>
 
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index 9ef9149..23eb2a6 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -340,11 +340,7 @@ bool QEasingCurveFunction::operator==(const QEasingCurveFunction& other)
            _o == other._o;
 }
 
-#ifdef QT_EXPERIMENTAL_SOLUTION
-# include "easing.cpp"
-#else
-# include "../3rdparty/easing/easing.cpp"
-#endif
+#include "../3rdparty/easing/easing.cpp"
 
 class QEasingCurvePrivate
 {
diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp
index ed18caa..37ca6a1 100644
--- a/src/gui/animation/qguivariantanimation.cpp
+++ b/src/gui/animation/qguivariantanimation.cpp
@@ -41,13 +41,8 @@
 
 #ifndef QT_NO_ANIMATION
 
-#ifdef QT_EXPERIMENTAL_SOLUTION
-# include "qvariantanimation.h"
-# include "qvariantanimation_p.h"
-#else
 #include <QtCore/qvariantanimation.h>
 #include <private/qvariantanimation_p.h>
-#endif
 
 #include <QtGui/qcolor.h>