From 02c4db0f861cf8e03e93f911a1540370883124a3 Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Mon, 2 Jul 2012 13:22:34 +1000 Subject: [PATCH] Remove unused private API. These functions may serve a future purpose but at the moment are unused and untested. Change-Id: If7c661f10859cc23202f90eb3c5304bf1a8dc217 Reviewed-by: Martin Jones --- src/quick/util/qquicklistcompositor.cpp | 49 --------------------------------- src/quick/util/qquicklistcompositor_p.h | 9 ------ 2 files changed, 58 deletions(-) diff --git a/src/quick/util/qquicklistcompositor.cpp b/src/quick/util/qquicklistcompositor.cpp index 1a89360..25dbd98 100644 --- a/src/quick/util/qquicklistcompositor.cpp +++ b/src/quick/util/qquicklistcompositor.cpp @@ -290,14 +290,6 @@ QQuickListCompositor::insert_iterator QQuickListCompositor::findInsertPosition(G return it; } -QQuickListCompositor::iterator QQuickListCompositor::begin(Group group) -{ - QT_QML_TRACE_LISTCOMPOSITOR(<< group) - m_cacheIt = iterator(m_ranges.next, 0, group, m_groupCount); - m_cacheIt += 0; - return m_cacheIt; -} - void QQuickListCompositor::append( void *list, int index, int count, uint flags, QVector *inserts) { @@ -522,32 +514,6 @@ void QQuickListCompositor::clearFlags( QT_QML_VERIFY_LISTCOMPOSITOR } -void QQuickListCompositor::removeList(void *list, QVector *removes, bool destroyed) -{ - QT_QML_TRACE_LISTCOMPOSITOR(<< list << destroyed) - for (iterator it(m_ranges.next, 0, Default, m_groupCount); *it != &m_ranges; *it = it->next) { - if (it->list == list) { - const int flags = it->flags & (GroupMask | CacheFlag); - if (flags) { - removes->append(Remove(it, it->count, flags)); - m_end.decrementIndexes(it->count, flags); - } - if (destroyed) - it->list = 0; - if (it->inCache()) { - it->flags = CacheFlag; - it.cacheIndex += it->count; - } else { - *it = erase(*it)->previous; - } - } else { - it.incrementIndexes(it->count); - } - } - m_cacheIt = m_end; - QT_QML_VERIFY_LISTCOMPOSITOR -} - bool QQuickListCompositor::verifyMoveTo( Group fromGroup, int from, Group toGroup, int to, int count, Group group) const { @@ -1064,21 +1030,6 @@ void QQuickListCompositor::listItemsChanged( listItemsChanged(translatedChanges, list, changes); } -void QQuickListCompositor::listChanged( - void *list, - const QQuickChangeSet &changeSet, - QVector *translatedRemovals, - QVector *translatedInsertions, - QVector *translatedChanges) -{ - QVector removals = changeSet.removes(); - QVector insertions = changeSet.inserts(); - QVector movedFlags; - listItemsRemoved(translatedRemovals, list, &removals, &insertions, &movedFlags, changeSet.moveCounter()); - listItemsInserted(translatedInsertions, list, insertions, &movedFlags); - listItemsChanged(translatedChanges, list, changeSet.changes()); -} - void QQuickListCompositor::transition( Group from, Group to, diff --git a/src/quick/util/qquicklistcompositor_p.h b/src/quick/util/qquicklistcompositor_p.h index 38ac0a5..718ffe0 100644 --- a/src/quick/util/qquicklistcompositor_p.h +++ b/src/quick/util/qquicklistcompositor_p.h @@ -222,7 +222,6 @@ public: iterator find(Group group, int index) const; insert_iterator findInsertPosition(Group group, int index); - iterator begin(Group group); const iterator &end() { return m_end; } void append(void *list, int index, int count, uint flags, QVector *inserts = 0); @@ -243,8 +242,6 @@ public: void clearFlags(iterator from, int count, uint flags, QVector *removals = 0) { clearFlags(from, count, from.group, flags, removals); } - void removeList(void *list, QVector *removals, bool destroyed); - bool verifyMoveTo(Group fromGroup, int from, Group toGroup, int to, int count, Group group) const; void move( @@ -262,12 +259,6 @@ public: void listItemsRemoved(void *list, int index, int count, QVector *removals); void listItemsMoved(void *list, int from, int to, int count, QVector *removals, QVector *inserts); void listItemsChanged(void *list, int index, int count, QVector *changes); - void listChanged( - void *list, - const QQuickChangeSet &changeSet, - QVector *removals, - QVector *inserts, - QVector *changes); void transition( Group from, -- 2.7.4