Always use the 'Select' mode for anchored selections

In Dolphin, we don't actually use the 'Deselect' and 'Toggle'
modes for anchored selections, so we can just remove these
modes and always use 'Select' to reduce code complexity.

diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp
index 7b7c6bc54b7bc6b768429b5e6a068803bd301961..26ce1b2f70a45445f3c5755e075affade6881644 100644 (file)
--- a/src/kitemviews/kitemlistselectionmanager.cpp
+++ b/src/kitemviews/kitemlistselectionmanager.cpp
@@ -31,7 +31,6 @@ KItemListSelectionManager::KItemListSelectionManager(QObject* parent) :
     m_anchorItem(-1),
     m_selectedItems(),
     m_isAnchoredSelectionActive(false),
     m_anchorItem(-1),
     m_selectedItems(),
     m_isAnchoredSelectionActive(false),

-    m_anchoredSelectionMode(KItemListSelectionManager::Select),

     m_model(0)
 {
 }
     m_model(0)
 {
 }


@@ -77,21 +76,7 @@ QSet<int> KItemListSelectionManager::selectedItems() const
         const int to = qMax(m_anchorItem, m_currentItem);
 
         for (int index = from; index <= to; index++) {
         const int to = qMax(m_anchorItem, m_currentItem);
 
         for (int index = from; index <= to; index++) {

-            switch (m_anchoredSelectionMode) {
-            case Select:
-                selectedItems.insert(index);
-                break;
-            case Deselect:
-                selectedItems.remove(index);
-                break;
-            case Toggle:
-                if (selectedItems.contains(index)) {
-                    selectedItems.remove(index);
-                } else {
-                    selectedItems.insert(index);
-                }
-                break;
-            }
+            selectedItems.insert(index);

         }
     }
 
         }
     }
 


@@ -100,7 +85,7 @@ QSet<int> KItemListSelectionManager::selectedItems() const
 
 bool KItemListSelectionManager::hasSelection() const
 {
 
 bool KItemListSelectionManager::hasSelection() const
 {

-    return !m_selectedItems.isEmpty() || (m_isAnchoredSelectionActive && m_anchoredSelectionMode == KItemListSelectionManager::Select);
+    return !m_selectedItems.isEmpty() || m_isAnchoredSelectionActive;

 }
 
 void KItemListSelectionManager::setSelected(int index, int count, SelectionMode mode)
 }
 
 void KItemListSelectionManager::setSelected(int index, int count, SelectionMode mode)


@@ -162,10 +147,9 @@ void KItemListSelectionManager::clearSelection()
     }
 }
 
     }
 }
 

-void KItemListSelectionManager::beginAnchoredSelection(int anchor, SelectionMode mode)
+void KItemListSelectionManager::beginAnchoredSelection(int anchor)

 {
     Q_UNUSED(anchor);
 {
     Q_UNUSED(anchor);

-    Q_UNUSED(mode);

 }
 
 void KItemListSelectionManager::endAnchoredSelection()
 }
 
 void KItemListSelectionManager::endAnchoredSelection()


@@ -201,16 +185,6 @@ void KItemListSelectionManager::setAnchoredSelectionActive(bool active)
     m_isAnchoredSelectionActive = active;
 }
 
     m_isAnchoredSelectionActive = active;
 }
 

-KItemListSelectionManager::SelectionMode KItemListSelectionManager::anchoredSelectionMode() const
-{
-    return m_anchoredSelectionMode;
-}
-
-void KItemListSelectionManager::setAnchoredSelectionMode(KItemListSelectionManager::SelectionMode mode)
-{
-    m_anchoredSelectionMode = mode;
-}
-

 KItemModelBase* KItemListSelectionManager::model() const
 {
     return m_model;
 KItemModelBase* KItemListSelectionManager::model() const
 {
     return m_model;

diff --git a/src/kitemviews/kitemlistselectionmanager.h b/src/kitemviews/kitemlistselectionmanager.h
index 9de4c66b280605d06528337237b133977d1de83d..dd4c3e4fca6d3d8b94080accf71e0fd4025ec53b 100644 (file)
--- a/src/kitemviews/kitemlistselectionmanager.h
+++ b/src/kitemviews/kitemlistselectionmanager.h
@@ -59,15 +59,13 @@ public:
     void setSelected(int index, int count = 1, SelectionMode mode = Select);
     void clearSelection();
 
     void setSelected(int index, int count = 1, SelectionMode mode = Select);
     void clearSelection();
 

-    void beginAnchoredSelection(int anchor, SelectionMode mode = Select);
+    void beginAnchoredSelection(int anchor);

     void endAnchoredSelection();
     void setAnchorItem(int anchor);
     int anchorItem() const;
 
     bool isAnchoredSelectionActive() const;
     void setAnchoredSelectionActive(bool active);
     void endAnchoredSelection();
     void setAnchorItem(int anchor);
     int anchorItem() const;
 
     bool isAnchoredSelectionActive() const;
     void setAnchoredSelectionActive(bool active);

-    SelectionMode anchoredSelectionMode() const;
-    void setAnchoredSelectionMode(SelectionMode mode);

 
     KItemModelBase* model() const;
 
 
     KItemModelBase* model() const;
 


@@ -86,7 +84,6 @@ private:
     int m_anchorItem;
     QSet<int> m_selectedItems;
     bool m_isAnchoredSelectionActive;
     int m_anchorItem;
     QSet<int> m_selectedItems;
     bool m_isAnchoredSelectionActive;

-    SelectionMode m_anchoredSelectionMode;

 
     KItemModelBase* m_model;
 
 
     KItemModelBase* m_model;
 

diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp
index 2832a4c76cce5aec31f3c04cc7fdc02c5cf57189..9063b7884140db4d12c82e5c3a12bdf083becd1f 100644 (file)
--- a/src/tests/kitemlistselectionmanagertest.cpp
+++ b/src/tests/kitemlistselectionmanagertest.cpp
@@ -96,8 +96,6 @@ void KItemListSelectionManagerTest::testCurrentItemAnchorItem()
 
     m_selectionManager->setAnchoredSelectionActive(true);
     QVERIFY(m_selectionManager->isAnchoredSelectionActive());
 
     m_selectionManager->setAnchoredSelectionActive(true);
     QVERIFY(m_selectionManager->isAnchoredSelectionActive());

-    m_selectionManager->setAnchoredSelectionMode(KItemListSelectionManager::Select);
-    QCOMPARE(m_selectionManager->anchoredSelectionMode(), KItemListSelectionManager::Select);

 
     // Set current item and check that the selection manager emits the currentChanged(int,int) signal correctly.
     m_selectionManager->setCurrentItem(4);
 
     // Set current item and check that the selection manager emits the currentChanged(int,int) signal correctly.
     m_selectionManager->setCurrentItem(4);