From 5947aa8294d94bf8eb91fecaa104da51021057af Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 4 Jun 2024 16:17:21 +0300 Subject: [PATCH] generic: testing build fix Signed-off-by: Ivailo Monev --- dolphin/src/tests/kfileitemmodelbenchmark.cpp | 3 +-- dolphin/src/tests/kfileitemmodeltest.cpp | 11 +++++++---- kioslave/trash/tests/testtrash.cpp | 12 ++++++------ libs/konq/tests/konqpopupmenutest.cpp | 10 +++++----- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dolphin/src/tests/kfileitemmodelbenchmark.cpp b/dolphin/src/tests/kfileitemmodelbenchmark.cpp index b38f9514..36f3a7c4 100644 --- a/dolphin/src/tests/kfileitemmodelbenchmark.cpp +++ b/dolphin/src/tests/kfileitemmodelbenchmark.cpp @@ -215,8 +215,7 @@ KFileItemList KFileItemModelBenchmark::createFileItemList(const QStringList& fil KFileItemList result; foreach (const QString& name, fileNames) { const KUrl url(prefix + name); - const KFileItem item(url, QString(), KFileItem::Unknown); - result << item; + result << KFileItem(url); } return result; } diff --git a/dolphin/src/tests/kfileitemmodeltest.cpp b/dolphin/src/tests/kfileitemmodeltest.cpp index 0965fce6..399bd5fe 100644 --- a/dolphin/src/tests/kfileitemmodeltest.cpp +++ b/dolphin/src/tests/kfileitemmodeltest.cpp @@ -491,7 +491,7 @@ void KFileItemModelTest::testEmptyPath() const KUrl url("file:///test/"); KFileItemList items; - items << KFileItem(emptyUrl, QString(), KFileItem::Unknown) << KFileItem(url, QString(), KFileItem::Unknown); + items << KFileItem(emptyUrl) << KFileItem(url); m_model->slotItemsAdded(items); m_model->slotCompleted(); } @@ -682,16 +682,19 @@ void KFileItemModelTest::testChangeSortRoleWhileFiltering() entry.insert(KIO::UDSEntry::UDS_ACCESS_TIME, 0); entry.insert(KIO::UDSEntry::UDS_NAME, "a.txt"); + entry.insert(KIO::UDSEntry::UDS_URL, m_testDir->url().url(KUrl::RemoveTrailingSlash) + "/a.txt"); entry.insert(KIO::UDSEntry::UDS_USER, "user-b"); - items.append(KFileItem(entry, m_testDir->url())); + items.append(KFileItem(entry)); entry.insert(KIO::UDSEntry::UDS_NAME, "b.txt"); + entry.insert(KIO::UDSEntry::UDS_URL, m_testDir->url().url(KUrl::RemoveTrailingSlash) + "/b.txt"); entry.insert(KIO::UDSEntry::UDS_USER, "user-c"); - items.append(KFileItem(entry, m_testDir->url())); + items.append(KFileItem(entry)); entry.insert(KIO::UDSEntry::UDS_NAME, "c.txt"); + entry.insert(KIO::UDSEntry::UDS_URL, m_testDir->url().url(KUrl::RemoveTrailingSlash) + "/c.txt"); entry.insert(KIO::UDSEntry::UDS_USER, "user-a"); - items.append(KFileItem(entry, m_testDir->url())); + items.append(KFileItem(entry)); m_model->slotItemsAdded(items); m_model->slotCompleted(); diff --git a/kioslave/trash/tests/testtrash.cpp b/kioslave/trash/tests/testtrash.cpp index be5e7577..10d8aeb9 100644 --- a/kioslave/trash/tests/testtrash.cpp +++ b/kioslave/trash/tests/testtrash.cpp @@ -118,7 +118,7 @@ static void removeDirRecursive( const QString& dir ) // Make it work even with readonly dirs, like trashReadOnlyDirFromHome() creates KUrl u = KUrl::fromPath( dir ); //kDebug() << "chmod +0200 on" << u; - KFileItem fileItem(u, QString::fromLatin1("inode/directory"), KFileItem::Unknown); + KFileItem fileItem(u); KFileItemList fileItemList; fileItemList.append( fileItem ); KIO::ChmodJob* chmodJob = KIO::chmod( fileItemList, 0200, 0200, QString(), QString(), true /*recursive*/, KIO::HideProgressInfo ); @@ -666,7 +666,7 @@ void TestTrash::statRoot() KIO::UDSEntry entry; bool ok = MyNetAccess_stat( url, entry ); QVERIFY( ok ); - KFileItem item( entry, url ); + KFileItem item( entry ); QVERIFY( item.isDir() ); QVERIFY( !item.isLink() ); QVERIFY( item.isReadable() ); @@ -681,7 +681,7 @@ void TestTrash::statFileInRoot() KIO::UDSEntry entry; bool ok = MyNetAccess_stat( url, entry ); QVERIFY( ok ); - KFileItem item( entry, url ); + KFileItem item( entry ); QVERIFY( item.isFile() ); QVERIFY( !item.isDir() ); QVERIFY( !item.isLink() ); @@ -697,7 +697,7 @@ void TestTrash::statDirectoryInRoot() KIO::UDSEntry entry; bool ok = MyNetAccess_stat( url, entry ); QVERIFY( ok ); - KFileItem item( entry, url ); + KFileItem item( entry ); QVERIFY( item.isDir() ); QVERIFY( !item.isLink() ); QVERIFY( item.isReadable() ); @@ -712,7 +712,7 @@ void TestTrash::statSymlinkInRoot() KIO::UDSEntry entry; bool ok = MyNetAccess_stat( url, entry ); QVERIFY( ok ); - KFileItem item( entry, url ); + KFileItem item( entry ); QVERIFY( item.isLink() ); QCOMPARE(item.linkDest(), QString::fromLatin1("/tmp")); QVERIFY( item.isReadable() ); @@ -727,7 +727,7 @@ void TestTrash::statFileInDirectory() KIO::UDSEntry entry; bool ok = MyNetAccess_stat( url, entry ); QVERIFY( ok ); - KFileItem item( entry, url ); + KFileItem item( entry ); QVERIFY( item.isFile() ); QVERIFY( !item.isLink() ); QVERIFY( item.isReadable() ); diff --git a/libs/konq/tests/konqpopupmenutest.cpp b/libs/konq/tests/konqpopupmenutest.cpp index 9a7df332..8bb6dec0 100644 --- a/libs/konq/tests/konqpopupmenutest.cpp +++ b/libs/konq/tests/konqpopupmenutest.cpp @@ -80,10 +80,10 @@ void KonqPopupMenuTest::initTestCase() KSharedConfig::Ptr dolphin = KSharedConfig::openConfig("dolphinrc"); KConfigGroup(dolphin, "General").writeEntry("ShowCopyMoveMenu", true); - m_thisDirectoryItem = KFileItem(QDir::currentPath(), "inode/directory", S_IFDIR + 0777); - m_fileItem = KFileItem(KUrl(QDir::currentPath() + "/Makefile"), "text/x-makefile", S_IFREG + 0660); - m_linkItem = KFileItem(KUrl("http://www.kde.org/foo"), "text/html", S_IFREG + 0660); - m_subDirItem = KFileItem(KUrl(QDir::currentPath() + "/CMakeFiles"), "inode/directory", S_IFDIR + 0755); + m_thisDirectoryItem = KFileItem(QDir::currentPath()); + m_fileItem = KFileItem(KUrl(QDir::currentPath() + "/Makefile")); + m_linkItem = KFileItem(KUrl("http://www.kde.org/foo")); + m_subDirItem = KFileItem(KUrl(QDir::currentPath() + "/CMakeFiles")); m_cut = KStandardAction::cut(0, 0, this); m_actionCollection.addAction("cut", m_cut); m_copy = KStandardAction::copy(0, 0, this); @@ -346,7 +346,7 @@ void KonqPopupMenuTest::testViewReadOnlyDirectory() QSKIP("/root directory is readable", SkipSingle); } - KFileItem rootItem(notreadabledir, "inode/directory", KFileItem::Unknown); + KFileItem rootItem(notreadabledir); KFileItemList itemList; itemList << rootItem; KUrl viewUrl = rootItem.url();