Port to KStandardAction::DeleteFile

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

diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp
index b41b699a9d612ee71837a0f0149768cf0898b7ee..18a79bd3f3c1c01bf3eb373d061351d641e4c5aa 100644 (file)
--- a/src/tests/kitemlistselectionmanagertest.cpp
+++ b/src/tests/kitemlistselectionmanagertest.cpp
@@ -18,18 +18,20 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

-#include <qtest.h>
-#include <QSignalSpy>

 #include "kitemviews/kitemmodelbase.h"
 #include "kitemviews/kitemlistselectionmanager.h"
 
 #include "kitemviews/kitemmodelbase.h"
 #include "kitemviews/kitemlistselectionmanager.h"
 

+#include <QTest>
+#include <QSignalSpy>
+

 class DummyModel : public KItemModelBase
 {
 class DummyModel : public KItemModelBase
 {

+    Q_OBJECT

 public:
     DummyModel();
     void setCount(int count);
 public:
     DummyModel();
     void setCount(int count);

-    virtual int count() const;
-    virtual QHash<QByteArray, QVariant> data(int index) const;
+    int count() const Q_DECL_OVERRIDE;
+    QHash<QByteArray, QVariant> data(int index) const Q_DECL_OVERRIDE;

 
 private:
     int m_count;
 
 private:
     int m_count;


@@ -321,12 +323,12 @@ namespace {
     };
 }
 
     };
 }
 

-Q_DECLARE_METATYPE(KItemSet);
-Q_DECLARE_METATYPE(ChangeType);
-Q_DECLARE_METATYPE(KItemRange);
-Q_DECLARE_METATYPE(KItemRangeList);
-Q_DECLARE_METATYPE(KItemListSelectionManager::SelectionMode);
-Q_DECLARE_METATYPE(QList<int>);
+Q_DECLARE_METATYPE(KItemSet)
+Q_DECLARE_METATYPE(ChangeType)
+Q_DECLARE_METATYPE(KItemRange)
+Q_DECLARE_METATYPE(KItemRangeList)
+Q_DECLARE_METATYPE(KItemListSelectionManager::SelectionMode)
+Q_DECLARE_METATYPE(QList<int>)

 
 /**
  * The following function provides a generic way to test the selection functionality.
 
 /**
  * The following function provides a generic way to test the selection functionality.


@@ -369,7 +371,7 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << 2 << 3
         << (KItemSet() << 2 << 3 << 5 << 6)
         << NoChange
         << 2 << 3
         << (KItemSet() << 2 << 3 << 5 << 6)
         << NoChange

-        << QList<QVariant>()
+        << QList<QVariant>{}

         << (KItemSet() << 2 << 3 << 5 << 6);
 
     QTest::newRow("Insert Items")
         << (KItemSet() << 2 << 3 << 5 << 6);
 
     QTest::newRow("Insert Items")


@@ -377,7 +379,7 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << 2 << 3
         << (KItemSet() << 2 << 3 << 5 << 6)
         << InsertItems
         << 2 << 3
         << (KItemSet() << 2 << 3 << 5 << 6)
         << InsertItems

-        << (QList<QVariant>() << QVariant::fromValue(KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 2) << KItemRange(10, 5)))
+        << QList<QVariant>{QVariant::fromValue(KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 2) << KItemRange(10, 5))}

         << (KItemSet() << 3 << 4 << 8 << 9);
 
     QTest::newRow("Remove Items")
         << (KItemSet() << 3 << 4 << 8 << 9);
 
     QTest::newRow("Remove Items")


@@ -385,7 +387,7 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << 2 << 3
         << (KItemSet() << 2 << 3 << 5 << 6)
         << RemoveItems
         << 2 << 3
         << (KItemSet() << 2 << 3 << 5 << 6)
         << RemoveItems

-        << (QList<QVariant>() << QVariant::fromValue(KItemRangeList() << KItemRange(1, 1) << KItemRange(3, 1) << KItemRange(10, 5)))
+        << QList<QVariant>{QVariant::fromValue(KItemRangeList() << KItemRange(1, 1) << KItemRange(3, 1) << KItemRange(10, 5))}

         << (KItemSet() << 1 << 2 << 3 << 4);
 
     QTest::newRow("Empty Anchored Selection")
         << (KItemSet() << 1 << 2 << 3 << 4);
 
     QTest::newRow("Empty Anchored Selection")


@@ -393,7 +395,7 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << 2 << 2
         << KItemSet()
         << EndAnchoredSelection
         << 2 << 2
         << KItemSet()
         << EndAnchoredSelection

-        << QList<QVariant>()
+        << QList<QVariant>{}

         << KItemSet();
 
     QTest::newRow("Toggle selection")
         << KItemSet();
 
     QTest::newRow("Toggle selection")


@@ -401,7 +403,7 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << 6 << 8
         << (KItemSet() << 1 << 3 << 4 << 6 << 7 << 8)
         << SetSelected
         << 6 << 8
         << (KItemSet() << 1 << 3 << 4 << 6 << 7 << 8)
         << SetSelected

-        << (QList<QVariant>() << 0 << 10 << QVariant::fromValue(KItemListSelectionManager::Toggle))
+        << QList<QVariant>{0, 10, QVariant::fromValue(KItemListSelectionManager::Toggle)}

         << (KItemSet() << 0 << 2 << 5 << 9);
 
     // Swap items 2, 3 and 4, 5
         << (KItemSet() << 0 << 2 << 5 << 9);
 
     // Swap items 2, 3 and 4, 5


@@ -410,8 +412,8 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << -1 << -1
         << (KItemSet() << 0 << 1 << 2 << 3)
         << MoveItems
         << -1 << -1
         << (KItemSet() << 0 << 1 << 2 << 3)
         << MoveItems

-        << (QList<QVariant>() << QVariant::fromValue(KItemRange(2, 4))
-                              << QVariant::fromValue(QList<int>() << 4 << 5 << 2 << 3))
+        << QList<QVariant>{QVariant::fromValue(KItemRange(2, 4)),
+                           QVariant::fromValue(QList<int>{4, 5, 2, 3})}

         << (KItemSet() << 0 << 1 << 4 << 5);
 
     QTest::newRow("Move items with active anchored selection")
         << (KItemSet() << 0 << 1 << 4 << 5);
 
     QTest::newRow("Move items with active anchored selection")


@@ -419,8 +421,8 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << 0 << 3
         << (KItemSet() << 0 << 1 << 2 << 3)
         << MoveItems
         << 0 << 3
         << (KItemSet() << 0 << 1 << 2 << 3)
         << MoveItems

-        << (QList<QVariant>() << QVariant::fromValue(KItemRange(2, 4))
-                              << QVariant::fromValue(QList<int>() << 4 << 5 << 2 << 3))
+        << QList<QVariant>{QVariant::fromValue(KItemRange(2, 4)),
+                           QVariant::fromValue(QList<int>{4, 5, 2, 3})}

         << (KItemSet() << 0 << 1 << 4 << 5);
 
     // Revert sort order
         << (KItemSet() << 0 << 1 << 4 << 5);
 
     // Revert sort order


@@ -429,8 +431,8 @@ void KItemListSelectionManagerTest::testChangeSelection_data()
         << 3 << 4
         << (KItemSet() << 0 << 1 << 3 << 4)
         << MoveItems
         << 3 << 4
         << (KItemSet() << 0 << 1 << 3 << 4)
         << MoveItems

-        << (QList<QVariant>() << QVariant::fromValue(KItemRange(0, 10))
-                              << QVariant::fromValue(QList<int>() << 9 << 8 << 7 << 6 << 5 << 4 << 3 << 2 << 1 << 0))
+        << QList<QVariant>{QVariant::fromValue(KItemRange(0, 10)),
+                           QVariant::fromValue(QList<int>{9, 8, 7, 6, 5, 4, 3, 2, 1, 0})}

         << (KItemSet() << 5 << 6 << 8 << 9);
 }
 
         << (KItemSet() << 5 << 6 << 8 << 9);
 }
 


@@ -476,7 +478,7 @@ void KItemListSelectionManagerTest::testChangeSelection()
         break;
     case MoveItems:
         m_selectionManager->itemsMoved(data.at(0).value<KItemRange>(),
         break;
     case MoveItems:
         m_selectionManager->itemsMoved(data.at(0).value<KItemRange>(),

-                                       data.at(1).value<QList<int> >());
+                                       data.at(1).value<QList<int>>());

         break;
     case EndAnchoredSelection:
         m_selectionManager->endAnchoredSelection();
         break;
     case EndAnchoredSelection:
         m_selectionManager->endAnchoredSelection();


@@ -535,7 +537,7 @@ void KItemListSelectionManagerTest::testAnchoredSelectionAfterMovingItems()
     m_selectionManager->beginAnchoredSelection(4);
 
     // Reverse the items between 0 and 5.
     m_selectionManager->beginAnchoredSelection(4);
 
     // Reverse the items between 0 and 5.

-    m_selectionManager->itemsMoved(KItemRange(0, 6), QList<int>() << 5 << 4 << 3 << 2 << 1 << 0);
+    m_selectionManager->itemsMoved(KItemRange(0, 6), {5, 4, 3, 2, 1, 0});

 
     QCOMPARE(m_selectionManager->currentItem(), 1);
     QCOMPARE(m_selectionManager->m_anchorItem, 1);
 
     QCOMPARE(m_selectionManager->currentItem(), 1);
     QCOMPARE(m_selectionManager->m_anchorItem, 1);


@@ -571,6 +573,6 @@ void KItemListSelectionManagerTest::verifySelectionChange(QSignalSpy& spy,
     }
 }
 
     }
 }
 

-QTEST_MAIN(KItemListSelectionManagerTest)
+QTEST_GUILESS_MAIN(KItemListSelectionManagerTest)

 
 #include "kitemlistselectionmanagertest.moc"
 
 #include "kitemlistselectionmanagertest.moc"