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

diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp
index 848e887fba..d167d75efb 100644
--- a/src/quick/items/qquickpincharea.cpp
+++ b/src/quick/items/qquickpincharea.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qquickpincharea_p_p.h"
-#include "qquickcanvas.h"
+#include "qquickwindow.h"
 
 #include <QtGui/qevent.h>
 #include <QtGui/qguiapplication.h>
@@ -285,7 +285,7 @@ void QQuickPinchArea::touchEvent(QTouchEvent *event)
 
     // A common non-trivial starting scenario is the user puts down one finger,
     // then that finger remains stationary while putting down a second one.
-    // However QQuickCanvas will not send TouchUpdates for TouchPoints which
+    // However QQuickWindow will not send TouchUpdates for TouchPoints which
     // were not initially accepted; that would be inefficient and noisy.
     // So even if there is only one touchpoint so far, it's important to accept it
     // in order to get updates later on (and it's accepted by default anyway).
@@ -416,7 +416,7 @@ void QQuickPinchArea::updatePinch()
                 if (pe.accepted()) {
                     d->inPinch = true;
                     d->stealMouse = true;
-                    QQuickCanvas *c = canvas();
+                    QQuickWindow *c = window();
                     if (c && c->mouseGrabberItem() != this)
                         grabMouse();
                     setKeepMouseGrab(true);