Rename Qt Quick-specific classes to QQuick*

The QSG (SceneGraph) prefix is too generic for
Qt Quick(2)-specific classes.

All the classes and files in the declarative/items
directory have been renamed.

In particular, for classes that are currently public,
the renaming is as follows:

QSGView --> QQuickView
QSGCanvas --> QQuickCanvas
QSGItem --> QQuickItem
QSGPaintedItem --> QQuickPaintedItem

The header files have been renamed accordingly
(e.g. qsgview.h --> qquickview.h).

Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/src/declarative/scenegraph/util/qsgpainternode_p.h b/src/declarative/scenegraph/util/qsgpainternode_p.h
index e30dc7c30f..c838ed1a0c 100644
--- a/src/declarative/scenegraph/util/qsgpainternode_p.h
+++ b/src/declarative/scenegraph/util/qsgpainternode_p.h
@@ -45,7 +45,8 @@
 #include "qsgnode.h"
 #include "qsgtexturematerial.h"
 #include "qsgtexture_p.h"
-#include "qsgpainteditem.h"
+
+#include <qquickpainteditem.h>
 
 #include <QtGui/qcolor.h>
 
@@ -74,10 +75,10 @@ private:
 class Q_DECLARATIVE_EXPORT QSGPainterNode : public QSGGeometryNode
 {
 public:
-    QSGPainterNode(QSGPaintedItem *item);
+    QSGPainterNode(QQuickPaintedItem *item);
     virtual ~QSGPainterNode();
 
-    void setPreferredRenderTarget(QSGPaintedItem::RenderTarget target);
+    void setPreferredRenderTarget(QQuickPaintedItem::RenderTarget target);
 
     void setSize(const QSize &size);
     QSize size() const { return m_size; }
@@ -118,10 +119,10 @@ private:
 
     QSGContext *m_context;
 
-    QSGPaintedItem::RenderTarget m_preferredRenderTarget;
-    QSGPaintedItem::RenderTarget m_actualRenderTarget;
+    QQuickPaintedItem::RenderTarget m_preferredRenderTarget;
+    QQuickPaintedItem::RenderTarget m_actualRenderTarget;
 
-    QSGPaintedItem *m_item;
+    QQuickPaintedItem *m_item;
 
     QOpenGLFramebufferObject *m_fbo;
     QOpenGLFramebufferObject *m_multisampledFbo;