From 04653589ef14f07cba51d9c157778e20fa2dffd3 Mon Sep 17 00:00:00 2001
From: Andy Nichols <andy.nichols@nokia.com>
Date: Wed, 26 Oct 2011 12:48:01 +0200
Subject: [PATCH] Rename QSG* to QQuick* in qtwayland module
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: I6029550cb9a892795d0db9aafea59801a1de3c68
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 examples/qml-compositor/main.cpp                        | 14 +++++++-------
 src/qt-compositor/compositor_api/waylandsurfaceitem.cpp | 10 +++++-----
 src/qt-compositor/compositor_api/waylandsurfaceitem.h   |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/examples/qml-compositor/main.cpp b/examples/qml-compositor/main.cpp
index fdf27b3..3ff3583 100644
--- a/examples/qml-compositor/main.cpp
+++ b/examples/qml-compositor/main.cpp
@@ -50,17 +50,17 @@
 #include <QDeclarativeContext>
 #include <QtQuick1/QDeclarativeView>
 
-#include <QSGItem>
-#include <QSGView>
+#include <QQuickItem>
+#include <QQuickView>
 
-class QmlCompositor : public QSGView, public WaylandCompositor
+class QmlCompositor : public QQuickView, public WaylandCompositor
 {
     Q_OBJECT
 public:
     QmlCompositor() : WaylandCompositor(this, const_cast<QOpenGLContext *>(QOpenGLContext::currentContext())) {
         //setMouseTracking(true);
         setSource(QUrl(QLatin1String("qrc:qml/QmlCompositor/main.qml")));
-        setResizeMode(QSGView::SizeRootObjectToView);
+        setResizeMode(QQuickView::SizeRootObjectToView);
         winId();
 
 	connect(this, SIGNAL(frameSwapped()), this, SLOT(frameSwappedSlot()));
@@ -85,12 +85,12 @@ private slots:
             WaylandSurfaceItem *item = m_windowMap.value(surface);
             item->setWidth(size.width());
             item->setHeight(size.height());
-            emit windowResized(QVariant::fromValue(static_cast<QSGItem *>(item)));
+            emit windowResized(QVariant::fromValue(static_cast<QQuickItem *>(item)));
         } else {
             WaylandSurfaceItem *item = new WaylandSurfaceItem(surface, rootObject());
             item->setTouchEventsEnabled(true);
             connect(surface, SIGNAL(destroyed(QObject *)), this, SLOT(surfaceDestroyed(QObject *)));
-            emit windowAdded(QVariant::fromValue(static_cast<QSGItem *>(item)));
+            emit windowAdded(QVariant::fromValue(static_cast<QQuickItem *>(item)));
             m_windowMap[surface] = item;
 
             item->takeFocus();
@@ -99,7 +99,7 @@ private slots:
 
     void surfaceDestroyed(QObject *object) {
         WaylandSurfaceItem *item = m_windowMap.take(object);
-        emit windowDestroyed(QVariant::fromValue(static_cast<QSGItem *>(item)));
+        emit windowDestroyed(QVariant::fromValue(static_cast<QQuickItem *>(item)));
     }
 
     void frameSwappedSlot() {
diff --git a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp b/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
index 357e95d..8a9913a 100644
--- a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
+++ b/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
@@ -47,7 +47,7 @@
 
 #include <QtDeclarative/QSGSimpleTextureNode>
 #include <QtDeclarative/QSGSimpleRectNode>
-#include <QtDeclarative/QSGCanvas>
+#include <QtDeclarative/QQuickCanvas>
 
 class WaylandSurfaceTextureProvider : public QSGTextureProvider
 {
@@ -70,8 +70,8 @@ void WaylandSurfaceItem::surfaceDamaged(const QRect &)
     update();
 }
 
-WaylandSurfaceItem::WaylandSurfaceItem(QSGItem *parent)
-    : QSGItem(parent)
+WaylandSurfaceItem::WaylandSurfaceItem(QQuickItem *parent)
+    : QQuickItem(parent)
     , m_surface(0)
     , m_texture(0)
     , m_provider(0)
@@ -80,8 +80,8 @@ WaylandSurfaceItem::WaylandSurfaceItem(QSGItem *parent)
 {
 }
 
-WaylandSurfaceItem::WaylandSurfaceItem(WaylandSurface *surface, QSGItem *parent)
-    : QSGItem(parent)
+WaylandSurfaceItem::WaylandSurfaceItem(WaylandSurface *surface, QQuickItem *parent)
+    : QQuickItem(parent)
     , m_surface(0)
     , m_texture(0)
     , m_provider(0)
diff --git a/src/qt-compositor/compositor_api/waylandsurfaceitem.h b/src/qt-compositor/compositor_api/waylandsurfaceitem.h
index 95b1429..4af2df7 100644
--- a/src/qt-compositor/compositor_api/waylandsurfaceitem.h
+++ b/src/qt-compositor/compositor_api/waylandsurfaceitem.h
@@ -41,7 +41,7 @@
 #ifndef WAYLANDSURFACEITEM_H
 #define WAYLANDSURFACEITEM_H
 
-#include <QSGItem>
+#include <QQuickItem>
 #include <qsgtexture.h>
 
 #include <private/qsgtextureprovider_p.h>
@@ -51,7 +51,7 @@ class WaylandSurfaceTextureProvider;
 
 Q_DECLARE_METATYPE(WaylandSurface*)
 
-class WaylandSurfaceItem : public QSGItem
+class WaylandSurfaceItem : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(WaylandSurface* surface READ surface WRITE setSurface)
@@ -61,8 +61,8 @@ class WaylandSurfaceItem : public QSGItem
     Q_PROPERTY(bool touchEventsEnabled READ touchEventsEnabled WRITE setTouchEventsEnabled NOTIFY touchEventsEnabledChanged)
 
 public:
-    WaylandSurfaceItem(QSGItem *parent = 0);
-    WaylandSurfaceItem(WaylandSurface *surface, QSGItem *parent = 0);
+    WaylandSurfaceItem(QQuickItem *parent = 0);
+    WaylandSurfaceItem(WaylandSurface *surface, QQuickItem *parent = 0);
     ~WaylandSurfaceItem();
 
     void setSurface(WaylandSurface *surface);
-- 
2.7.4