Rename QtStack to QQuickStack

Change-Id: Ifd2353b2e5183871900df919c2ca162dde4747e8
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

4 files changed, 23 insertions, 23 deletions

diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp
index 93fa6677e..1b255302a 100644
--- a/src/controls/plugin.cpp
+++ b/src/controls/plugin.cpp
@@ -43,7 +43,7 @@
 #include "qquickexclusivegroup_p.h"
 #include "qquickmenu_p.h"
 #include "qquickmenubar_p.h"
-#include "qtstack_p.h"
+#include "qquickstack_p.h"
 
 #include <qimage.h>
 #include <qqml.h>
@@ -97,7 +97,7 @@ void QtQuickControlsPlugin::registerTypes(const char *uri)
     qmlRegisterUncreatableType<QQuickMenuBase>(uri, 1, 0, "MenuBase",
                                                QLatin1String("Do not create objects of type MenuBase"));
 
-    qmlRegisterUncreatableType<QtStack>(uri, 1, 0, "Stack", QLatin1String("Do not create objects of type Stack"));
+    qmlRegisterUncreatableType<QQuickStack>(uri, 1, 0, "Stack", QLatin1String("Do not create objects of type Stack"));
 }
 
 void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
diff --git a/src/controls/plugin.pri b/src/controls/plugin.pri
index b66b6a4dc..739fcfae6 100644
--- a/src/controls/plugin.pri
+++ b/src/controls/plugin.pri
@@ -6,7 +6,7 @@ HEADERS += \
     $$PWD/qquickmenuitem_p.h \
     $$PWD/qquickmenuitemcontainer_p.h \
     $$PWD/qquickmenupopupwindow_p.h \
-    $$PWD/qtstack_p.h
+    $$PWD/qquickstack_p.h
 
 SOURCES += \
     $$PWD/plugin.cpp \
@@ -16,4 +16,4 @@ SOURCES += \
     $$PWD/qquickmenubar.cpp \
     $$PWD/qquickmenuitem.cpp \
     $$PWD/qquickmenupopupwindow.cpp \
-    $$PWD/qtstack.cpp
+    $$PWD/qquickstack.cpp
diff --git a/src/controls/qtstack.cpp b/src/controls/qquickstack.cpp
index f3976d42f..1723ef72d 100644
--- a/src/controls/qtstack.cpp
+++ b/src/controls/qquickstack.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "qtstack_p.h"
+#include "qquickstack_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Stack
-    \instantiates QtStack
+    \instantiates QQuickStack
     \inqmlmodule QtQuick.Controls 1.0
     \ingroup views
     \brief Provides attached properties for items pushed onto a StackView.
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
     \sa StackView
 */
 
-QtStack::QtStack(QObject *object)
+QQuickStack::QQuickStack(QObject *object)
     : QObject(object),
       m_index(-1),
       m_status(Inactive),
@@ -68,9 +68,9 @@ QtStack::QtStack(QObject *object)
 {
 }
 
-QtStack *QtStack::qmlAttachedProperties(QObject *object)
+QQuickStack *QQuickStack::qmlAttachedProperties(QObject *object)
 {
-    return new QtStack(object);
+    return new QQuickStack(object);
 }
 
 /*!
@@ -81,12 +81,12 @@ QtStack *QtStack::qmlAttachedProperties(QObject *object)
     so that \l{StackView::get()}{pageStack.get(index)} will return the item itself.
     If \l{Stack::pageStack}{pageStack} is \c null, \a index will be \c -1.
 */
-int QtStack::index() const
+int QQuickStack::index() const
 {
     return m_index;
 }
 
-void QtStack::setIndex(int index)
+void QQuickStack::setIndex(int index)
 {
     if (m_index != index) {
         m_index = index;
@@ -106,12 +106,12 @@ void QtStack::setIndex(int index)
     \li \c Stack.Deactivating: the item is transitioning into becoming inactive
     \endlist
 */
-QtStack::Status QtStack::status() const
+QQuickStack::Status QQuickStack::status() const
 {
     return m_status;
 }
 
-void QtStack::setStatus(Status status)
+void QQuickStack::setStatus(Status status)
 {
     if (m_status != status) {
         m_status = status;
@@ -126,12 +126,12 @@ void QtStack::setStatus(Status status)
     This property holds the StackView the item is in. If the item is not inside
     a StackView, \a pageStack will be \c null.
 */
-QQuickItem *QtStack::pageStack() const
+QQuickItem *QQuickStack::pageStack() const
 {
     return m_pageStack;
 }
 
-void QtStack::setStackView(QQuickItem *pageStack)
+void QQuickStack::setStackView(QQuickItem *pageStack)
 {
     if (m_pageStack != pageStack) {
         m_pageStack = pageStack;
diff --git a/src/controls/qtstack_p.h b/src/controls/qquickstack_p.h
index 3f9b79f55..a4b366443 100644
--- a/src/controls/qtstack_p.h
+++ b/src/controls/qquickstack_p.h
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#ifndef QTSTACK_P_H
-#define QTSTACK_P_H
+#ifndef QQUICKSTACK_P_H
+#define QQUICKSTACK_P_H
 
 #include <QtQuick/qquickitem.h>
 
 QT_BEGIN_NAMESPACE
 
-class QtStack : public QObject
+class QQuickStack : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int index READ index NOTIFY indexChanged)
@@ -58,9 +58,9 @@ class QtStack : public QObject
     Q_ENUMS(Status)
 
 public:
-    QtStack(QObject *object = 0);
+    QQuickStack(QObject *object = 0);
 
-    static QtStack *qmlAttachedProperties(QObject *object);
+    static QQuickStack *qmlAttachedProperties(QObject *object);
 
     int index() const;
     void setIndex(int index);
@@ -91,7 +91,7 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QtStack)
-QML_DECLARE_TYPEINFO(QtStack, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickStack)
+QML_DECLARE_TYPEINFO(QQuickStack, QML_HAS_ATTACHED_PROPERTIES)
 
-#endif // QTSTACK_P_H
+#endif // QQUICKSTACK_P_H