Fix wrong window titles

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

diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp
index 48e8dce04d6f6bb0c3efd4f54fed83f60c8580f8..0655dcfb0bf4732bd185fffc80358bac03708a2b 100644 (file)
--- a/src/tests/kitemlistselectionmanagertest.cpp
+++ b/src/tests/kitemlistselectionmanagertest.cpp
@@ -30,8 +30,8 @@ class DummyModel : public KItemModelBase
 public:
     DummyModel();
     void setCount(int count);
 public:
     DummyModel();
     void setCount(int count);

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

 
 private:
     int m_count;
 
 private:
     int m_count;


@@ -99,10 +99,10 @@ void KItemListSelectionManagerTest::init()
 void KItemListSelectionManagerTest::cleanup()
 {
     delete m_selectionManager;
 void KItemListSelectionManagerTest::cleanup()
 {
     delete m_selectionManager;

-    m_selectionManager = 0;
+    m_selectionManager = nullptr;

 
     delete m_model;
 
     delete m_model;

-    m_model = 0;
+    m_model = nullptr;

 }
 
 void KItemListSelectionManagerTest::testConstructor()
 }
 
 void KItemListSelectionManagerTest::testConstructor()


@@ -115,7 +115,7 @@ void KItemListSelectionManagerTest::testConstructor()
 
 void KItemListSelectionManagerTest::testCurrentItemAnchorItem()
 {
 
 void KItemListSelectionManagerTest::testCurrentItemAnchorItem()
 {

-    QSignalSpy spyCurrent(m_selectionManager, SIGNAL(currentChanged(int,int)));
+    QSignalSpy spyCurrent(m_selectionManager, &KItemListSelectionManager::currentChanged);

 
     // Set current item and check that the selection manager emits the currentChanged(int,int) signal correctly.
     m_selectionManager->setCurrentItem(4);
 
     // Set current item and check that the selection manager emits the currentChanged(int,int) signal correctly.
     m_selectionManager->setCurrentItem(4);


@@ -445,13 +445,13 @@ void KItemListSelectionManagerTest::testChangeSelection()
     QFETCH(QList<QVariant>, data);
     QFETCH(KItemSet, finalSelection);
 
     QFETCH(QList<QVariant>, data);
     QFETCH(KItemSet, finalSelection);
 

-    QSignalSpy spySelectionChanged(m_selectionManager, SIGNAL(selectionChanged(KItemSet,KItemSet)));
+    QSignalSpy spySelectionChanged(m_selectionManager, &KItemListSelectionManager::selectionChanged);

 
     // Initial selection should be empty
     QVERIFY(!m_selectionManager->hasSelection());
     QVERIFY(m_selectionManager->selectedItems().isEmpty());
 
 
     // Initial selection should be empty
     QVERIFY(!m_selectionManager->hasSelection());
     QVERIFY(m_selectionManager->selectedItems().isEmpty());
 

-    // Perform the initial selectiion
+    // Perform the initial selection

     m_selectionManager->setSelectedItems(initialSelection);
 
     verifySelectionChange(spySelectionChanged, initialSelection, KItemSet());
     m_selectionManager->setSelectedItems(initialSelection);
 
     verifySelectionChange(spySelectionChanged, initialSelection, KItemSet());