┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kitemviews/kitemlistselectionmanager.cpp32
-rw-r--r--src/kitemviews/kitemlistselectionmanager.h5
-rw-r--r--src/tests/kitemlistselectionmanagertest.cpp2
3 files changed, 4 insertions, 35 deletions
diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp
index 7b7c6bc54..26ce1b2f7 100644
--- 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_anchoredSelectionMode(KItemListSelectionManager::Select),
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++) {
- 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
{
- 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)
@@ -162,10 +147,9 @@ void KItemListSelectionManager::clearSelection()
}
}
-void KItemListSelectionManager::beginAnchoredSelection(int anchor, SelectionMode mode)
+void KItemListSelectionManager::beginAnchoredSelection(int anchor)
{
Q_UNUSED(anchor);
- Q_UNUSED(mode);
}
void KItemListSelectionManager::endAnchoredSelection()
@@ -201,16 +185,6 @@ void KItemListSelectionManager::setAnchoredSelectionActive(bool 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;
diff --git a/src/kitemviews/kitemlistselectionmanager.h b/src/kitemviews/kitemlistselectionmanager.h
index 9de4c66b2..dd4c3e4fc 100644
--- 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 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);
- SelectionMode anchoredSelectionMode() const;
- void setAnchoredSelectionMode(SelectionMode mode);
KItemModelBase* model() const;
@@ -86,7 +84,6 @@ private:
int m_anchorItem;
QSet<int> m_selectedItems;
bool m_isAnchoredSelectionActive;
- SelectionMode m_anchoredSelectionMode;
KItemModelBase* m_model;
diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp
index 2832a4c76..9063b7884 100644
--- 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->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);