Rename Qt Quick-specific classes to QQuick*

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

diff --git a/src/declarative/items/qsgpositioners_p.h b/src/declarative/items/qquickpositioners_p.h
similarity index 80%
rename from src/declarative/items/qsgpositioners_p.h
rename to src/declarative/items/qquickpositioners_p.h
index f871125..b8e8879 100644 (file)
--- a/src/declarative/items/qsgpositioners_p.h
+++ b/src/declarative/items/qquickpositioners_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGPOSITIONERS_P_H
-#define QSGPOSITIONERS_P_H
+#ifndef QQUICKPOSITIONERS_P_H
+#define QQUICKPOSITIONERS_P_H
 
-#include "qsgimplicitsizeitem_p.h"
+#include "qquickimplicitsizeitem_p.h"
 
 #include <private/qdeclarativestate_p.h>
 #include <private/qpodvector_p.h>
@@ -57,14 +57,14 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGBasePositionerPrivate;
+class QQuickBasePositionerPrivate;
 
-class QSGPositionerAttached : public QObject
+class QQuickPositionerAttached : public QObject
 {
     Q_OBJECT
 
 public:
-    QSGPositionerAttached(QObject *parent);
+    QQuickPositionerAttached(QObject *parent);
 
     Q_PROPERTY(int index READ index NOTIFY indexChanged)
     Q_PROPERTY(bool isFirstItem READ isFirstItem NOTIFY isFirstItemChanged)
@@ -90,7 +90,7 @@ private:
     bool m_isLastItem;
 };
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QSGBasePositioner : public QSGImplicitSizeItem
+class Q_DECLARATIVE_PRIVATE_EXPORT QQuickBasePositioner : public QQuickImplicitSizeItem
 {
     Q_OBJECT
 
@@ -99,8 +99,8 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QSGBasePositioner : public QSGImplicitSizeIte
     Q_PROPERTY(QDeclarativeTransition *add READ add WRITE setAdd NOTIFY addChanged)
 public:
     enum PositionerType { None = 0x0, Horizontal = 0x1, Vertical = 0x2, Both = 0x3 };
-    QSGBasePositioner(PositionerType, QSGItem *parent);
-    ~QSGBasePositioner();
+    QQuickBasePositioner(PositionerType, QQuickItem *parent);
+    ~QQuickBasePositioner();
 
     int spacing() const;
     void setSpacing(int);
@@ -111,12 +111,12 @@ public:
     QDeclarativeTransition *add() const;
     void setAdd(QDeclarativeTransition *);
 
-    static QSGPositionerAttached *qmlAttachedProperties(QObject *obj);
+    static QQuickPositionerAttached *qmlAttachedProperties(QObject *obj);
 
-    void updateAttachedProperties(QSGPositionerAttached *specificProperty = 0, QSGItem *specificPropertyOwner = 0) const;
+    void updateAttachedProperties(QQuickPositionerAttached *specificProperty = 0, QQuickItem *specificPropertyOwner = 0) const;
 
 protected:
-    QSGBasePositioner(QSGBasePositionerPrivate &dd, PositionerType at, QSGItem *parent);
+    QQuickBasePositioner(QQuickBasePositionerPrivate &dd, PositionerType at, QQuickItem *parent);
     virtual void componentComplete();
     virtual void itemChange(ItemChange, const ItemChangeData &);
     void finishApplyTransitions();
@@ -136,9 +136,9 @@ protected:
     virtual void reportConflictingAnchors()=0;
     class PositionedItem {
     public :
-        PositionedItem(QSGItem *i) : item(i), isNew(false), isVisible(true) {}
+        PositionedItem(QQuickItem *i) : item(i), isNew(false), isVisible(true) {}
         bool operator==(const PositionedItem &other) const { return other.item == item; }
-        QSGItem *item;
+        QQuickItem *item;
         bool isNew;
         bool isVisible;
     };
@@ -148,30 +148,30 @@ protected:
     void positionY(int,const PositionedItem &target);
 
 private:
-    Q_DISABLE_COPY(QSGBasePositioner)
-    Q_DECLARE_PRIVATE(QSGBasePositioner)
+    Q_DISABLE_COPY(QQuickBasePositioner)
+    Q_DECLARE_PRIVATE(QQuickBasePositioner)
 };
 
-class Q_AUTOTEST_EXPORT QSGColumn : public QSGBasePositioner
+class Q_AUTOTEST_EXPORT QQuickColumn : public QQuickBasePositioner
 {
     Q_OBJECT
 public:
-    QSGColumn(QSGItem *parent=0);
+    QQuickColumn(QQuickItem *parent=0);
 
 protected:
     virtual void doPositioning(QSizeF *contentSize);
     virtual void reportConflictingAnchors();
 private:
-    Q_DISABLE_COPY(QSGColumn)
+    Q_DISABLE_COPY(QQuickColumn)
 };
 
-class Q_AUTOTEST_EXPORT QSGRow: public QSGBasePositioner
+class Q_AUTOTEST_EXPORT QQuickRow: public QQuickBasePositioner
 {
     Q_OBJECT
     Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged)
     Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged)
 public:
-    QSGRow(QSGItem *parent=0);
+    QQuickRow(QQuickItem *parent=0);
 
     Qt::LayoutDirection layoutDirection() const;
     void setLayoutDirection (Qt::LayoutDirection);
@@ -185,10 +185,10 @@ protected:
     virtual void doPositioning(QSizeF *contentSize);
     virtual void reportConflictingAnchors();
 private:
-    Q_DISABLE_COPY(QSGRow)
+    Q_DISABLE_COPY(QQuickRow)
 };
 
-class Q_AUTOTEST_EXPORT QSGGrid : public QSGBasePositioner
+class Q_AUTOTEST_EXPORT QQuickGrid : public QQuickBasePositioner
 {
     Q_OBJECT
     Q_PROPERTY(int rows READ rows WRITE setRows NOTIFY rowsChanged)
@@ -200,7 +200,7 @@ class Q_AUTOTEST_EXPORT QSGGrid : public QSGBasePositioner
     Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged)
 
 public:
-    QSGGrid(QSGItem *parent=0);
+    QQuickGrid(QQuickItem *parent=0);
 
     int rows() const {return m_rows;}
     void setRows(const int rows);
@@ -242,18 +242,18 @@ private:
     int m_rowSpacing;
     int m_columnSpacing;
     Flow m_flow;
-    Q_DISABLE_COPY(QSGGrid)
+    Q_DISABLE_COPY(QQuickGrid)
 };
 
-class QSGFlowPrivate;
-class Q_AUTOTEST_EXPORT QSGFlow: public QSGBasePositioner
+class QQuickFlowPrivate;
+class Q_AUTOTEST_EXPORT QQuickFlow: public QQuickBasePositioner
 {
     Q_OBJECT
     Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged)
     Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged)
     Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged)
 public:
-    QSGFlow(QSGItem *parent=0);
+    QQuickFlow(QQuickItem *parent=0);
 
     Q_ENUMS(Flow)
     enum Flow { LeftToRight, TopToBottom };
@@ -273,23 +273,23 @@ protected:
     virtual void doPositioning(QSizeF *contentSize);
     virtual void reportConflictingAnchors();
 protected:
-    QSGFlow(QSGFlowPrivate &dd, QSGItem *parent);
+    QQuickFlow(QQuickFlowPrivate &dd, QQuickItem *parent);
 private:
-    Q_DISABLE_COPY(QSGFlow)
-    Q_DECLARE_PRIVATE(QSGFlow)
+    Q_DISABLE_COPY(QQuickFlow)
+    Q_DECLARE_PRIVATE(QQuickFlow)
 };
 
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGColumn)
-QML_DECLARE_TYPE(QSGRow)
-QML_DECLARE_TYPE(QSGGrid)
-QML_DECLARE_TYPE(QSGFlow)
+QML_DECLARE_TYPE(QQuickColumn)
+QML_DECLARE_TYPE(QQuickRow)
+QML_DECLARE_TYPE(QQuickGrid)
+QML_DECLARE_TYPE(QQuickFlow)
 
-QML_DECLARE_TYPE(QSGBasePositioner)
-QML_DECLARE_TYPEINFO(QSGBasePositioner, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickBasePositioner)
+QML_DECLARE_TYPEINFO(QQuickBasePositioner, QML_HAS_ATTACHED_PROPERTIES)
 
 QT_END_HEADER
 
-#endif // QSGPOSITIONERS_P_H
+#endif // QQUICKPOSITIONERS_P_H