aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
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 /tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
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 'tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp')
-rw-r--r--tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
index de34d9e009..ea05963827 100644
--- a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
+++ b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
@@ -42,7 +42,7 @@
#include <QtDeclarative/qdeclarativeengine.h>
#include <QtDeclarative/qdeclarativecomponent.h>
#include <private/qdeclarativebind_p.h>
-#include <private/qsgrectangle_p.h>
+#include <private/qquickrectangle_p.h>
#include "../shared/util.h"
class tst_qdeclarativebinding : public QObject
@@ -70,7 +70,7 @@ void tst_qdeclarativebinding::binding()
{
QDeclarativeEngine engine;
QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("test-binding.qml")));
- QSGRectangle *rect = qobject_cast<QSGRectangle*>(c.create());
+ QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create());
QVERIFY(rect != 0);
QDeclarativeBind *binding3 = qobject_cast<QDeclarativeBind*>(rect->findChild<QDeclarativeBind*>("binding3"));
@@ -98,7 +98,7 @@ void tst_qdeclarativebinding::whenAfterValue()
{
QDeclarativeEngine engine;
QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("test-binding2.qml")));
- QSGRectangle *rect = qobject_cast<QSGRectangle*>(c.create());
+ QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create());
QVERIFY(rect != 0);
QCOMPARE(rect->color(), QColor("yellow"));
@@ -114,10 +114,10 @@ void tst_qdeclarativebinding::restoreBinding()
{
QDeclarativeEngine engine;
QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("restoreBinding.qml")));
- QSGRectangle *rect = qobject_cast<QSGRectangle*>(c.create());
+ QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create());
QVERIFY(rect != 0);
- QSGRectangle *myItem = qobject_cast<QSGRectangle*>(rect->findChild<QSGRectangle*>("myItem"));
+ QQuickRectangle *myItem = qobject_cast<QQuickRectangle*>(rect->findChild<QQuickRectangle*>("myItem"));
QVERIFY(myItem != 0);
myItem->setY(25);
@@ -144,10 +144,10 @@ void tst_qdeclarativebinding::restoreBindingWithLoop()
{
QDeclarativeEngine engine;
QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("restoreBindingWithLoop.qml")));
- QSGRectangle *rect = qobject_cast<QSGRectangle*>(c.create());
+ QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create());
QVERIFY(rect != 0);
- QSGRectangle *myItem = qobject_cast<QSGRectangle*>(rect->findChild<QSGRectangle*>("myItem"));
+ QQuickRectangle *myItem = qobject_cast<QQuickRectangle*>(rect->findChild<QQuickRectangle*>("myItem"));
QVERIFY(myItem != 0);
myItem->setY(25);
@@ -179,7 +179,7 @@ void tst_qdeclarativebinding::deletedObject()
{
QDeclarativeEngine engine;
QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("deletedObject.qml")));
- QSGRectangle *rect = qobject_cast<QSGRectangle*>(c.create());
+ QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create());
QVERIFY(rect != 0);
QGuiApplication::sendPostedEvents(0, QEvent::DeferredDelete);