Merge branch 'master' into kf6

[dolphin.git] / src / tests / kitemlistcontrollertest.cpp

diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp
index a7842475a25e69476fa1e65d7952e969b9f30f15..f462947c6d667e45629073fb69fd545c3865ff4d 100644 (file)
--- a/src/tests/kitemlistcontrollertest.cpp
+++ b/src/tests/kitemlistcontrollertest.cpp
@@ -109,6 +109,9 @@ void KItemListControllerTest::initTestCase()
     m_view = new KFileItemListView();
     m_controller = new KItemListController(m_model, m_view, this);
     m_container = new KItemListContainer(m_controller);
+#ifndef QT_NO_ACCESSIBILITY
+    m_view->setAccessibleParentsObject(m_container);
+#endif
     m_controller = m_container->controller();
     m_controller->setSelectionBehavior(KItemListController::MultiSelection);
     m_selectionManager = m_controller->selectionManager();
@@ -292,9 +295,9 @@ void KItemListControllerTest::testKeyboardNavigation_data()
             break;
         }
 
-        for (int columnCount : qAsConst(columnCountList)) {
-            for (const KItemListController::SelectionBehavior &selectionBehavior : qAsConst(selectionBehaviorList)) {
-                for (bool groupingEnabled : qAsConst(groupingEnabledList)) {
+        for (int columnCount : std::as_const(columnCountList)) {
+            for (const KItemListController::SelectionBehavior &selectionBehavior : std::as_const(selectionBehaviorList)) {
+                for (bool groupingEnabled : std::as_const(groupingEnabledList)) {
                     QList<QPair<KeyPress, ViewState>> testList;
 
                     // First, key presses which should have the same effect
@@ -321,8 +324,7 @@ void KItemListControllerTest::testKeyboardNavigation_data()
                              << qMakePair(KeyPress(Qt::Key_Enter), ViewState(0, KItemSet(), true))
                              << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(0, KItemSet() << 0))
                              << qMakePair(KeyPress(Qt::Key_Space, Qt::ControlModifier), ViewState(0, KItemSet()))
-                             << qMakePair(KeyPress(Qt::Key_Space), ViewState(0, KItemSet())) // This used to select, but we are now using it to trigger either
-                             // selection mode or "QuickLook". Ctrl+Space still works for selecting as expected.
+                             << qMakePair(KeyPress(Qt::Key_Space), ViewState(0, KItemSet() << 0))
                              << qMakePair(KeyPress(Qt::Key_E), ViewState(13, KItemSet() << 13))
                              << qMakePair(KeyPress(Qt::Key_Space), ViewState(14, KItemSet() << 14))
                              << qMakePair(KeyPress(Qt::Key_3), ViewState(15, KItemSet() << 15))