From 711f49efea11e0ef0a741b851ba080bc941fcf1a Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Thu, 20 Oct 2011 08:37:39 +0200
Subject: Adapt to QtDeclarative api renaming (QSG --> QQuick)

Change-Id: Iefee24c6262679263caef1976d0d9af541834ea0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
---
 examples/declarative-radio/main.cpp                | 4 ++--
 src/imports/multimedia/qdeclarativevideooutput.cpp | 6 +++---
 src/imports/multimedia/qdeclarativevideooutput_p.h | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/declarative-radio/main.cpp b/examples/declarative-radio/main.cpp
index 8156425..c8cba7b 100644
--- a/examples/declarative-radio/main.cpp
+++ b/examples/declarative-radio/main.cpp
@@ -41,14 +41,14 @@
 #include <QGuiApplication>
 
 #include <qdeclarative.h>
-#include <qsgview.h>
+#include <qquickview.h>
 
 
 int main(int argc, char ** argv)
 {
     QGuiApplication app(argc, argv);
 
-    QSGView view;
+    QQuickView view;
 
     view.setSource(QUrl("qrc:view.qml"));
     view.show();
diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp
index 9bd5eb3..2371fdb 100644
--- a/src/imports/multimedia/qdeclarativevideooutput.cpp
+++ b/src/imports/multimedia/qdeclarativevideooutput.cpp
@@ -44,7 +44,7 @@
 #include "qsgvideonode_i420.h"
 #include "qsgvideonode_rgb.h"
 
-#include <QtDeclarative/qsgitem.h>
+#include <QtDeclarative/qquickitem.h>
 
 #include <QtMultimedia/QAbstractVideoSurface>
 #include <QtMultimedia/qmediaservice.h>
@@ -151,8 +151,8 @@ private:
     \brief The QDeclarativeVideoOutput class provides a video output item.
 */
 
-QDeclarativeVideoOutput::QDeclarativeVideoOutput(QSGItem *parent) :
-    QSGItem(parent),
+QDeclarativeVideoOutput::QDeclarativeVideoOutput(QQuickItem *parent) :
+    QQuickItem(parent),
     m_fillMode(PreserveAspectFit)
 {
     setFlag(ItemHasContents, true);
diff --git a/src/imports/multimedia/qdeclarativevideooutput_p.h b/src/imports/multimedia/qdeclarativevideooutput_p.h
index 9286fec..80170f1 100644
--- a/src/imports/multimedia/qdeclarativevideooutput_p.h
+++ b/src/imports/multimedia/qdeclarativevideooutput_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEVIDEOOUTPUT_P_H
 #define QDECLARATIVEVIDEOOUTPUT_P_H
 
-#include <qsgitem.h>
+#include <qquickitem.h>
 
 #include <QtMultimedia/qvideoframe.h>
 #include <QtMultimedia/qmediaobject.h>
@@ -56,7 +56,7 @@ class QVideoRendererControl;
 class QMediaService;
 class QVideoSurfaceFormat;
 
-class QDeclarativeVideoOutput : public QSGItem
+class QDeclarativeVideoOutput : public QQuickItem
 {
     Q_OBJECT
     Q_DISABLE_COPY(QDeclarativeVideoOutput)
@@ -72,7 +72,7 @@ public:
         PreserveAspectCrop = Qt::KeepAspectRatioByExpanding
     };
 
-    QDeclarativeVideoOutput(QSGItem *parent = 0);
+    QDeclarativeVideoOutput(QQuickItem *parent = 0);
     ~QDeclarativeVideoOutput();
 
     QObject *source() const { return m_source.data(); }
-- 
cgit v1.2.3