Port from KIconLoader::drawOverlays to KIconUtils::addOverlays

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

diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp
index ce0dc06debef97e0a7e2f22647ca6f5e3c181910..6f7f0e0776121850799674817736f7522277f51a 100644 (file)
--- a/src/kitemviews/kitemlistselectionmanager.cpp
+++ b/src/kitemviews/kitemlistselectionmanager.cpp
@@ -9,13 +9,13 @@
 
 #include "kitemlistselectionmanager.h"
 
 
 #include "kitemlistselectionmanager.h"
 

-KItemListSelectionManager::KItemListSelectionManager(QObject* parent) :
-    QObject(parent),
-    m_currentItem(-1),
-    m_anchorItem(-1),
-    m_selectedItems(),
-    m_isAnchoredSelectionActive(false),
-    m_model(nullptr)
+KItemListSelectionManager::KItemListSelectionManager(QObject *parent)
+    : QObject(parent)
+    , m_currentItem(-1)
+    , m_anchorItem(-1)
+    , m_selectedItems()
+    , m_isAnchoredSelectionActive(false)
+    , m_model(nullptr)

 {
 }
 
 {
 }
 


@@ -51,7 +51,7 @@ int KItemListSelectionManager::currentItem() const
     return m_currentItem;
 }
 
     return m_currentItem;
 }
 

-void KItemListSelectionManager::setSelectedItems(const KItemSet& items)
+void KItemListSelectionManager::setSelectedItems(const KItemSet &items)

 {
     if (m_selectedItems != items) {
         const KItemSet previous = m_selectedItems;
 {
     if (m_selectedItems != items) {
         const KItemSet previous = m_selectedItems;


@@ -114,7 +114,7 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode
 
     count = qMin(count, m_model->count() - index);
 
 
     count = qMin(count, m_model->count() - index);
 

-    const int endIndex = index + count -1;
+    const int endIndex = index + count - 1;

     switch (mode) {
     case Select:
         for (int i = index; i <= endIndex; ++i) {
     switch (mode) {
     case Select:
         for (int i = index; i <= endIndex; ++i) {


@@ -198,12 +198,12 @@ bool KItemListSelectionManager::isAnchoredSelectionActive() const
     return m_isAnchoredSelectionActive;
 }
 
     return m_isAnchoredSelectionActive;
 }
 

-KItemModelBase* KItemListSelectionManager::model() const
+KItemModelBase *KItemListSelectionManager::model() const

 {
     return m_model;
 }
 
 {
     return m_model;
 }
 

-void KItemListSelectionManager::setModel(KItemModelBase* model)
+void KItemListSelectionManager::setModel(KItemModelBase *model)

 {
     m_model = model;
     if (model && model->count() > 0) {
 {
     m_model = model;
     if (model && model->count() > 0) {


@@ -211,7 +211,7 @@ void KItemListSelectionManager::setModel(KItemModelBase* model)
     }
 }
 
     }
 }
 

-void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
+void KItemListSelectionManager::itemsInserted(const KItemRangeList &itemRanges)

 {
     // Store the current selection (needed in the selectionChanged() signal)
     const KItemSet previousSelection = selectedItems();
 {
     // Store the current selection (needed in the selectionChanged() signal)
     const KItemSet previousSelection = selectedItems();


@@ -222,7 +222,7 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
     } else {
         const int previousCurrent = m_currentItem;
         int inc = 0;
     } else {
         const int previousCurrent = m_currentItem;
         int inc = 0;

-        for (const KItemRange& itemRange : itemRanges) {
+        for (const KItemRange &itemRange : itemRanges) {

             if (m_currentItem < itemRange.index) {
                 break;
             }
             if (m_currentItem < itemRange.index) {
                 break;
             }


@@ -242,7 +242,7 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
         m_anchorItem = 0;
     } else {
         int inc = 0;
         m_anchorItem = 0;
     } else {
         int inc = 0;

-        for (const KItemRange& itemRange : itemRanges) {
+        for (const KItemRange &itemRange : itemRanges) {

             if (m_anchorItem < itemRange.index) {
                 break;
             }
             if (m_anchorItem < itemRange.index) {
                 break;
             }


@@ -256,9 +256,9 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
         const KItemSet previous = m_selectedItems;
         m_selectedItems.clear();
 
         const KItemSet previous = m_selectedItems;
         m_selectedItems.clear();
 

-        for (int index: previous) {
+        for (int index : previous) {

             int inc = 0;
             int inc = 0;

-            for (const KItemRange& itemRange : itemRanges) {
+            for (const KItemRange &itemRange : itemRanges) {

                 if (index < itemRange.index) {
                     break;
                 }
                 if (index < itemRange.index) {
                     break;
                 }


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

-void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
+void KItemListSelectionManager::itemsRemoved(const KItemRangeList &itemRanges)

 {
     // Store the current selection (needed in the selectionChanged() signal)
     const KItemSet previousSelection = selectedItems();
 {
     // Store the current selection (needed in the selectionChanged() signal)
     const KItemSet previousSelection = selectedItems();


@@ -307,7 +307,7 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
 
         for (int oldIndex : previous) {
             const int index = indexAfterRangesRemoving(oldIndex, itemRanges, DiscardRemovedIndex);
 
         for (int oldIndex : previous) {
             const int index = indexAfterRangesRemoving(oldIndex, itemRanges, DiscardRemovedIndex);

-            if (index >= 0)  {
+            if (index >= 0) {

                 m_selectedItems.insert(index);
             }
         }
                 m_selectedItems.insert(index);
             }
         }


@@ -322,7 +322,7 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
     Q_ASSERT(m_anchorItem < m_model->count());
 }
 
     Q_ASSERT(m_anchorItem < m_model->count());
 }
 

-void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QList<int>& movedToIndexes)
+void KItemListSelectionManager::itemsMoved(const KItemRange &itemRange, const QList<int> &movedToIndexes)

 {
     // Store the current selection (needed in the selectionChanged() signal)
     const KItemSet previousSelection = selectedItems();
 {
     // Store the current selection (needed in the selectionChanged() signal)
     const KItemSet previousSelection = selectedItems();


@@ -359,8 +359,7 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL
         for (int index : previous) {
             if (index >= itemRange.index && index < itemRange.index + itemRange.count) {
                 m_selectedItems.insert(movedToIndexes.at(index - itemRange.index));
         for (int index : previous) {
             if (index >= itemRange.index && index < itemRange.index + itemRange.count) {
                 m_selectedItems.insert(movedToIndexes.at(index - itemRange.index));

-            }
-            else {
+            } else {

                 m_selectedItems.insert(index);
             }
         }
                 m_selectedItems.insert(index);
             }
         }


@@ -372,11 +371,10 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL
     }
 }
 
     }
 }
 

-int KItemListSelectionManager::indexAfterRangesRemoving(int index, const KItemRangeList& itemRanges,
-                                                        const RangesRemovingBehaviour behaviour) const
+int KItemListSelectionManager::indexAfterRangesRemoving(int index, const KItemRangeList &itemRanges, const RangesRemovingBehaviour behaviour) const

 {
     int dec = 0;
 {
     int dec = 0;

-    for (const KItemRange& itemRange : itemRanges) {
+    for (const KItemRange &itemRange : itemRanges) {

         if (index < itemRange.index) {
             break;
         }
         if (index < itemRange.index) {
             break;
         }


@@ -398,3 +396,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 "moc_kitemlistselectionmanager.cpp"