Merge branch 'release/20.12'

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

diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 172b57e92db73a7af82edad9467273c737970db9..5c9a2bbdd35bf3acd51d683f5397db06e1c0015c 100644 (file)
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -26,6 +26,7 @@
 #include <QGraphicsView>
 #include <QMimeData>
 #include <QTimer>
+#include <QTouchEvent>
 
 KItemListController::KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent) :
     QObject(parent),
@@ -109,7 +110,7 @@ void KItemListController::setModel(KItemModelBase* model)
 
     m_selectionManager->setModel(m_model);
 
-    emit modelChanged(m_model, oldModel);
+    Q_EMIT modelChanged(m_model, oldModel);
 }
 
 KItemModelBase* KItemListController::model() const
@@ -144,7 +145,7 @@ void KItemListController::setView(KItemListView* view)
         updateExtendedSelectionRegion();
     }
 
-    emit viewChanged(m_view, oldView);
+    Q_EMIT viewChanged(m_view, oldView);
 }
 
 KItemListView* KItemListController::view() const
@@ -372,11 +373,11 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
     case Qt::Key_Return: {
         const KItemSet selectedItems = m_selectionManager->selectedItems();
         if (selectedItems.count() >= 2) {
-            emit itemsActivated(selectedItems);
+            Q_EMIT itemsActivated(selectedItems);
         } else if (selectedItems.count() == 1) {
-            emit itemActivated(selectedItems.first());
+            Q_EMIT itemActivated(selectedItems.first());
         } else {
-            emit itemActivated(index);
+            Q_EMIT itemActivated(index);
         }
         break;
     }
@@ -397,9 +398,9 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
         if (index >= 0) {
             const QRectF contextRect = m_view->itemContextRect(index);
             const QPointF pos(m_view->scene()->views().first()->mapToGlobal(contextRect.bottomRight().toPoint()));
-            emit itemContextMenuRequested(index, pos);
+            Q_EMIT itemContextMenuRequested(index, pos);
         } else {
-            emit viewContextMenuRequested(QCursor::pos());
+            Q_EMIT viewContextMenuRequested(QCursor::pos());
         }
         break;
     }
@@ -409,7 +410,7 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
             m_selectionManager->clearSelection();
         }
         m_keyboardManager->cancelSearch();
-        emit escapePressed();
+        Q_EMIT escapePressed();
         break;
 
     case Qt::Key_Space:
@@ -523,7 +524,7 @@ void KItemListController::slotAutoActivationTimeout()
             const bool expanded = m_model->isExpanded(index);
             m_model->setExpanded(index, !expanded);
         } else if (m_autoActivationBehavior != ExpansionOnly) {
-            emit itemActivated(index);
+            Q_EMIT itemActivated(index);
         }
     }
 }
@@ -556,12 +557,6 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
         return false;
     }
 
-    if (buttons & (Qt::BackButton | Qt::ForwardButton)) {
-        // Do not select items when clicking the back/forward buttons, see
-        // https://bugs.kde.org/show_bug.cgi?id=327412.
-        return true;
-    }
-
     return true;
 }
 
@@ -647,7 +642,7 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con
         return false;
     }
 
-    emit mouseButtonReleased(m_pressedIndex, event->buttons());
+    Q_EMIT mouseButtonReleased(m_pressedIndex, event->buttons());
 
     return onRelease(transform.map(event->pos()), event->modifiers(), event->button(), false);
 }
@@ -669,13 +664,13 @@ bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event,
         m_selectionManager->clearSelection();
         if (index >= 0) {
             m_selectionManager->setSelected(index);
-            emit itemContextMenuRequested(index, event->screenPos());
+            Q_EMIT itemContextMenuRequested(index, event->screenPos());
         } else {
             const QRectF headerBounds = m_view->headerBoundaries();
             if (headerBounds.contains(event->pos())) {
-                emit headerContextMenuRequested(event->screenPos());
+                Q_EMIT headerContextMenuRequested(event->screenPos());
             } else {
-                emit viewContextMenuRequested(event->screenPos());
+                Q_EMIT viewContextMenuRequested(event->screenPos());
             }
         }
         return true;
@@ -685,7 +680,7 @@ bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event,
                              (event->button() & Qt::LeftButton) &&
                              index >= 0 && index < m_model->count();
     if (emitItemActivated) {
-        emit itemActivated(index);
+        Q_EMIT itemActivated(index);
     }
     return false;
 }
@@ -712,7 +707,7 @@ bool KItemListController::dragLeaveEvent(QGraphicsSceneDragDropEvent* event, con
     KItemListWidget* widget = hoveredWidget();
     if (widget) {
         widget->setHovered(false);
-        emit itemUnhovered(widget->index());
+        Q_EMIT itemUnhovered(widget->index());
     }
     return false;
 }
@@ -735,7 +730,7 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
 
         if (oldHoveredWidget) {
             oldHoveredWidget->setHovered(false);
-            emit itemUnhovered(oldHoveredWidget->index());
+            Q_EMIT itemUnhovered(oldHoveredWidget->index());
         }
     }
 
@@ -758,7 +753,7 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
                 m_view->hideDropIndicator();
                 if (!newHoveredWidget->isHovered()) {
                     newHoveredWidget->setHovered(true);
-                    emit itemHovered(index);
+                    Q_EMIT itemHovered(index);
                 }
 
                 if (!m_autoActivationTimer->isActive() && m_autoActivationTimer->interval() >= 0) {
@@ -770,7 +765,7 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
             m_autoActivationTimer->stop();
             if (newHoveredWidget && newHoveredWidget->isHovered()) {
                 newHoveredWidget->setHovered(false);
-                emit itemUnhovered(index);
+                Q_EMIT itemUnhovered(index);
             }
         }
     } else {
@@ -807,10 +802,10 @@ bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QT
     if (dropAboveIndex >= 0) {
         // Something has been dropped between two items.
         m_view->hideDropIndicator();
-        emit aboveItemDropEvent(dropAboveIndex, event);
+        Q_EMIT aboveItemDropEvent(dropAboveIndex, event);
     } else if (!event->mimeData()->hasFormat(m_model->blacklistItemDropEventMimeType())) {
         // Something has been dropped on an item or on an empty part of the view.
-        emit itemDropEvent(m_view->itemAt(pos), event);
+        Q_EMIT itemDropEvent(m_view->itemAt(pos), event);
     }
 
     QAccessibleEvent accessibilityEvent(view(), QAccessible::DragDropEnd);
@@ -840,14 +835,14 @@ bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent* event, const
     if (oldHoveredWidget != newHoveredWidget) {
         if (oldHoveredWidget) {
             oldHoveredWidget->setHovered(false);
-            emit itemUnhovered(oldHoveredWidget->index());
+            Q_EMIT itemUnhovered(oldHoveredWidget->index());
         }
 
         if (newHoveredWidget) {
             newHoveredWidget->setHovered(true);
             const QPointF mappedPos = newHoveredWidget->mapFromItem(m_view, pos);
             newHoveredWidget->setHoverPosition(mappedPos);
-            emit itemHovered(newHoveredWidget->index());
+            Q_EMIT itemHovered(newHoveredWidget->index());
         }
     } else if (oldHoveredWidget) {
         const QPointF mappedPos = oldHoveredWidget->mapFromItem(m_view, pos);
@@ -869,10 +864,11 @@ bool KItemListController::hoverLeaveEvent(QGraphicsSceneHoverEvent* event, const
         return false;
     }
 
-    foreach (KItemListWidget* widget, m_view->visibleItemListWidgets()) {
+    const auto widgets = m_view->visibleItemListWidgets();
+    for (KItemListWidget* widget : widgets) {
         if (widget->isHovered()) {
             widget->setHovered(false);
-            emit itemUnhovered(widget->index());
+            Q_EMIT itemUnhovered(widget->index());
         }
     }
     return false;
@@ -936,7 +932,7 @@ bool KItemListController::gestureEvent(QGestureEvent* event, const QTransform& t
     return accepted;
 }
 
-bool KItemListController::touchBeginEvent(QGestureEvent* event, const QTransform& transform)
+bool KItemListController::touchBeginEvent(QTouchEvent* event, const QTransform& transform)
 {
     Q_UNUSED(event)
     Q_UNUSED(transform)
@@ -1010,7 +1006,7 @@ void KItemListController::tapAndHoldTriggered(QGestureEvent* event, const QTrans
             startRubberBand();
         }
 
-        emit scrollerStop();
+        Q_EMIT scrollerStop();
 
         m_view->m_tapAndHoldIndicator->setStartPosition(m_pressedMousePos);
         m_view->m_tapAndHoldIndicator->setActive(true);
@@ -1038,10 +1034,10 @@ void KItemListController::pinchTriggered(QGestureEvent* event, const QTransform&
         }
         counter = counter + (pinch->scaleFactor() - 1);
         if (counter >= sensitivityModifier) {
-            emit increaseZoom();
+            Q_EMIT increaseZoom();
             counter = 0;
         } else if (counter <= -sensitivityModifier) {
-            emit decreaseZoom();
+            Q_EMIT decreaseZoom();
             counter = 0;
         }
     }
@@ -1065,14 +1061,14 @@ void KItemListController::swipeTriggered(QGestureEvent* event, const QTransform&
     }
 
     if (swipe->state() == Qt::GestureFinished) {
-        emit scrollerStop();
+        Q_EMIT scrollerStop();
 
         if (swipe->swipeAngle() <= 20 || swipe->swipeAngle() >= 340) {
-            emit mouseButtonPressed(m_pressedIndex, Qt::BackButton);
+            Q_EMIT mouseButtonPressed(m_pressedIndex, Qt::BackButton);
         } else if (swipe->swipeAngle() <= 200 && swipe->swipeAngle() >= 160) {
-            emit mouseButtonPressed(m_pressedIndex, Qt::ForwardButton);
+            Q_EMIT mouseButtonPressed(m_pressedIndex, Qt::ForwardButton);
         } else if (swipe->swipeAngle() <= 110 && swipe->swipeAngle() >= 60) {
-            emit swipeUp();
+            Q_EMIT swipeUp();
         }
         m_isSwipeGesture = true;
     }
@@ -1137,7 +1133,7 @@ bool KItemListController::processEvent(QEvent* event, const QTransform& transfor
     case QEvent::Gesture:
         return gestureEvent(static_cast<QGestureEvent*>(event), transform);
     case QEvent::TouchBegin:
-        return touchBeginEvent();
+        return touchBeginEvent(static_cast<QTouchEvent*>(event), transform);
     default:
         break;
     }
@@ -1200,7 +1196,8 @@ void KItemListController::slotRubberBandChanged()
     KItemSet selectedItems;
 
     // Select all visible items that intersect with the rubberband
-    foreach (const KItemListWidget* widget, m_view->visibleItemListWidgets()) {
+    const auto widgets = m_view->visibleItemListWidgets();
+    for (const KItemListWidget* widget : widgets) {
         const int index = widget->index();
 
         const QRectF widgetRect = m_view->itemRect(index);
@@ -1289,7 +1286,8 @@ KItemListWidget* KItemListController::hoveredWidget() const
 {
     Q_ASSERT(m_view);
 
-    foreach (KItemListWidget* widget, m_view->visibleItemListWidgets()) {
+    const auto widgets = m_view->visibleItemListWidgets();
+    for (KItemListWidget* widget : widgets) {
         if (widget->isHovered()) {
             return widget;
         }
@@ -1302,7 +1300,8 @@ KItemListWidget* KItemListController::widgetForPos(const QPointF& pos) const
 {
     Q_ASSERT(m_view);
 
-    foreach (KItemListWidget* widget, m_view->visibleItemListWidgets()) {
+    const auto widgets = m_view->visibleItemListWidgets();
+    for (KItemListWidget* widget : widgets) {
         const QPointF mappedPos = widget->mapFromItem(m_view, pos);
 
         const bool hovered = widget->contains(mappedPos) &&
@@ -1420,7 +1419,13 @@ void KItemListController::updateExtendedSelectionRegion()
 
 bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, const Qt::KeyboardModifiers modifiers, const Qt::MouseButtons buttons)
 {
-    emit mouseButtonPressed(m_pressedIndex, buttons);
+    Q_EMIT mouseButtonPressed(m_pressedIndex, buttons);
+
+    if (buttons & (Qt::BackButton | Qt::ForwardButton)) {
+        // Do not select items when clicking the back/forward buttons, see
+        // https://bugs.kde.org/show_bug.cgi?id=327412.
+        return true;
+    }
 
     if (m_view->isAboveExpansionToggle(m_pressedIndex, m_pressedMousePos)) {
         m_selectionManager->endAnchoredSelection();
@@ -1465,7 +1470,7 @@ bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, c
         m_clearSelectionIfItemsAreNotDragged = true;
 
         if (m_selectionManager->selectedItems().count() == 1 && m_view->isAboveText(m_pressedIndex, m_pressedMousePos)) {
-            emit selectedItemTextPressed(m_pressedIndex);
+            Q_EMIT selectedItemTextPressed(m_pressedIndex);
         }
     }
 
@@ -1512,7 +1517,7 @@ bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, c
         }
 
         if (buttons & Qt::RightButton) {
-            emit itemContextMenuRequested(m_pressedIndex, screenPos);
+            Q_EMIT itemContextMenuRequested(m_pressedIndex, screenPos);
         }
 
         return true;
@@ -1521,9 +1526,9 @@ bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, c
     if (buttons & Qt::RightButton) {
         const QRectF headerBounds = m_view->headerBoundaries();
         if (headerBounds.contains(pos)) {
-            emit headerContextMenuRequested(screenPos);
+            Q_EMIT headerContextMenuRequested(screenPos);
         } else {
-            emit viewContextMenuRequested(screenPos);
+            Q_EMIT viewContextMenuRequested(screenPos);
         }
         return true;
     }
@@ -1575,7 +1580,7 @@ bool KItemListController::onRelease(const QPointF& pos, const Qt::KeyboardModifi
                 const bool expanded = m_model->isExpanded(index);
                 m_model->setExpanded(index, !expanded);
 
-                emit itemExpansionToggleClicked(index);
+                Q_EMIT itemExpansionToggleClicked(index);
                 emitItemActivated = false;
             } else if (shiftOrControlPressed) {
                 // The mouse click should only update the selection, not trigger the item
@@ -1588,10 +1593,10 @@ bool KItemListController::onRelease(const QPointF& pos, const Qt::KeyboardModifi
                 }
             }
             if (emitItemActivated) {
-                emit itemActivated(index);
+                Q_EMIT itemActivated(index);
             }
         } else if (buttons & Qt::MiddleButton) {
-            emit itemMiddleClicked(index);
+            Q_EMIT itemMiddleClicked(index);
         }
     }