SVN_SILENT made messages (.desktop file) - always resolve ours

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

diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp
index 3cb051a23d5561b38e3e7c2c993f064fb354d900..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)

 {
 }
 
 {
 }
 


@@ -35,12 +35,12 @@ void KItemListSelectionManager::setCurrentItem(int current)
     }
 
     if (m_currentItem != previous) {
     }
 
     if (m_currentItem != previous) {

-        emit currentChanged(m_currentItem, previous);
+        Q_EMIT currentChanged(m_currentItem, previous);

 
         if (m_isAnchoredSelectionActive) {
             const KItemSet selection = selectedItems();
             if (selection != previousSelection) {
 
         if (m_isAnchoredSelectionActive) {
             const KItemSet selection = selectedItems();
             if (selection != previousSelection) {

-                emit selectionChanged(selection, previousSelection);
+                Q_EMIT selectionChanged(selection, previousSelection);

             }
         }
     }
             }
         }
     }


@@ -51,12 +51,12 @@ 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;
         m_selectedItems = items;
 {
     if (m_selectedItems != items) {
         const KItemSet previous = m_selectedItems;
         m_selectedItems = items;

-        emit selectionChanged(m_selectedItems, previous);
+        Q_EMIT selectionChanged(m_selectedItems, previous);

     }
 }
 
     }
 }
 


@@ -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) {


@@ -145,7 +145,7 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode
 
     const KItemSet selection = selectedItems();
     if (selection != previous) {
 
     const KItemSet selection = selectedItems();
     if (selection != previous) {

-        emit selectionChanged(selection, previous);
+        Q_EMIT selectionChanged(selection, previous);

     }
 }
 
     }
 }
 


@@ -155,7 +155,7 @@ void KItemListSelectionManager::clearSelection()
     if (!previous.isEmpty()) {
         m_selectedItems.clear();
         m_isAnchoredSelectionActive = false;
     if (!previous.isEmpty()) {
         m_selectedItems.clear();
         m_isAnchoredSelectionActive = false;

-        emit selectionChanged(KItemSet(), previous);
+        Q_EMIT selectionChanged(KItemSet(), previous);

     }
 }
 
     }
 }
 


@@ -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;

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

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


@@ -234,7 +234,7 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
         if (m_currentItem >= m_model->count()) {
             m_currentItem = -1;
         }
         if (m_currentItem >= m_model->count()) {
             m_currentItem = -1;
         }

-        emit currentChanged(m_currentItem, previousCurrent);
+        Q_EMIT currentChanged(m_currentItem, previousCurrent);

     }
 
     // Update the anchor item
     }
 
     // Update the anchor item


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

-        foreach (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;

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

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


@@ -270,11 +270,11 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
 
     const KItemSet selection = selectedItems();
     if (selection != previousSelection) {
 
     const KItemSet selection = selectedItems();
     if (selection != previousSelection) {

-        emit selectionChanged(selection, previousSelection);
+        Q_EMIT selectionChanged(selection, previousSelection);

     }
 }
 
     }
 }
 

-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();


@@ -283,12 +283,12 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
     // Update the current item
     m_currentItem = indexAfterRangesRemoving(m_currentItem, itemRanges, DiscardRemovedIndex);
     if (m_currentItem != previousCurrent) {
     // Update the current item
     m_currentItem = indexAfterRangesRemoving(m_currentItem, itemRanges, DiscardRemovedIndex);
     if (m_currentItem != previousCurrent) {

-        emit currentChanged(m_currentItem, previousCurrent);
+        Q_EMIT currentChanged(m_currentItem, previousCurrent);

         if (m_currentItem < 0) {
             // Calling setCurrentItem() would trigger the selectionChanged signal, but we want to
             // emit it only once in this function -> change the current item manually and emit currentChanged
             m_currentItem = indexAfterRangesRemoving(previousCurrent, itemRanges, AdjustRemovedIndex);
         if (m_currentItem < 0) {
             // Calling setCurrentItem() would trigger the selectionChanged signal, but we want to
             // emit it only once in this function -> change the current item manually and emit currentChanged
             m_currentItem = indexAfterRangesRemoving(previousCurrent, itemRanges, AdjustRemovedIndex);

-            emit currentChanged(m_currentItem, -1);
+            Q_EMIT currentChanged(m_currentItem, -1);

         }
     }
 
         }
     }
 


@@ -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);
             }
         }


@@ -315,14 +315,14 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
 
     const KItemSet selection = selectedItems();
     if (selection != previousSelection) {
 
     const KItemSet selection = selectedItems();
     if (selection != previousSelection) {

-        emit selectionChanged(selection, previousSelection);
+        Q_EMIT selectionChanged(selection, previousSelection);

     }
 
     Q_ASSERT(m_currentItem < m_model->count());
     Q_ASSERT(m_anchorItem < m_model->count());
 }
 
     }
 
     Q_ASSERT(m_currentItem < 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();


@@ -343,7 +343,7 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL
         // Calling setCurrentItem would trigger the selectionChanged signal, but we want to
         // emit it only once in this function -> change the current item manually and emit currentChanged
         m_currentItem = newCurrentItem;
         // Calling setCurrentItem would trigger the selectionChanged signal, but we want to
         // emit it only once in this function -> change the current item manually and emit currentChanged
         m_currentItem = newCurrentItem;

-        emit currentChanged(newCurrentItem, previousCurrentItem);
+        Q_EMIT currentChanged(newCurrentItem, previousCurrentItem);

     }
 
     // Start a new anchored selection.
     }
 
     // Start a new anchored selection.


@@ -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);
             }
         }


@@ -368,15 +367,14 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL
 
     const KItemSet selection = selectedItems();
     if (selection != previousSelection) {
 
     const KItemSet selection = selectedItems();
     if (selection != previousSelection) {

-        emit selectionChanged(selection, previousSelection);
+        Q_EMIT selectionChanged(selection, previousSelection);

     }
 }
 
     }
 }
 

-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;

-    foreach (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"