From bfb3c424abc7c839dc44de0e36024ede99ece736 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Fri, 14 Oct 2011 10:51:42 +0200 Subject: 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 --- examples/declarative/modelviews/abstractitemmodel/main.cpp | 8 ++++---- examples/declarative/modelviews/objectlistmodel/main.cpp | 8 ++++---- examples/declarative/modelviews/stringlistmodel/main.cpp | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'examples/declarative/modelviews') diff --git a/examples/declarative/modelviews/abstractitemmodel/main.cpp b/examples/declarative/modelviews/abstractitemmodel/main.cpp index 3c78608295..dd726611a1 100644 --- a/examples/declarative/modelviews/abstractitemmodel/main.cpp +++ b/examples/declarative/modelviews/abstractitemmodel/main.cpp @@ -43,8 +43,8 @@ #include #include #include -#include -#include +#include +#include //![0] int main(int argc, char ** argv) @@ -56,8 +56,8 @@ int main(int argc, char ** argv) model.addAnimal(Animal("Polar bear", "Large")); model.addAnimal(Animal("Quoll", "Small")); - QSGView view; - view.setResizeMode(QSGView::SizeRootObjectToView); + QQuickView view; + view.setResizeMode(QQuickView::SizeRootObjectToView); QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", &model); //![0] diff --git a/examples/declarative/modelviews/objectlistmodel/main.cpp b/examples/declarative/modelviews/objectlistmodel/main.cpp index ba37e17d18..67ffb946c0 100644 --- a/examples/declarative/modelviews/objectlistmodel/main.cpp +++ b/examples/declarative/modelviews/objectlistmodel/main.cpp @@ -43,8 +43,8 @@ #include #include #include -#include -#include +#include +#include #include "dataobject.h" @@ -64,8 +64,8 @@ int main(int argc, char ** argv) dataList.append(new DataObject("Item 3", "blue")); dataList.append(new DataObject("Item 4", "yellow")); - QSGView view; - view.setResizeMode(QSGView::SizeRootObjectToView); + QQuickView view; + view.setResizeMode(QQuickView::SizeRootObjectToView); QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", QVariant::fromValue(dataList)); //![0] diff --git a/examples/declarative/modelviews/stringlistmodel/main.cpp b/examples/declarative/modelviews/stringlistmodel/main.cpp index 5d01c6fae8..ebd3c59307 100644 --- a/examples/declarative/modelviews/stringlistmodel/main.cpp +++ b/examples/declarative/modelviews/stringlistmodel/main.cpp @@ -44,8 +44,8 @@ #include #include #include -#include -#include +#include +#include /* @@ -64,7 +64,7 @@ int main(int argc, char ** argv) dataList.append("Item 3"); dataList.append("Item 4"); - QSGView view; + QQuickView view; QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", QVariant::fromValue(dataList)); //![0] -- cgit v1.2.3