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>

2 files changed, 10 insertions, 10 deletions

diff --git a/src/quick/designer/designersupport.cpp b/src/quick/designer/designersupport.cpp
index 006843a097..e8e26f7644 100644
--- a/src/quick/designer/designersupport.cpp
+++ b/src/quick/designer/designersupport.cpp
@@ -73,7 +73,7 @@ void DesignerSupport::refFromEffectItem(QQuickItem *referencedItem, bool hide)
         return;
 
     QQuickItemPrivate::get(referencedItem)->refFromEffectItem(hide);
-    QQuickCanvasPrivate::get(referencedItem->canvas())->updateDirtyNode(referencedItem);
+    QQuickWindowPrivate::get(referencedItem->window())->updateDirtyNode(referencedItem);
 
     Q_ASSERT(QQuickItemPrivate::get(referencedItem)->rootNode());
 
@@ -147,12 +147,12 @@ void DesignerSupport::resetDirty(QQuickItem *referencedItem)
     QQuickItemPrivate::get(referencedItem)->removeFromDirtyList();
 }
 
-QTransform DesignerSupport::canvasTransform(QQuickItem *referencedItem)
+QTransform DesignerSupport::windowTransform(QQuickItem *referencedItem)
 {
     if (referencedItem == 0)
         return QTransform();
 
-    return QQuickItemPrivate::get(referencedItem)->itemToCanvasTransform();
+    return QQuickItemPrivate::get(referencedItem)->itemToWindowTransform();
 }
 
 QTransform DesignerSupport::parentTransform(QQuickItem *referencedItem)
@@ -404,7 +404,7 @@ bool DesignerSupport::isValidHeight(QQuickItem *item)
 
 void DesignerSupport::updateDirtyNode(QQuickItem *item)
 {
-    QQuickCanvasPrivate::get(item->canvas())->updateDirtyNode(item);
+    QQuickWindowPrivate::get(item->window())->updateDirtyNode(item);
 }
 
 QT_END_NAMESPACE
diff --git a/src/quick/designer/designersupport.h b/src/quick/designer/designersupport.h
index 54003cf3ba..df87a77071 100644
--- a/src/quick/designer/designersupport.h
+++ b/src/quick/designer/designersupport.h
@@ -90,16 +90,16 @@ public:
         ParentChanged           = 0x00000800,
 
         Clip                    = 0x00001000,
-        Canvas                  = 0x00002000,
+        Window                  = 0x00002000,
 
         EffectReference         = 0x00008000,
         Visible                 = 0x00010000,
         HideReference           = 0x00020000,
 
-        TransformUpdateMask     = TransformOrigin | Transform | BasicTransform | Position | Size | Canvas,
-        ComplexTransformUpdateMask     = Transform | Canvas,
-        ContentUpdateMask       = Size | Content | Smooth | Canvas,
-        ChildrenUpdateMask      = ChildrenChanged | ChildrenStackingChanged | EffectReference | Canvas
+        TransformUpdateMask     = TransformOrigin | Transform | BasicTransform | Position | Size | Window,
+        ComplexTransformUpdateMask     = Transform | Window,
+        ContentUpdateMask       = Size | Content | Smooth | Window,
+        ChildrenUpdateMask      = ChildrenChanged | ChildrenStackingChanged | EffectReference | Window
     };
 
 
@@ -114,7 +114,7 @@ public:
     static bool isDirty(QQuickItem *referencedItem, DirtyType dirtyType);
     static void resetDirty(QQuickItem *referencedItem);
 
-    static QTransform canvasTransform(QQuickItem *referencedItem);
+    static QTransform windowTransform(QQuickItem *referencedItem);
     static QTransform parentTransform(QQuickItem *referencedItem);
 
     static bool isAnchoredTo(QQuickItem *fromItem, QQuickItem *toItem);