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, 7 deletions

diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
index ec04833548..450f16c036 100644
--- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
+++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
@@ -42,7 +42,7 @@
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <private/qdeclarativeconnections_p.h>
-#include <private/qsgitem_p.h>
+#include <private/qquickitem_p.h>
 #include "../shared/util.h"
 #include <QtDeclarative/qdeclarativescriptstring.h>
 
@@ -102,7 +102,7 @@ void tst_qdeclarativeconnection::connection()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("test-connection.qml")));
-    QSGItem *item = qobject_cast<QSGItem*>(c.create());
+    QQuickItem *item = qobject_cast<QQuickItem*>(c.create());
 
     QVERIFY(item != 0);
 
@@ -119,7 +119,7 @@ void tst_qdeclarativeconnection::trimming()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("trimming.qml")));
-    QSGItem *item = qobject_cast<QSGItem*>(c.create());
+    QQuickItem *item = qobject_cast<QQuickItem*>(c.create());
 
     QVERIFY(item != 0);
 
@@ -140,18 +140,18 @@ void tst_qdeclarativeconnection::targetChanged()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("connection-targetchange.qml")));
-    QSGItem *item = qobject_cast<QSGItem*>(c.create());
+    QQuickItem *item = qobject_cast<QQuickItem*>(c.create());
     QVERIFY(item != 0);
 
     QDeclarativeConnections *connections = item->findChild<QDeclarativeConnections*>("connections");
     QVERIFY(connections);
 
-    QSGItem *item1 = item->findChild<QSGItem*>("item1");
+    QQuickItem *item1 = item->findChild<QQuickItem*>("item1");
     QVERIFY(item1);
 
     item1->setWidth(200);
 
-    QSGItem *item2 = item->findChild<QSGItem*>("item2");
+    QQuickItem *item2 = item->findChild<QQuickItem*>("item2");
     QVERIFY(item2);
     QVERIFY(connections->target() == item2);
 
@@ -185,7 +185,7 @@ void tst_qdeclarativeconnection::unknownSignals()
 
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, url);
-    QSGItem *item = qobject_cast<QSGItem*>(c.create());
+    QQuickItem *item = qobject_cast<QQuickItem*>(c.create());
     QVERIFY(item != 0);
 
     // check that connection is created (they are all runtime errors)