Merge branch 'Applications/16.04'

[dolphin.git] / src / kitemviews / kitemlistselectionmanager.cpp

diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp
index 833f7aad07f6d0e985f6fe6dfa59f5a5c8c0daf9..46ffe7c139f036b840659ca49a3fb4ece3955664 100644 (file)
--- a/src/kitemviews/kitemlistselectionmanager.cpp
+++ b/src/kitemviews/kitemlistselectionmanager.cpp
@@ -24,7 +24,6 @@
 #include "kitemlistselectionmanager.h"
 
 #include "kitemmodelbase.h"
 #include "kitemlistselectionmanager.h"
 
 #include "kitemmodelbase.h"

-#include <KDebug>

 
 KItemListSelectionManager::KItemListSelectionManager(QObject* parent) :
     QObject(parent),
 
 KItemListSelectionManager::KItemListSelectionManager(QObject* parent) :
     QObject(parent),


@@ -43,7 +42,7 @@ KItemListSelectionManager::~KItemListSelectionManager()
 void KItemListSelectionManager::setCurrentItem(int current)
 {
     const int previous = m_currentItem;
 void KItemListSelectionManager::setCurrentItem(int current)
 {
     const int previous = m_currentItem;

-    const QSet<int> previousSelection = selectedItems();
+    const KItemSet previousSelection = selectedItems();

 
     if (m_model && current >= 0 && current < m_model->count()) {
         m_currentItem = current;
 
     if (m_model && current >= 0 && current < m_model->count()) {
         m_currentItem = current;


@@ -55,7 +54,7 @@ void KItemListSelectionManager::setCurrentItem(int current)
         emit currentChanged(m_currentItem, previous);
 
         if (m_isAnchoredSelectionActive) {
         emit currentChanged(m_currentItem, previous);
 
         if (m_isAnchoredSelectionActive) {

-            const QSet<int> selection = selectedItems();
+            const KItemSet selection = selectedItems();

             if (selection != previousSelection) {
                 emit selectionChanged(selection, previousSelection);
             }
             if (selection != previousSelection) {
                 emit selectionChanged(selection, previousSelection);
             }


@@ -68,18 +67,18 @@ int KItemListSelectionManager::currentItem() const
     return m_currentItem;
 }
 
     return m_currentItem;
 }
 

-void KItemListSelectionManager::setSelectedItems(const QSet<int>& items)
+void KItemListSelectionManager::setSelectedItems(const KItemSet& items)

 {
     if (m_selectedItems != items) {
 {
     if (m_selectedItems != items) {

-        const QSet<int> previous = m_selectedItems;
+        const KItemSet previous = m_selectedItems;

         m_selectedItems = items;
         emit selectionChanged(m_selectedItems, previous);
     }
 }
 
         m_selectedItems = items;
         emit selectionChanged(m_selectedItems, previous);
     }
 }
 

-QSet<int> KItemListSelectionManager::selectedItems() const
+KItemSet KItemListSelectionManager::selectedItems() const

 {
 {

-    QSet<int> selectedItems = m_selectedItems;
+    KItemSet selectedItems = m_selectedItems;

 
     if (m_isAnchoredSelectionActive && m_anchorItem != m_currentItem) {
         Q_ASSERT(m_anchorItem >= 0);
 
     if (m_isAnchoredSelectionActive && m_anchorItem != m_currentItem) {
         Q_ASSERT(m_anchorItem >= 0);


@@ -127,7 +126,7 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode
     }
 
     endAnchoredSelection();
     }
 
     endAnchoredSelection();

-    const QSet<int> previous = selectedItems();
+    const KItemSet previous = selectedItems();

 
     count = qMin(count, m_model->count() - index);
 
 
     count = qMin(count, m_model->count() - index);
 


@@ -160,7 +159,7 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode
         break;
     }
 
         break;
     }
 

-    const QSet<int> selection = selectedItems();
+    const KItemSet selection = selectedItems();

     if (selection != previous) {
         emit selectionChanged(selection, previous);
     }
     if (selection != previous) {
         emit selectionChanged(selection, previous);
     }


@@ -168,11 +167,11 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode
 
 void KItemListSelectionManager::clearSelection()
 {
 
 void KItemListSelectionManager::clearSelection()
 {

-    const QSet<int> previous = selectedItems();
+    const KItemSet previous = selectedItems();

     if (!previous.isEmpty()) {
         m_selectedItems.clear();
         m_isAnchoredSelectionActive = false;
     if (!previous.isEmpty()) {
         m_selectedItems.clear();
         m_isAnchoredSelectionActive = false;

-        emit selectionChanged(QSet<int>(), previous);
+        emit selectionChanged(KItemSet(), previous);

     }
 }
 
     }
 }
 


@@ -221,7 +220,7 @@ void KItemListSelectionManager::setModel(KItemModelBase* model)
 void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
 {
     // Store the current selection (needed in the selectionChanged() signal)
 void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
 {
     // Store the current selection (needed in the selectionChanged() signal)

-    const QSet<int> previousSelection = selectedItems();
+    const KItemSet previousSelection = selectedItems();

 
     // Update the current item
     if (m_currentItem < 0) {
 
     // Update the current item
     if (m_currentItem < 0) {


@@ -257,12 +256,10 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
 
     // Update the selections
     if (!m_selectedItems.isEmpty()) {
 
     // Update the selections
     if (!m_selectedItems.isEmpty()) {

-        const QSet<int> previous = m_selectedItems;
+        const KItemSet previous = m_selectedItems;

         m_selectedItems.clear();
         m_selectedItems.clear();

-        m_selectedItems.reserve(previous.count());
-        QSetIterator<int> it(previous);
-        while (it.hasNext()) {
-            const int index = it.next();
+
+        for (int index: previous) {

             int inc = 0;
             foreach (const KItemRange& itemRange, itemRanges) {
                 if (index < itemRange.index) {
             int inc = 0;
             foreach (const KItemRange& itemRange, itemRanges) {
                 if (index < itemRange.index) {


@@ -274,7 +271,7 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
         }
     }
 
         }
     }
 

-    const QSet<int> selection = selectedItems();
+    const KItemSet selection = selectedItems();

     if (selection != previousSelection) {
         emit selectionChanged(selection, previousSelection);
     }
     if (selection != previousSelection) {
         emit selectionChanged(selection, previousSelection);
     }


@@ -283,7 +280,7 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
 void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
 {
     // Store the current selection (needed in the selectionChanged() signal)
 void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
 {
     // Store the current selection (needed in the selectionChanged() signal)

-    const QSet<int> previousSelection = selectedItems();
+    const KItemSet previousSelection = selectedItems();

     const int previousCurrent = m_currentItem;
 
     // Update the current item
     const int previousCurrent = m_currentItem;
 
     // Update the current item


@@ -308,19 +305,18 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
 
     // Update the selections and the anchor item
     if (!m_selectedItems.isEmpty()) {
 
     // Update the selections and the anchor item
     if (!m_selectedItems.isEmpty()) {

-        const QSet<int> previous = m_selectedItems;
+        const KItemSet previous = m_selectedItems;

         m_selectedItems.clear();
         m_selectedItems.clear();

-        m_selectedItems.reserve(previous.count());
-        QSetIterator<int> it(previous);
-        while (it.hasNext()) {
-            const int index = indexAfterRangesRemoving(it.next(), itemRanges, DiscardRemovedIndex);
+
+        for (int oldIndex : previous) {
+            const int index = indexAfterRangesRemoving(oldIndex, itemRanges, DiscardRemovedIndex);

             if (index >= 0)  {
                 m_selectedItems.insert(index);
             }
         }
     }
 
             if (index >= 0)  {
                 m_selectedItems.insert(index);
             }
         }
     }
 

-    const QSet<int> selection = selectedItems();
+    const KItemSet selection = selectedItems();

     if (selection != previousSelection) {
         emit selectionChanged(selection, previousSelection);
     }
     if (selection != previousSelection) {
         emit selectionChanged(selection, previousSelection);
     }


@@ -332,7 +328,12 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
 void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QList<int>& movedToIndexes)
 {
     // Store the current selection (needed in the selectionChanged() signal)
 void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QList<int>& movedToIndexes)
 {
     // Store the current selection (needed in the selectionChanged() signal)

-    const QSet<int> previousSelection = selectedItems();
+    const KItemSet previousSelection = selectedItems();
+
+    // endAnchoredSelection() adds all items between m_currentItem and
+    // m_anchorItem to m_selectedItems. They can then be moved
+    // individually later in this function.
+    endAnchoredSelection();

 
     // Update the current item
     if (m_currentItem >= itemRange.index && m_currentItem < itemRange.index + itemRange.count) {
 
     // Update the current item
     if (m_currentItem >= itemRange.index && m_currentItem < itemRange.index + itemRange.count) {


@@ -345,19 +346,15 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL
         emit currentChanged(newCurrentItem, previousCurrentItem);
     }
 
         emit currentChanged(newCurrentItem, previousCurrentItem);
     }
 

-    // Update the anchor item
-    if (m_anchorItem >= itemRange.index && m_anchorItem < itemRange.index + itemRange.count) {
-        m_anchorItem = movedToIndexes.at(m_anchorItem - itemRange.index);
-    }
+    // Start a new anchored selection.
+    beginAnchoredSelection(m_currentItem);

 
     // Update the selections
     if (!m_selectedItems.isEmpty()) {
 
     // Update the selections
     if (!m_selectedItems.isEmpty()) {

-        const QSet<int> previous = m_selectedItems;
+        const KItemSet previous = m_selectedItems;

         m_selectedItems.clear();
         m_selectedItems.clear();

-        m_selectedItems.reserve(previous.count());
-        QSetIterator<int> it(previous);
-        while (it.hasNext()) {
-            const int index = it.next();
+
+        for (int index : previous) {

             if (index >= itemRange.index && index < itemRange.index + itemRange.count) {
                 m_selectedItems.insert(movedToIndexes.at(index - itemRange.index));
             }
             if (index >= itemRange.index && index < itemRange.index + itemRange.count) {
                 m_selectedItems.insert(movedToIndexes.at(index - itemRange.index));
             }


@@ -367,7 +364,7 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL
         }
     }
 
         }
     }
 

-    const QSet<int> selection = selectedItems();
+    const KItemSet selection = selectedItems();

     if (selection != previousSelection) {
         emit selectionChanged(selection, previousSelection);
     }
     if (selection != previousSelection) {
         emit selectionChanged(selection, previousSelection);
     }


@@ -398,4 +395,4 @@ int KItemListSelectionManager::indexAfterRangesRemoving(int index, const KItemRa
     }
     return qBound(-1, index - dec, m_model->count() - 1);
 }
     }
     return qBound(-1, index - dec, m_model->count() - 1);
 }

-#include "kitemlistselectionmanager.moc"
+