X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/96eff55e75bfd0f1e3f866b4af14f3778e9002b3..e6ea3ab4c41dcc115143a237aafd3a1152849433:/src/tests/kitemlistselectionmanagertest.cpp diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp index 48e8dce04..99313ff80 100644 --- a/src/tests/kitemlistselectionmanagertest.cpp +++ b/src/tests/kitemlistselectionmanagertest.cpp @@ -30,8 +30,8 @@ class DummyModel : public KItemModelBase public: DummyModel(); void setCount(int count); - int count() const Q_DECL_OVERRIDE; - QHash data(int index) const Q_DECL_OVERRIDE; + int count() const override; + QHash data(int index) const override; private: int m_count; @@ -55,7 +55,7 @@ int DummyModel::count() const QHash DummyModel::data(int index) const { - Q_UNUSED(index); + Q_UNUSED(index) return QHash(); } @@ -99,10 +99,10 @@ void KItemListSelectionManagerTest::init() void KItemListSelectionManagerTest::cleanup() { delete m_selectionManager; - m_selectionManager = 0; + m_selectionManager = nullptr; delete m_model; - m_model = 0; + m_model = nullptr; } void KItemListSelectionManagerTest::testConstructor() @@ -115,7 +115,7 @@ void KItemListSelectionManagerTest::testConstructor() 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); @@ -445,13 +445,13 @@ void KItemListSelectionManagerTest::testChangeSelection() QFETCH(QList, 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()); - // Perform the initial selectiion + // Perform the initial selection m_selectionManager->setSelectedItems(initialSelection); verifySelectionChange(spySelectionChanged, initialSelection, KItemSet());