Rename Qt Quick-specific classes to QQuick*

[profile/ivi/qtdeclarative.git] / src / declarative / items / qquickanimation_p_p.h

diff --git a/src/declarative/items/qsganimation_p_p.h b/src/declarative/items/qquickanimation_p_p.h
similarity index 72%
rename from src/declarative/items/qsganimation_p_p.h
rename to src/declarative/items/qquickanimation_p_p.h
index 276efc5..de2b6d4 100644 (file)
--- a/src/declarative/items/qsganimation_p_p.h
+++ b/src/declarative/items/qquickanimation_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGANIMATION_P_H
-#define QSGANIMATION_P_H
+#ifndef QQUICKANIMATION_P_H
+#define QQUICKANIMATION_P_H
 
 //
 //  W A R N I N G
@@ -54,53 +54,53 @@
 // We mean it.
 //
 
-#include "qsganimation_p.h"
+#include "qquickanimation_p.h"
 
 #include <private/qdeclarativepath_p.h>
 #include <private/qdeclarativeanimation_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QSGParentAnimationPrivate : public QDeclarativeAnimationGroupPrivate
+class QQuickParentAnimationPrivate : public QDeclarativeAnimationGroupPrivate
 {
-    Q_DECLARE_PUBLIC(QSGParentAnimation)
+    Q_DECLARE_PUBLIC(QQuickParentAnimation)
 public:
-    QSGParentAnimationPrivate()
+    QQuickParentAnimationPrivate()
     : QDeclarativeAnimationGroupPrivate(), target(0), newParent(0),
        via(0), topLevelGroup(0), startAction(0), endAction(0) {}
 
-    QSGItem *target;
-    QSGItem *newParent;
-    QSGItem *via;
+    QQuickItem *target;
+    QQuickItem *newParent;
+    QQuickItem *via;
 
     QSequentialAnimationGroup *topLevelGroup;
     QActionAnimation *startAction;
     QActionAnimation *endAction;
 
-    QPointF computeTransformOrigin(QSGItem::TransformOrigin origin, qreal width, qreal height) const;
+    QPointF computeTransformOrigin(QQuickItem::TransformOrigin origin, qreal width, qreal height) const;
 };
 
-class QSGAnchorAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
+class QQuickAnchorAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
 {
-    Q_DECLARE_PUBLIC(QSGAnchorAnimation)
+    Q_DECLARE_PUBLIC(QQuickAnchorAnimation)
 public:
-    QSGAnchorAnimationPrivate() : rangeIsSet(false), va(0),
+    QQuickAnchorAnimationPrivate() : rangeIsSet(false), va(0),
         interpolator(QVariantAnimationPrivate::getInterpolator(QMetaType::QReal)) {}
 
     bool rangeIsSet;
     QDeclarativeBulkValueAnimator *va;
     QVariantAnimation::Interpolator interpolator;
-    QList<QSGItem*> targets;
+    QList<QQuickItem*> targets;
 };
 
-class QSGPathAnimationUpdater : public QDeclarativeBulkValueUpdater
+class QQuickPathAnimationUpdater : public QDeclarativeBulkValueUpdater
 {
 public:
-    QSGPathAnimationUpdater() : path(0), target(0), reverse(false),
+    QQuickPathAnimationUpdater() : path(0), target(0), reverse(false),
         fromSourced(false), fromDefined(false), toDefined(false),
-        toX(0), toY(0), currentV(0), orientation(QSGPathAnimation::Fixed),
+        toX(0), toY(0), currentV(0), orientation(QQuickPathAnimation::Fixed),
         entryInterval(0), exitInterval(0) {}
-    ~QSGPathAnimationUpdater() {}
+    ~QQuickPathAnimationUpdater() {}
 
         void setValue(qreal v);
 
@@ -111,7 +111,7 @@ public:
     qreal pathLength;
     QList<QDeclarativePath::AttributePoint> attributePoints;
 
-    QSGItem *target;
+    QQuickItem *target;
     bool reverse;
     bool fromSourced;
     bool fromDefined;
@@ -121,7 +121,7 @@ public:
     qreal currentV;
     QDeclarativeNullableValue<qreal> interruptStart;
     //TODO: bundle below into common struct
-    QSGPathAnimation::Orientation orientation;
+    QQuickPathAnimation::Orientation orientation;
     QPointF anchorPoint;
     qreal entryInterval;
     qreal exitInterval;
@@ -129,17 +129,17 @@ public:
     QDeclarativeNullableValue<qreal> startRotation;
 };
 
-class QSGPathAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
+class QQuickPathAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
 {
-    Q_DECLARE_PUBLIC(QSGPathAnimation)
+    Q_DECLARE_PUBLIC(QQuickPathAnimation)
 public:
-    QSGPathAnimationPrivate() : path(0), target(0),
-        rangeIsSet(false), orientation(QSGPathAnimation::Fixed), entryInterval(0), exitInterval(0), pa(0) {}
+    QQuickPathAnimationPrivate() : path(0), target(0),
+        rangeIsSet(false), orientation(QQuickPathAnimation::Fixed), entryInterval(0), exitInterval(0), pa(0) {}
 
     QDeclarativePath *path;
-    QSGItem *target;
+    QQuickItem *target;
     bool rangeIsSet;
-    QSGPathAnimation::Orientation orientation;
+    QQuickPathAnimation::Orientation orientation;
     QPointF anchorPoint;
     qreal entryInterval;
     qreal exitInterval;
@@ -150,4 +150,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSGANIMATION_P_H
+#endif // QQUICKANIMATION_P_H