Refactor item registration with scopes in mind

ItemRegister class removed and items now keep track of their own
cursor navigable child items. Navigation happens now only between siblings.

1 files changed, 8 insertions, 6 deletions

diff --git a/plugin/cursornavigation.h b/plugin/cursornavigation.h
index 2217679..7e61ee9 100644
--- a/plugin/cursornavigation.h
+++ b/plugin/cursornavigation.h
@@ -25,20 +25,22 @@ public:
 
     static CursorNavigation *cursorNavigationForWindow(QQuickWindow *window);
 
+    static CursorNavigationAttached *cursorNavigationAttachment(QQuickItem *item);
+
 private:
-    void setCursorOnItem(QQuickItem *item);
+    void setCursorOnItem(CursorNavigationAttached *item);
     void onActiveFocusItemChanged();
-
-    static CursorNavigationAttached *cursorNavigationAttachment(QQuickItem *item);
+    void registerItem(CursorNavigationAttached* item);
+    void unregisterItem(CursorNavigationAttached* item);
 
 private:
     static const char windowPropertyName[];
     QQuickWindow *m_window;
     InputAdapter m_inputAdapter;
-    QQuickItem *m_currentItem; //item that currently has the cursor
+    CursorNavigationAttached *m_currentItem; //item that currently has the cursor
     QList<CursorNavigationAlgorithm*> m_algorithms;
-    ItemRegister m_itemRegister;
-
+    //a root item that is not tied to any actual QQuickItem
+    CursorNavigationAttached m_rootItem;
 
     friend class CursorNavigationAttached;
 };