summaryrefslogtreecommitdiffstats
path: root/tools
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 /tools
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 'tools')
-rw-r--r--tools/qmlplugindump/main.cpp8
-rw-r--r--tools/qmlscene/main.cpp12
2 files changed, 10 insertions, 10 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index d0ab0d8784..b4cf2da3ff 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -42,8 +42,8 @@
#include <QtDeclarative/QtDeclarative>
#include <QtDeclarative/private/qdeclarativemetatype_p.h>
#include <QtDeclarative/private/qdeclarativeopenmetaobject_p.h>
-#include <QtDeclarative/private/qsgevents_p_p.h>
-#include <QtDeclarative/private/qsgpincharea_p.h>
+#include <QtDeclarative/private/qquickevents_p_p.h>
+#include <QtDeclarative/private/qquickpincharea_p.h>
#include <QtWidgets/QApplication>
@@ -586,8 +586,8 @@ int main(int argc, char *argv[])
QList<QDeclarativeType *> defaultTypes = QDeclarativeMetaType::qmlTypes();
// add some otherwise unreachable QMetaObjects
- defaultReachable.insert(&QSGMouseEvent::staticMetaObject);
- // QSGKeyEvent, QSGPinchEvent, QSGDropEvent are not exported
+ defaultReachable.insert(&QQuickMouseEvent::staticMetaObject);
+ // QQuickKeyEvent, QQuickPinchEvent, QQuickDropEvent are not exported
// this will hold the meta objects we want to dump information of
QSet<const QMetaObject *> metas;
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 <QtDeclarative/qdeclarativecontext.h>
// ### This should be private API
-#include <qsgitem.h>
-#include <qsgview.h>
+#include <qquickitem.h>
+#include <qquickview.h>
#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)