QQuickCanvas renames

QQuickCanvas is now called QQuickWindow
QQuickCanvas::rootItem is now QQuickWindow::contentItem
QQuickItem::canvas is now QQuickItem::window
QQuickItem::ItemChangeData::canvas is also renamed window
QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow
The functions related to the color property have dropped the clear from
their names.

The first three changes have interim compatibility measures in place to
ease the transition.

Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2
Reviewed-by: Martin Jones <martin.jones@nokia.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/quick/items/qquickwindowmanager_p.h b/src/quick/items/qquickwindowmanager_p.h
index 553501928d..ccad33cd20 100644
--- a/src/quick/items/qquickwindowmanager_p.h
+++ b/src/quick/items/qquickwindowmanager_p.h
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickCanvas;
+class QQuickWindow;
 class QSGContext;
 
 class Q_QUICK_PRIVATE_EXPORT QQuickWindowManager
@@ -55,17 +55,17 @@ class Q_QUICK_PRIVATE_EXPORT QQuickWindowManager
 public:
     virtual ~QQuickWindowManager();
 
-    virtual void show(QQuickCanvas *canvas) = 0;
-    virtual void hide(QQuickCanvas *canvas) = 0;
+    virtual void show(QQuickWindow *window) = 0;
+    virtual void hide(QQuickWindow *window) = 0;
 
-    virtual void canvasDestroyed(QQuickCanvas *canvas) = 0;
+    virtual void windowDestroyed(QQuickWindow *window) = 0;
 
-    virtual void exposureChanged(QQuickCanvas *canvas) = 0;
-    virtual QImage grab(QQuickCanvas *canvas) = 0;
-    virtual void resize(QQuickCanvas *canvas, const QSize &size) = 0;
+    virtual void exposureChanged(QQuickWindow *window) = 0;
+    virtual QImage grab(QQuickWindow *window) = 0;
+    virtual void resize(QQuickWindow *window, const QSize &size) = 0;
 
-    virtual void update(QQuickCanvas *canvas) = 0;
-    virtual void maybeUpdate(QQuickCanvas *canvas) = 0;
+    virtual void update(QQuickWindow *window) = 0;
+    virtual void maybeUpdate(QQuickWindow *window) = 0;
     virtual void wakeup() = 0;
 
     virtual volatile bool *allowMainThreadProcessing() = 0;