diff options
| author | Frank Reininghaus <[email protected]> | 2011-08-10 13:53:41 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2011-08-10 13:53:41 +0200 |
| commit | 2e3b7e6dd3b051b3d9cb9799e1dd22f8376d2957 (patch) | |
| tree | a8237524a85ce08e18387a7144f25a2c6cb63db8 /src/kitemviews/kitemlistselectionmanager.cpp | |
| parent | 258a29f61fb379b6a259070213cd68ffa56d6d2d (diff) | |
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.
Diffstat (limited to 'src/kitemviews/kitemlistselectionmanager.cpp')
| -rw-r--r-- | src/kitemviews/kitemlistselectionmanager.cpp | 32 |
1 files changed, 3 insertions, 29 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; |
