kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Port QSignalSpy to new signal syntax

Browse source 
More compile-time safety. Tests still pass.

This also fixes a krazy warning about "normalised signal/slot
signatures".
This commit is contained in:
Elvis Angelaccio 2018-02-03 20:46:08 +01:00
parent 4709626a9b
commit cef4d96cc6
6 changed files with 63 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/tests/kfileitemlistviewtest.cpp
View file

@ -87,9 +87,9 @@ void KFileItemListViewTest::cleanup()
*/ */
void KFileItemListViewTest::testGroupedItemChanges() void KFileItemListViewTest::testGroupedItemChanges()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QVERIFY(itemsInsertedSpy.isValid()); QVERIFY(itemsInsertedSpy.isValid());
QSignalSpy itemsRemovedSpy(m_model, SIGNAL(itemsRemoved(KItemRangeList))); QSignalSpy itemsRemovedSpy(m_model, &KFileItemModel::itemsRemoved);
QVERIFY(itemsRemovedSpy.isValid()); QVERIFY(itemsRemovedSpy.isValid());
m_model->setGroupedSorting(true); m_model->setGroupedSorting(true);

4
src/tests/kfileitemmodelbenchmark.cpp
View file

@ -167,8 +167,8 @@ void KFileItemModelBenchmark::insertAndRemoveManyItems()
model.m_naturalSorting = false; model.m_naturalSorting = false;
model.setRoles({"text"}); model.setRoles({"text"});
QSignalSpy spyItemsInserted(&model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy spyItemsInserted(&model, &KFileItemModel::itemsInserted);
QSignalSpy spyItemsRemoved(&model, SIGNAL(itemsRemoved(KItemRangeList))); QSignalSpy spyItemsRemoved(&model, &KFileItemModel::itemsRemoved);
QBENCHMARK { QBENCHMARK {
model.slotClear(); model.slotClear();

98
src/tests/kfileitemmodeltest.cpp
View file

@ -144,7 +144,7 @@ void KFileItemModelTest::testDefaultRoles()
void KFileItemModelTest::testDefaultSortRole() void KFileItemModelTest::testDefaultSortRole()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QVERIFY(itemsInsertedSpy.isValid()); QVERIFY(itemsInsertedSpy.isValid());
QCOMPARE(m_model->sortRole(), QByteArray("text")); QCOMPARE(m_model->sortRole(), QByteArray("text"));
@ -167,7 +167,7 @@ void KFileItemModelTest::testDefaultGroupedSorting()
void KFileItemModelTest::testNewItems() void KFileItemModelTest::testNewItems()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
m_testDir->createFiles({"a.txt", "b.txt", "c.txt"}); m_testDir->createFiles({"a.txt", "b.txt", "c.txt"});
@ -181,8 +181,8 @@ void KFileItemModelTest::testNewItems()
void KFileItemModelTest::testRemoveItems() void KFileItemModelTest::testRemoveItems()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSignalSpy itemsRemovedSpy(m_model, SIGNAL(itemsRemoved(KItemRangeList))); QSignalSpy itemsRemovedSpy(m_model, &KFileItemModel::itemsRemoved);
m_testDir->createFiles({"a.txt", "b.txt"}); m_testDir->createFiles({"a.txt", "b.txt"});
m_model->loadDirectory(m_testDir->url()); m_model->loadDirectory(m_testDir->url());
@ -199,9 +199,9 @@ void KFileItemModelTest::testRemoveItems()
void KFileItemModelTest::testDirLoadingCompleted() void KFileItemModelTest::testDirLoadingCompleted()
{ {
QSignalSpy loadingCompletedSpy(m_model, SIGNAL(directoryLoadingCompleted())); QSignalSpy loadingCompletedSpy(m_model, &KFileItemModel::directoryLoadingCompleted);
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSignalSpy itemsRemovedSpy(m_model, SIGNAL(itemsRemoved(KItemRangeList))); QSignalSpy itemsRemovedSpy(m_model, &KFileItemModel::itemsRemoved);
m_testDir->createFiles({"a.txt", "b.txt", "c.txt"}); m_testDir->createFiles({"a.txt", "b.txt", "c.txt"});
@ -242,9 +242,9 @@ void KFileItemModelTest::testDirLoadingCompleted()
void KFileItemModelTest::testSetData() void KFileItemModelTest::testSetData()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QVERIFY(itemsInsertedSpy.isValid()); QVERIFY(itemsInsertedSpy.isValid());
QSignalSpy itemsChangedSpy(m_model, SIGNAL(itemsChanged(KItemRangeList, QSet<QByteArray>))); QSignalSpy itemsChangedSpy(m_model, &KFileItemModel::itemsChanged);
QVERIFY(itemsChangedSpy.isValid()); QVERIFY(itemsChangedSpy.isValid());
m_testDir->createFile("a.txt"); m_testDir->createFile("a.txt");
@ -297,9 +297,9 @@ void KFileItemModelTest::testSetDataWithModifiedSortRole()
QFETCH(int, ratingIndex1); QFETCH(int, ratingIndex1);
QFETCH(int, ratingIndex2); QFETCH(int, ratingIndex2);
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QVERIFY(itemsInsertedSpy.isValid()); QVERIFY(itemsInsertedSpy.isValid());
QSignalSpy itemsMovedSpy(m_model, SIGNAL(itemsMoved(KItemRange,QList<int>))); QSignalSpy itemsMovedSpy(m_model, &KFileItemModel::itemsMoved);
QVERIFY(itemsMovedSpy.isValid()); QVERIFY(itemsMovedSpy.isValid());
// Changing the value of a sort-role must result in // Changing the value of a sort-role must result in
@ -352,8 +352,8 @@ void KFileItemModelTest::testSetDataWithModifiedSortRole()
void KFileItemModelTest::testChangeSortRole() void KFileItemModelTest::testChangeSortRole()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSignalSpy itemsMovedSpy(m_model, SIGNAL(itemsMoved(KItemRange,QList<int>))); QSignalSpy itemsMovedSpy(m_model, &KFileItemModel::itemsMoved);
QVERIFY(itemsMovedSpy.isValid()); QVERIFY(itemsMovedSpy.isValid());
QCOMPARE(m_model->sortRole(), QByteArray("text")); QCOMPARE(m_model->sortRole(), QByteArray("text"));
@ -392,8 +392,8 @@ void KFileItemModelTest::testChangeSortRole()
void KFileItemModelTest::testResortAfterChangingName() void KFileItemModelTest::testResortAfterChangingName()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSignalSpy itemsMovedSpy(m_model, SIGNAL(itemsMoved(KItemRange,QList<int>))); QSignalSpy itemsMovedSpy(m_model, &KFileItemModel::itemsMoved);
QVERIFY(itemsMovedSpy.isValid()); QVERIFY(itemsMovedSpy.isValid());
// We sort by size in a directory where all files have the same size. // We sort by size in a directory where all files have the same size.
@ -430,7 +430,7 @@ void KFileItemModelTest::testResortAfterChangingName()
void KFileItemModelTest::testModelConsistencyWhenInsertingItems() void KFileItemModelTest::testModelConsistencyWhenInsertingItems()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
// KFileItemModel prevents that inserting a punch of items sequentially // KFileItemModel prevents that inserting a punch of items sequentially
// results in an itemsInserted()-signal for each item. Instead internally // results in an itemsInserted()-signal for each item. Instead internally
@ -472,7 +472,7 @@ void KFileItemModelTest::testModelConsistencyWhenInsertingItems()
void KFileItemModelTest::testItemRangeConsistencyWhenInsertingItems() void KFileItemModelTest::testItemRangeConsistencyWhenInsertingItems()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
m_testDir->createFiles({"B", "E", "G"}); m_testDir->createFiles({"B", "E", "G"});
@ -511,11 +511,11 @@ void KFileItemModelTest::testItemRangeConsistencyWhenInsertingItems()
void KFileItemModelTest::testExpandItems() void KFileItemModelTest::testExpandItems()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QVERIFY(itemsInsertedSpy.isValid()); QVERIFY(itemsInsertedSpy.isValid());
QSignalSpy itemsRemovedSpy(m_model, SIGNAL(itemsRemoved(KItemRangeList))); QSignalSpy itemsRemovedSpy(m_model, &KFileItemModel::itemsRemoved);
QVERIFY(itemsRemovedSpy.isValid()); QVERIFY(itemsRemovedSpy.isValid());
QSignalSpy loadingCompletedSpy(m_model, SIGNAL(directoryLoadingCompleted())); QSignalSpy loadingCompletedSpy(m_model, &KFileItemModel::directoryLoadingCompleted);
QVERIFY(loadingCompletedSpy.isValid()); QVERIFY(loadingCompletedSpy.isValid());
// Test expanding subfolders in a folder with the items "a/", "a/a/", "a/a/1", "a/a-1/", "a/a-1/1". // Test expanding subfolders in a folder with the items "a/", "a/a/", "a/a/1", "a/a-1/", "a/a-1/1".
@ -648,8 +648,8 @@ void KFileItemModelTest::testExpandItems()
void KFileItemModelTest::testExpandParentItems() void KFileItemModelTest::testExpandParentItems()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSignalSpy loadingCompletedSpy(m_model, SIGNAL(directoryLoadingCompleted())); QSignalSpy loadingCompletedSpy(m_model, &KFileItemModel::directoryLoadingCompleted);
QVERIFY(loadingCompletedSpy.isValid()); QVERIFY(loadingCompletedSpy.isValid());
// Create a tree structure of folders: // Create a tree structure of folders:
@ -729,8 +729,8 @@ void KFileItemModelTest::testExpandParentItems()
*/ */
void KFileItemModelTest::testMakeExpandedItemHidden() void KFileItemModelTest::testMakeExpandedItemHidden()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSignalSpy itemsRemovedSpy(m_model, SIGNAL(itemsRemoved(KItemRangeList))); QSignalSpy itemsRemovedSpy(m_model, &KFileItemModel::itemsRemoved);
QSet<QByteArray> modelRoles = m_model->roles(); QSet<QByteArray> modelRoles = m_model->roles();
modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount"; modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount";
@ -772,7 +772,7 @@ void KFileItemModelTest::testMakeExpandedItemHidden()
void KFileItemModelTest::testRemoveFilteredExpandedItems() void KFileItemModelTest::testRemoveFilteredExpandedItems()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSet<QByteArray> originalModelRoles = m_model->roles(); QSet<QByteArray> originalModelRoles = m_model->roles();
QSet<QByteArray> modelRoles = originalModelRoles; QSet<QByteArray> modelRoles = originalModelRoles;
@ -817,8 +817,8 @@ void KFileItemModelTest::testRemoveFilteredExpandedItems()
void KFileItemModelTest::testSorting() void KFileItemModelTest::testSorting()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSignalSpy itemsMovedSpy(m_model, SIGNAL(itemsMoved(KItemRange,QList<int>))); QSignalSpy itemsMovedSpy(m_model, &KFileItemModel::itemsMoved);
QVERIFY(itemsMovedSpy.isValid()); QVERIFY(itemsMovedSpy.isValid());
// Create some files with different sizes and modification times to check the different sorting options // Create some files with different sizes and modification times to check the different sorting options
@ -952,7 +952,7 @@ void KFileItemModelTest::testSorting()
void KFileItemModelTest::testIndexForKeyboardSearch() void KFileItemModelTest::testIndexForKeyboardSearch()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
m_testDir->createFiles({"a", "aa", "Image.jpg", "Image.png", "Text", "Text1", "Text2", "Text11"}); m_testDir->createFiles({"a", "aa", "Image.jpg", "Image.png", "Text", "Text1", "Text2", "Text11"});
@ -1002,7 +1002,7 @@ void KFileItemModelTest::testIndexForKeyboardSearch()
void KFileItemModelTest::testNameFilter() void KFileItemModelTest::testNameFilter()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
m_testDir->createFiles({"A1", "A2", "Abc", "Bcd", "Cde"}); m_testDir->createFiles({"A1", "A2", "Abc", "Bcd", "Cde"});
@ -1059,8 +1059,8 @@ void KFileItemModelTest::testEmptyPath()
*/ */
void KFileItemModelTest::testRefreshExpandedItem() void KFileItemModelTest::testRefreshExpandedItem()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSignalSpy itemsChangedSpy(m_model, SIGNAL(itemsChanged(KItemRangeList, QSet<QByteArray>))); QSignalSpy itemsChangedSpy(m_model, &KFileItemModel::itemsChanged);
QVERIFY(itemsChangedSpy.isValid()); QVERIFY(itemsChangedSpy.isValid());
QSet<QByteArray> modelRoles = m_model->roles(); QSet<QByteArray> modelRoles = m_model->roles();
@ -1098,8 +1098,8 @@ void KFileItemModelTest::testRemoveHiddenItems()
m_testDir->createDir("d"); m_testDir->createDir("d");
m_testDir->createFiles({".f", ".g", "h", "i"}); m_testDir->createFiles({".f", ".g", "h", "i"});
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSignalSpy itemsRemovedSpy(m_model, SIGNAL(itemsRemoved(KItemRangeList))); QSignalSpy itemsRemovedSpy(m_model, &KFileItemModel::itemsRemoved);
m_model->setShowHiddenFiles(true); m_model->setShowHiddenFiles(true);
m_model->loadDirectory(m_testDir->url()); m_model->loadDirectory(m_testDir->url());
@ -1141,8 +1141,8 @@ void KFileItemModelTest::testRemoveHiddenItems()
*/ */
void KFileItemModelTest::collapseParentOfHiddenItems() void KFileItemModelTest::collapseParentOfHiddenItems()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSignalSpy itemsRemovedSpy(m_model, SIGNAL(itemsRemoved(KItemRangeList))); QSignalSpy itemsRemovedSpy(m_model, &KFileItemModel::itemsRemoved);
QSet<QByteArray> modelRoles = m_model->roles(); QSet<QByteArray> modelRoles = m_model->roles();
modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount"; modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount";
@ -1191,8 +1191,8 @@ void KFileItemModelTest::collapseParentOfHiddenItems()
*/ */
void KFileItemModelTest::removeParentOfHiddenItems() void KFileItemModelTest::removeParentOfHiddenItems()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSignalSpy itemsRemovedSpy(m_model, SIGNAL(itemsRemoved(KItemRangeList))); QSignalSpy itemsRemovedSpy(m_model, &KFileItemModel::itemsRemoved);
QSet<QByteArray> modelRoles = m_model->roles(); QSet<QByteArray> modelRoles = m_model->roles();
modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount"; modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount";
@ -1244,8 +1244,8 @@ void KFileItemModelTest::removeParentOfHiddenItems()
*/ */
void KFileItemModelTest::testGeneralParentChildRelationships() void KFileItemModelTest::testGeneralParentChildRelationships()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSignalSpy itemsRemovedSpy(m_model, SIGNAL(itemsRemoved(KItemRangeList))); QSignalSpy itemsRemovedSpy(m_model, &KFileItemModel::itemsRemoved);
QSet<QByteArray> modelRoles = m_model->roles(); QSet<QByteArray> modelRoles = m_model->roles();
modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount"; modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount";
@ -1331,10 +1331,10 @@ void KFileItemModelTest::testGeneralParentChildRelationships()
void KFileItemModelTest::testNameRoleGroups() void KFileItemModelTest::testNameRoleGroups()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSignalSpy itemsMovedSpy(m_model, SIGNAL(itemsMoved(KItemRange,QList<int>))); QSignalSpy itemsMovedSpy(m_model, &KFileItemModel::itemsMoved);
QVERIFY(itemsMovedSpy.isValid()); QVERIFY(itemsMovedSpy.isValid());
QSignalSpy groupsChangedSpy(m_model, SIGNAL(groupsChanged())); QSignalSpy groupsChangedSpy(m_model, &KFileItemModel::groupsChanged);
QVERIFY(groupsChangedSpy.isValid()); QVERIFY(groupsChangedSpy.isValid());
m_testDir->createFiles({"b.txt", "c.txt", "d.txt", "e.txt"}); m_testDir->createFiles({"b.txt", "c.txt", "d.txt", "e.txt"});
@ -1399,7 +1399,7 @@ void KFileItemModelTest::testNameRoleGroups()
void KFileItemModelTest::testNameRoleGroupsWithExpandedItems() void KFileItemModelTest::testNameRoleGroupsWithExpandedItems()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSet<QByteArray> modelRoles = m_model->roles(); QSet<QByteArray> modelRoles = m_model->roles();
modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount"; modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount";
@ -1437,7 +1437,7 @@ void KFileItemModelTest::testNameRoleGroupsWithExpandedItems()
void KFileItemModelTest::testInconsistentModel() void KFileItemModelTest::testInconsistentModel()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSet<QByteArray> modelRoles = m_model->roles(); QSet<QByteArray> modelRoles = m_model->roles();
modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount"; modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount";
@ -1493,7 +1493,7 @@ void KFileItemModelTest::testInconsistentModel()
void KFileItemModelTest::testChangeRolesForFilteredItems() void KFileItemModelTest::testChangeRolesForFilteredItems()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSet<QByteArray> modelRoles = m_model->roles(); QSet<QByteArray> modelRoles = m_model->roles();
modelRoles << "owner"; modelRoles << "owner";
@ -1590,7 +1590,7 @@ void KFileItemModelTest::testChangeSortRoleWhileFiltering()
void KFileItemModelTest::testRefreshFilteredItems() void KFileItemModelTest::testRefreshFilteredItems()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
m_testDir->createFiles({"a.txt", "b.txt", "c.jpg", "d.jpg"}); m_testDir->createFiles({"a.txt", "b.txt", "c.jpg", "d.jpg"});
@ -1619,7 +1619,7 @@ void KFileItemModelTest::testRefreshFilteredItems()
void KFileItemModelTest::testCreateMimeData() void KFileItemModelTest::testCreateMimeData()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSet<QByteArray> modelRoles = m_model->roles(); QSet<QByteArray> modelRoles = m_model->roles();
modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount"; modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount";
@ -1646,7 +1646,7 @@ void KFileItemModelTest::testCreateMimeData()
void KFileItemModelTest::testCollapseFolderWhileLoading() void KFileItemModelTest::testCollapseFolderWhileLoading()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
QSet<QByteArray> modelRoles = m_model->roles(); QSet<QByteArray> modelRoles = m_model->roles();
modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount"; modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount";
@ -1724,7 +1724,7 @@ void KFileItemModelTest::testCollapseFolderWhileLoading()
void KFileItemModelTest::testDeleteFileMoreThanOnce() void KFileItemModelTest::testDeleteFileMoreThanOnce()
{ {
QSignalSpy itemsInsertedSpy(m_model, SIGNAL(itemsInserted(KItemRangeList))); QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
m_testDir->createFiles({"a.txt", "b.txt", "c.txt", "d.txt"}); m_testDir->createFiles({"a.txt", "b.txt", "c.txt", "d.txt"});

8
src/tests/kitemlistcontrollertest.cpp
View file

@ -139,7 +139,7 @@ void KItemListControllerTest::initTestCase()
m_testDir->createFiles(files); m_testDir->createFiles(files);
m_model->loadDirectory(m_testDir->url()); m_model->loadDirectory(m_testDir->url());
QSignalSpy spyDirectoryLoadingCompleted(m_model, SIGNAL(directoryLoadingCompleted())); QSignalSpy spyDirectoryLoadingCompleted(m_model, &KFileItemModel::directoryLoadingCompleted);
QVERIFY(spyDirectoryLoadingCompleted.wait()); QVERIFY(spyDirectoryLoadingCompleted.wait());
m_container->show(); m_container->show();
@ -507,8 +507,8 @@ void KItemListControllerTest::testKeyboardNavigation()
adjustGeometryForColumnCount(columnCount); adjustGeometryForColumnCount(columnCount);
QCOMPARE(m_view->m_layouter->m_columnCount, columnCount); QCOMPARE(m_view->m_layouter->m_columnCount, columnCount);
QSignalSpy spySingleItemActivated(m_controller, SIGNAL(itemActivated(int))); QSignalSpy spySingleItemActivated(m_controller, &KItemListController::itemActivated);
QSignalSpy spyMultipleItemsActivated(m_controller, SIGNAL(itemsActivated(KItemSet))); QSignalSpy spyMultipleItemsActivated(m_controller, &KItemListController::itemsActivated);
while (!testList.isEmpty()) { while (!testList.isEmpty()) {
const QPair<KeyPress, ViewState> test = testList.takeFirst(); const QPair<KeyPress, ViewState> test = testList.takeFirst();
@ -584,7 +584,7 @@ void KItemListControllerTest::testMouseClickActivation()
mouseReleaseEvent.setButton(Qt::LeftButton); mouseReleaseEvent.setButton(Qt::LeftButton);
mouseReleaseEvent.setButtons(Qt::NoButton); mouseReleaseEvent.setButtons(Qt::NoButton);
QSignalSpy spyItemActivated(m_controller, SIGNAL(itemActivated(int))); QSignalSpy spyItemActivated(m_controller, &KItemListController::itemActivated);
// Default setting: single click activation. // Default setting: single click activation.
m_testStyle->setActivateItemOnSingleClick(true); m_testStyle->setActivateItemOnSingleClick(true);

8
src/tests/kitemlistkeyboardsearchmanagertest.cpp
View file

@ -46,7 +46,7 @@ void KItemListKeyboardSearchManagerTest::init()
void KItemListKeyboardSearchManagerTest::testBasicKeyboardSearch() void KItemListKeyboardSearchManagerTest::testBasicKeyboardSearch()
{ {
QSignalSpy spy(&m_keyboardSearchManager, SIGNAL(changeCurrentItem(QString, bool))); QSignalSpy spy(&m_keyboardSearchManager, &KItemListKeyboardSearchManager::changeCurrentItem);
QVERIFY(spy.isValid()); QVERIFY(spy.isValid());
m_keyboardSearchManager.addKeys("f"); m_keyboardSearchManager.addKeys("f");
@ -72,7 +72,7 @@ void KItemListKeyboardSearchManagerTest::testAbortedKeyboardSearch()
// to save time when running this test. // to save time when running this test.
m_keyboardSearchManager.setTimeout(100); m_keyboardSearchManager.setTimeout(100);
QSignalSpy spy(&m_keyboardSearchManager, SIGNAL(changeCurrentItem(QString, bool))); QSignalSpy spy(&m_keyboardSearchManager, &KItemListKeyboardSearchManager::changeCurrentItem);
QVERIFY(spy.isValid()); QVERIFY(spy.isValid());
m_keyboardSearchManager.addKeys("f"); m_keyboardSearchManager.addKeys("f");
@ -104,7 +104,7 @@ void KItemListKeyboardSearchManagerTest::testRepeatedKeyPress()
// 1. the string contains the repeated key only once, and // 1. the string contains the repeated key only once, and
// 2. the bool searchFromNextItem is true. // 2. the bool searchFromNextItem is true.
QSignalSpy spy(&m_keyboardSearchManager, SIGNAL(changeCurrentItem(QString, bool))); QSignalSpy spy(&m_keyboardSearchManager, &KItemListKeyboardSearchManager::changeCurrentItem);
QVERIFY(spy.isValid()); QVERIFY(spy.isValid());
m_keyboardSearchManager.addKeys("p"); m_keyboardSearchManager.addKeys("p");
@ -132,7 +132,7 @@ void KItemListKeyboardSearchManagerTest::testPressShift()
// string. Make sure that this does not reset the current search. See // string. Make sure that this does not reset the current search. See
// https://bugs.kde.org/show_bug.cgi?id=321286 // https://bugs.kde.org/show_bug.cgi?id=321286
QSignalSpy spy(&m_keyboardSearchManager, SIGNAL(changeCurrentItem(QString, bool))); QSignalSpy spy(&m_keyboardSearchManager, &KItemListKeyboardSearchManager::changeCurrentItem);
QVERIFY(spy.isValid()); QVERIFY(spy.isValid());
// Simulate that the user enters "a_b". // Simulate that the user enters "a_b".

4
src/tests/kitemlistselectionmanagertest.cpp
View file

@ -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. // Set current item and check that the selection manager emits the currentChanged(int,int) signal correctly.
m_selectionManager->setCurrentItem(4); m_selectionManager->setCurrentItem(4);
@ -445,7 +445,7 @@ void KItemListSelectionManagerTest::testChangeSelection()
QFETCH(QList<QVariant>, data); QFETCH(QList<QVariant>, data);
QFETCH(KItemSet, finalSelection); QFETCH(KItemSet, finalSelection);
QSignalSpy spySelectionChanged(m_selectionManager, SIGNAL(selectionChanged(KItemSet,KItemSet))); QSignalSpy spySelectionChanged(m_selectionManager, &KItemListSelectionManager::selectionChanged);
// Initial selection should be empty // Initial selection should be empty
QVERIFY(!m_selectionManager->hasSelection()); QVERIFY(!m_selectionManager->hasSelection());