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, 14 insertions, 14 deletions

diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index 69099212ea..adfe384b25 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -59,7 +59,7 @@
 #include "qquickanchors_p_p.h"
 #include "qquickitemchangelistener_p.h"
 
-#include "qquickcanvas_p.h"
+#include "qquickwindow_p.h"
 
 #include <QtQuick/qsgnode.h>
 #include "qquickclipnode_p.h"
@@ -427,7 +427,7 @@ public:
         ParentChanged           = 0x00000800,
 
         Clip                    = 0x00001000,
-        Canvas                  = 0x00002000,
+        Window                  = 0x00002000,
 
         EffectReference         = 0x00008000,
         Visible                 = 0x00010000,
@@ -437,10 +437,10 @@ public:
         // dirtyToString()
 
         TransformUpdateMask     = TransformOrigin | Transform | BasicTransform | Position |
-                                  Size | Canvas,
-        ComplexTransformUpdateMask     = Transform | Canvas,
-        ContentUpdateMask       = Size | Content | Smooth | Canvas | Antialiasing,
-        ChildrenUpdateMask      = ChildrenChanged | ChildrenStackingChanged | EffectReference | Canvas
+                                  Size | Window,
+        ComplexTransformUpdateMask     = Transform | Window,
+        ContentUpdateMask       = Size | Content | Smooth | Window | Antialiasing,
+        ChildrenUpdateMask      = ChildrenChanged | ChildrenStackingChanged | EffectReference | Window
     };
 
     quint32 dirtyAttributes;
@@ -453,8 +453,8 @@ public:
 
     void setCulled(bool);
 
-    QQuickCanvas *canvas;
-    int canvasRefCount;
+    QQuickWindow *window;
+    int windowRefCount;
     inline QSGContext *sceneGraphContext() const;
 
     QQuickItem *parentItem;
@@ -469,14 +469,14 @@ public:
 
     inline void markSortedChildrenDirty(QQuickItem *child);
 
-    void refCanvas(QQuickCanvas *);
-    void derefCanvas();
+    void refWindow(QQuickWindow *);
+    void derefWindow();
 
     QQuickItem *subFocusItem;
     void updateSubFocusItem(QQuickItem *scope, bool focus);
 
-    QTransform canvasToItemTransform() const;
-    QTransform itemToCanvasTransform() const;
+    QTransform windowToItemTransform() const;
+    QTransform itemToWindowTransform() const;
     void itemToParentTransform(QTransform &) const;
 
     qreal x;
@@ -837,8 +837,8 @@ Qt::MouseButtons QQuickItemPrivate::acceptedMouseButtons() const
 
 QSGContext *QQuickItemPrivate::sceneGraphContext() const
 {
-    Q_ASSERT(canvas);
-    return static_cast<QQuickCanvasPrivate *>(QObjectPrivate::get(canvas))->context;
+    Q_ASSERT(window);
+    return static_cast<QQuickWindowPrivate *>(QObjectPrivate::get(window))->context;
 }
 
 void QQuickItemPrivate::markSortedChildrenDirty(QQuickItem *child)