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 --- tools/qmlscene/main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tools/qmlscene') diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index c5f9274571..4706c72eb6 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -58,8 +58,8 @@ #include // ### This should be private API -#include -#include +#include +#include #define QT_NO_SCENEGRAPHITEM @@ -143,12 +143,12 @@ void RenderStatistics::printTotalStats() } #endif -class MyQSGView : public QSGView +class MyQQuickView : public QQuickView { public: - MyQSGView() : QSGView() + MyQQuickView() : QQuickView() { - setResizeMode(QSGView::SizeRootObjectToView); + setResizeMode(QQuickView::SizeRootObjectToView); } }; @@ -491,7 +491,7 @@ int main(int argc, char ** argv) #endif if (options.versionDetection) checkAndAdaptVersion(options.file); - QSGView *qxView = new MyQSGView(); + QQuickView *qxView = new MyQQuickView(); qxView->setVSyncAnimations(options.vsync); engine = qxView->engine(); for (int i = 0; i < imports.size(); ++i) -- cgit v1.2.3