From fd09392735ada1a8d85534eb8ed0d367e314b755 Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Fri, 29 Jun 2012 15:40:18 +1000
Subject: [PATCH] Remove QQuickItemPrivate::InitializationStatus.

Unused following changes to focus handling of unparented items.

Change-Id: I18b8c1a233a62050d3e43786cc093b039697c922
Reviewed-by: Bea Lam <bea.lam@nokia.com>
---
 src/quick/items/qquickitem.cpp |   33 ++-------------------------------
 src/quick/items/qquickitem_p.h |   17 -----------------
 2 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 2cf12b6..2357c5f 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -2204,28 +2204,7 @@ void QQuickItemPrivate::removeChild(QQuickItem *child)
     emit q->childrenChanged();
 }
 
-void QQuickItemPrivate::InitializationState::clear()
-{
-    focusScope = 0;
-}
-
-void QQuickItemPrivate::InitializationState::clear(QQuickItem *fs)
-{
-    focusScope = fs;
-}
-
-QQuickItem *QQuickItemPrivate::InitializationState::getFocusScope(QQuickItem *item)
-{
-    if (!focusScope) {
-        QQuickItem *fs = item->parentItem();
-        while (fs->parentItem() && !fs->isFocusScope())
-            fs = fs->parentItem();
-        focusScope = fs;
-    }
-    return focusScope;
-}
-
-void QQuickItemPrivate::refCanvas(InitializationState *state, QQuickCanvas *c)
+void QQuickItemPrivate::refCanvas(QQuickCanvas *c)
 {
     // An item needs a canvas if it is referenced by another item which has a canvas.
     // Typically the item is referenced by a parent, but can also be referenced by a
@@ -2251,20 +2230,12 @@ void QQuickItemPrivate::refCanvas(InitializationState *state, QQuickCanvas *c)
     if (polishScheduled)
         QQuickCanvasPrivate::get(canvas)->itemsToPolish.insert(q);
 
-    InitializationState _dummy;
-    InitializationState *childState = state;
-
-    if (q->isFocusScope()) {
-        _dummy.clear(q);
-        childState = &_dummy;
-    }
-
     if (!parentItem)
         QQuickCanvasPrivate::get(canvas)->parentlessItems.insert(q);
 
     for (int ii = 0; ii < childItems.count(); ++ii) {
         QQuickItem *child = childItems.at(ii);
-        QQuickItemPrivate::get(child)->refCanvas(childState, c);
+        QQuickItemPrivate::get(child)->refCanvas(c);
     }
 
     dirty(Canvas);
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index 0b4b2bd..ddebefd 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -467,17 +467,7 @@ public:
 
     inline void markSortedChildrenDirty(QQuickItem *child);
 
-    class InitializationState {
-    public:
-        QQuickItem *getFocusScope(QQuickItem *item);
-        void clear();
-        void clear(QQuickItem *focusScope);
-    private:
-        QQuickItem *focusScope;
-    };
-
     void refCanvas(QQuickCanvas *);
-    void refCanvas(InitializationState *, QQuickCanvas *);
     void derefCanvas();
 
     QQuickItem *subFocusItem;
@@ -865,13 +855,6 @@ QQuickItem::TransformOrigin QQuickItemPrivate::origin() const
     return extra.isAllocated()?extra->origin:QQuickItem::Center;
 }
 
-inline void QQuickItemPrivate::refCanvas(QQuickCanvas *c)
-{
-    QQuickItemPrivate::InitializationState initState;
-    initState.clear();
-    refCanvas(&initState, c);
-}
-
 QSGTransformNode *QQuickItemPrivate::itemNode()
 {
     if (!itemNodeInstance) {
-- 
1.7.2.5