aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltest
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2011-10-14 10:51:42 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-21 11:53:26 +0200
commitbfb3c424abc7c839dc44de0e36024ede99ece736 (patch)
treeb6814d0238bead8518b23c078beb818432de6ce4 /src/qmltest
parent2d119a137f1bc0c8b1113cd6c58413a1b89a4c1c (diff)
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>
Diffstat (limited to 'src/qmltest')
-rw-r--r--src/qmltest/quicktest.cpp6
-rw-r--r--src/qmltest/quicktestevent.cpp10
2 files changed, 8 insertions, 8 deletions
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp
index 150304028d..3c726d43d1 100644
--- a/src/qmltest/quicktest.cpp
+++ b/src/qmltest/quicktest.cpp
@@ -49,7 +49,7 @@
#include <QtDeclarative/qdeclarativeengine.h>
#include <QtDeclarative/qdeclarativecontext.h>
#if defined(QML_VERSION) && QML_VERSION >= 0x020000
-#include <QtDeclarative/qsgview.h>
+#include <QtDeclarative/qquickview.h>
#define QUICK_TEST_SCENEGRAPH 1
#endif
#include <QtDeclarative/qjsvalue.h>
@@ -175,7 +175,7 @@ int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport
// in turn with a QDeclarativeView.
#ifdef QUICK_TEST_SCENEGRAPH
if (qtQuick2) {
- QSGView view;
+ QQuickView view;
QTestRootObject rootobj;
QEventLoop eventLoop;
QObject::connect(view.engine(), SIGNAL(quit()),
@@ -199,7 +199,7 @@ int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport
view.setSource(QUrl::fromLocalFile(path));
if (QTest::printAvailableFunctions)
continue;
- if (view.status() == QSGView::Error) {
+ if (view.status() == QQuickView::Error) {
// Error compiling the test - flag failure in the log and continue.
QList<QDeclarativeError> errors = view.errors();
QuickTestResult results;
diff --git a/src/qmltest/quicktestevent.cpp b/src/qmltest/quicktestevent.cpp
index 4e62d4a827..780d502f52 100644
--- a/src/qmltest/quicktestevent.cpp
+++ b/src/qmltest/quicktestevent.cpp
@@ -45,8 +45,8 @@
#include <QtQuick1/qdeclarativeitem.h>
#include <QtQuick1/qdeclarativeview.h>
#if defined(QML_VERSION) && QML_VERSION >= 0x020000
-#include <QtDeclarative/qsgitem.h>
-#include <QtDeclarative/qsgcanvas.h>
+#include <QtDeclarative/qquickitem.h>
+#include <QtDeclarative/qquickcanvas.h>
#define QUICK_TEST_SCENEGRAPH 1
#endif
#include <QtWidgets/qgraphicsscene.h>
@@ -119,7 +119,7 @@ namespace QtQuickTest
QDeclarativeView *view = qobject_cast<QDeclarativeView *>(window);
QWindow *eventWindow = window;
#ifdef QUICK_TEST_SCENEGRAPH
- QSGItem *sgitem = qobject_cast<QSGItem *>(item);
+ QQuickItem *sgitem = qobject_cast<QQuickItem *>(item);
if (sgitem) {
pos = sgitem->mapToScene(_pos).toPoint();
} else
@@ -181,7 +181,7 @@ namespace QtQuickTest
QDeclarativeView *view = qobject_cast<QDeclarativeView *>(window);
QWindow *eventWindow = window;
#ifdef QUICK_TEST_SCENEGRAPH
- QSGItem *sgitem = qobject_cast<QSGItem *>(item);
+ QQuickItem *sgitem = qobject_cast<QQuickItem *>(item);
if (sgitem) {
pos = sgitem->mapToScene(_pos).toPoint();
} else
@@ -291,7 +291,7 @@ bool QuickTestEvent::mouseMove
QWindow *QuickTestEvent::eventWindow()
{
#ifdef QUICK_TEST_SCENEGRAPH
- QSGItem *sgitem = qobject_cast<QSGItem *>(parent());
+ QQuickItem *sgitem = qobject_cast<QQuickItem *>(parent());
if (sgitem)
return sgitem->canvas();
#endif