Remove interim compatibility measures

Also update some variables in qtdeclarative which failed to update
rootItem->contentItem.

Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3
Reviewed-by: Alan Alpert <416365416c@gmail.com>

4 files changed, 44 insertions, 44 deletions

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
index 3d316005c5..d6fc0b27a5 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
@@ -82,14 +82,14 @@ void Highlight::setItem(QQuickItem *item)
                 SLOT(adjust()));
     }
     QQuickWindow *view = item->window();
-    QQuickItem * rootItem = view->rootItem();
-    if (rootItem) {
-        connect(rootItem, SIGNAL(xChanged()), SLOT(adjust()));
-        connect(rootItem, SIGNAL(yChanged()), SLOT(adjust()));
-        connect(rootItem, SIGNAL(widthChanged()), SLOT(adjust()));
-        connect(rootItem, SIGNAL(heightChanged()), SLOT(adjust()));
-        connect(rootItem, SIGNAL(rotationChanged()), SLOT(adjust()));
-        connect(rootItem, SIGNAL(transformOriginChanged(TransformOrigin)),
+    QQuickItem * contentItem = view->contentItem();
+    if (contentItem) {
+        connect(contentItem, SIGNAL(xChanged()), SLOT(adjust()));
+        connect(contentItem, SIGNAL(yChanged()), SLOT(adjust()));
+        connect(contentItem, SIGNAL(widthChanged()), SLOT(adjust()));
+        connect(contentItem, SIGNAL(heightChanged()), SLOT(adjust()));
+        connect(contentItem, SIGNAL(rotationChanged()), SLOT(adjust()));
+        connect(contentItem, SIGNAL(transformOriginChanged(TransformOrigin)),
                 SLOT(adjust()));
     }
     m_item = item;
@@ -111,9 +111,9 @@ void Highlight::adjust()
     qreal scaleFactor = 1;
     QPointF originOffset = QPointF(0,0);
     QQuickWindow *view = m_item->window();
-    if (view->rootItem()) {
-        scaleFactor = view->rootItem()->scale();
-        originOffset -= view->rootItem()->pos();
+    if (view->contentItem()) {
+        scaleFactor = view->contentItem()->scale();
+        originOffset -= view->contentItem()->pos();
     }
     // The scale transform for the overlay needs to be cancelled
     // as the Item's transform which will be applied to the painter
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
index 69b2dd4e21..8cd40b4e0c 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
@@ -61,17 +61,17 @@ namespace QtQuick2 {
 
 InspectTool::InspectTool(QQuickViewInspector *inspector, QQuickView *view) :
     AbstractTool(inspector),
-    m_originalSmooth(view->rootItem()->smooth()),
+    m_originalSmooth(view->contentItem()->smooth()),
     m_dragStarted(false),
     m_pinchStarted(false),
     m_didPressAndHold(false),
     m_tapEvent(false),
-    m_rootItem(view->rootItem()),
-    m_originalPosition(view->rootItem()->pos()),
+    m_contentItem(view->contentItem()),
+    m_originalPosition(view->contentItem()->pos()),
     m_smoothScaleFactor(Constants::ZoomSnapDelta),
     m_minScale(0.125f),
     m_maxScale(48.0f),
-    m_originalScale(view->rootItem()->scale()),
+    m_originalScale(view->contentItem()->scale()),
     m_touchTimestamp(0),
     m_hoverHighlight(new HoverHighlight(inspector->overlay())),
     m_lastItem(0),
@@ -98,17 +98,17 @@ void InspectTool::enable(bool enable)
     if (!enable) {
         inspector()->setSelectedItems(QList<QQuickItem*>());
         // restoring the original states.
-        if (m_rootItem) {
-            m_rootItem->setScale(m_originalScale);
-            m_rootItem->setPos(m_originalPosition);
-            m_rootItem->setSmooth(m_originalSmooth);
+        if (m_contentItem) {
+            m_contentItem->setScale(m_originalScale);
+            m_contentItem->setPos(m_originalPosition);
+            m_contentItem->setSmooth(m_originalSmooth);
         }
     } else {
-        if (m_rootItem) {
-            m_originalSmooth = m_rootItem->smooth();
-            m_originalScale = m_rootItem->scale();
-            m_originalPosition = m_rootItem->pos();
-            m_rootItem->setSmooth(true);
+        if (m_contentItem) {
+            m_originalSmooth = m_contentItem->smooth();
+            m_originalScale = m_contentItem->scale();
+            m_originalPosition = m_contentItem->pos();
+            m_contentItem->setSmooth(true);
         }
     }
 }
@@ -174,8 +174,8 @@ void InspectTool::wheelEvent(QWheelEvent *event)
     Qt::KeyboardModifier smoothZoomModifier = Qt::ControlModifier;
     if (event->modifiers() & smoothZoomModifier) {
         int numDegrees = event->delta() / 8;
-        qreal newScale = m_rootItem->scale() + m_smoothScaleFactor * (numDegrees / 15.0f);
-        scaleView(newScale / m_rootItem->scale(), m_mousePosition, m_mousePosition);
+        qreal newScale = m_contentItem->scale() + m_smoothScaleFactor * (numDegrees / 15.0f);
+        scaleView(newScale / m_contentItem->scale(), m_mousePosition, m_mousePosition);
     } else if (!event->modifiers()) {
         if (event->delta() > 0) {
             zoomIn();
@@ -204,7 +204,7 @@ void InspectTool::keyReleaseEvent(QKeyEvent *event)
     case Qt::Key_8:
     case Qt::Key_9: {
         qreal newScale = ((event->key() - Qt::Key_0) * 1.0f);
-        scaleView(newScale / m_rootItem->scale(), m_mousePosition, m_mousePosition);
+        scaleView(newScale / m_contentItem->scale(), m_mousePosition, m_mousePosition);
         break;
     }
     default:
@@ -283,34 +283,34 @@ void InspectTool::touchEvent(QTouchEvent *event)
 void InspectTool::scaleView(const qreal &factor, const QPointF &newcenter, const QPointF &oldcenter)
 {
     m_pressAndHoldTimer.stop();
-    if (((m_rootItem->scale() * factor) > m_maxScale)
-            || ((m_rootItem->scale() * factor) < m_minScale)) {
+    if (((m_contentItem->scale() * factor) > m_maxScale)
+            || ((m_contentItem->scale() * factor) < m_minScale)) {
         return;
     }
     //New position = new center + scalefactor * (oldposition - oldcenter)
-    QPointF newPosition = newcenter + (factor * (m_rootItem->pos() - oldcenter));
-    m_rootItem->setScale(m_rootItem->scale() * factor);
-    m_rootItem->setPos(newPosition);
+    QPointF newPosition = newcenter + (factor * (m_contentItem->pos() - oldcenter));
+    m_contentItem->setScale(m_contentItem->scale() * factor);
+    m_contentItem->setPos(newPosition);
 }
 
 void InspectTool::zoomIn()
 {
     qreal newScale = nextZoomScale(ZoomIn);
-    scaleView(newScale / m_rootItem->scale(), m_mousePosition, m_mousePosition);
+    scaleView(newScale / m_contentItem->scale(), m_mousePosition, m_mousePosition);
 }
 
 void InspectTool::zoomOut()
 {
     qreal newScale = nextZoomScale(ZoomOut);
-    scaleView(newScale / m_rootItem->scale(), m_mousePosition, m_mousePosition);
+    scaleView(newScale / m_contentItem->scale(), m_mousePosition, m_mousePosition);
 }
 
 void InspectTool::zoomTo100()
 {
     m_didPressAndHold = true;
 
-    m_rootItem->setPos(QPointF(0, 0));
-    m_rootItem->setScale(1.0);
+    m_contentItem->setPos(QPointF(0, 0));
+    m_contentItem->setScale(1.0);
 }
 
 qreal InspectTool::nextZoomScale(ZoomDirection direction)
@@ -338,13 +338,13 @@ qreal InspectTool::nextZoomScale(ZoomDirection direction)
 
     if (direction == ZoomIn) {
         for (int i = 0; i < zoomScales.length(); ++i) {
-            if (zoomScales[i] > m_rootItem->scale())
+            if (zoomScales[i] > m_contentItem->scale())
                 return zoomScales[i];
         }
         return zoomScales.last();
     } else {
         for (int i = zoomScales.length() - 1; i >= 0; --i) {
-            if (zoomScales[i] < m_rootItem->scale())
+            if (zoomScales[i] < m_contentItem->scale())
                 return zoomScales[i];
         }
         return zoomScales.first();
@@ -361,9 +361,9 @@ void InspectTool::initializeDrag(const QPointF &pos)
 
 void InspectTool::dragItemToPosition()
 {
-    QPointF newPosition = m_rootItem->pos() + m_mousePosition - m_dragStartPosition;
+    QPointF newPosition = m_contentItem->pos() + m_mousePosition - m_dragStartPosition;
     m_dragStartPosition = m_mousePosition;
-    m_rootItem->setPos(newPosition);
+    m_contentItem->setPos(newPosition);
 }
 
 void InspectTool::moveItem(bool valid)
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h
index dabb41e549..5c480697af 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h
@@ -108,7 +108,7 @@ private:
     bool m_pinchStarted;
     bool m_didPressAndHold;
     bool m_tapEvent;
-    QPointer<QQuickItem> m_rootItem;
+    QPointer<QQuickItem> m_contentItem;
     QPointF m_dragStartPosition;
     QPointF m_mousePosition;
     QPointF m_originalPosition;
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
index 1cb24064f1..4f6ee51c5d 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
@@ -128,7 +128,7 @@ QQuickViewInspector::QQuickViewInspector(QQuickView *view, QObject *parent) :
     // Try to make sure the overlay is always on top
     m_overlay->setZ(FLT_MAX);
 
-    if (QQuickItem *root = view->rootItem())
+    if (QQuickItem *root = view->contentItem())
         m_overlay->setParentItem(root);
 
     view->installEventFilter(this);
@@ -190,13 +190,13 @@ QQmlEngine *QQuickViewInspector::declarativeEngine() const
 
 QQuickItem *QQuickViewInspector::topVisibleItemAt(const QPointF &pos) const
 {
-    QQuickItem *root = m_view->rootItem();
+    QQuickItem *root = m_view->contentItem();
     return itemAt(root, root->mapFromScene(pos), m_overlay);
 }
 
 QList<QQuickItem *> QQuickViewInspector::itemsAt(const QPointF &pos) const
 {
-    QQuickItem *root = m_view->rootItem();
+    QQuickItem *root = m_view->contentItem();
     QList<QQuickItem *> resultList;
     collectItemsAt(root, root->mapFromScene(pos), m_overlay,
                    resultList);