Merge remote-tracking branch 'origin/KDE/4.11' into KDE/4.12

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

diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 158c12de1d38deb475efc9c295e730f6f18bf611..7344b9960f07ec72eb7f47d6a76caa66b063d75c 100644 (file)
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -364,11 +364,11 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
 
     case Qt::Key_Enter:
     case Qt::Key_Return: {
 
     case Qt::Key_Enter:
     case Qt::Key_Return: {

-        const QSet<int> selectedItems = m_selectionManager->selectedItems();
+        const KItemSet selectedItems = m_selectionManager->selectedItems();

         if (selectedItems.count() >= 2) {
             emit itemsActivated(selectedItems);
         } else if (selectedItems.count() == 1) {
         if (selectedItems.count() >= 2) {
             emit itemsActivated(selectedItems);
         } else if (selectedItems.count() == 1) {

-            emit itemActivated(selectedItems.toList().first());
+            emit itemActivated(selectedItems.first());

         } else {
             emit itemActivated(index);
         }
         } else {
             emit itemActivated(index);
         }


@@ -378,14 +378,14 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
     case Qt::Key_Menu: {
         // Emit the signal itemContextMenuRequested() in case if at least one
         // item is selected. Otherwise the signal viewContextMenuRequested() will be emitted.
     case Qt::Key_Menu: {
         // Emit the signal itemContextMenuRequested() in case if at least one
         // item is selected. Otherwise the signal viewContextMenuRequested() will be emitted.

-        const QSet<int> selectedItems = m_selectionManager->selectedItems();
+        const KItemSet selectedItems = m_selectionManager->selectedItems();

         int index = -1;
         if (selectedItems.count() >= 2) {
             const int currentItemIndex = m_selectionManager->currentItem();
             index = selectedItems.contains(currentItemIndex)
         int index = -1;
         if (selectedItems.count() >= 2) {
             const int currentItemIndex = m_selectionManager->currentItem();
             index = selectedItems.contains(currentItemIndex)

-                    ? currentItemIndex : selectedItems.toList().first();
+                    ? currentItemIndex : selectedItems.first();

         } else if (selectedItems.count() == 1) {
         } else if (selectedItems.count() == 1) {

-            index = selectedItems.toList().first();
+            index = selectedItems.first();

         }
 
         if (index >= 0) {
         }
 
         if (index >= 0) {


@@ -403,6 +403,7 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
             m_selectionManager->clearSelection();
         }
         m_keyboardManager->cancelSearch();
             m_selectionManager->clearSelection();
         }
         m_keyboardManager->cancelSearch();

+        emit escapePressed();

         break;
 
     case Qt::Key_Space:
         break;
 
     case Qt::Key_Space:


@@ -1086,7 +1087,7 @@ void KItemListController::slotRubberBandChanged()
         }
     }
 
         }
     }
 

-    QSet<int> selectedItems;
+    KItemSet selectedItems;

 
     // Select all visible items that intersect with the rubberband
     foreach (const KItemListWidget* widget, m_view->visibleItemListWidgets()) {
 
     // Select all visible items that intersect with the rubberband
     foreach (const KItemListWidget* widget, m_view->visibleItemListWidgets()) {


@@ -1134,7 +1135,7 @@ void KItemListController::slotRubberBandChanged()
         // Therefore, the new selection contains:
         // 1. All previously selected items which are not inside the rubberband, and
         // 2. all items inside the rubberband which have not been selected previously.
         // Therefore, the new selection contains:
         // 1. All previously selected items which are not inside the rubberband, and
         // 2. all items inside the rubberband which have not been selected previously.

-        m_selectionManager->setSelectedItems((m_oldSelection - selectedItems) + (selectedItems - m_oldSelection));
+        m_selectionManager->setSelectedItems(m_oldSelection ^ selectedItems);

     }
     else {
         m_selectionManager->setSelectedItems(selectedItems + m_oldSelection);
     }
     else {
         m_selectionManager->setSelectedItems(selectedItems + m_oldSelection);


@@ -1147,7 +1148,7 @@ void KItemListController::startDragging()
         return;
     }
 
         return;
     }
 

-    const QSet<int> selectedItems = m_selectionManager->selectedItems();
+    const KItemSet selectedItems = m_selectionManager->selectedItems();

     if (selectedItems.isEmpty()) {
         return;
     }
     if (selectedItems.isEmpty()) {
         return;
     }