diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp index 7fbe8454..b05707e9 100644 --- a/kio/kio/kdirlister.cpp +++ b/kio/kio/kdirlister.cpp @@ -80,7 +80,7 @@ void KDirListerPrivate::processEntries(KIO::Job *job, const KIO::UDSEntryList &e if (name.isEmpty()) { continue; } - const KFileItem item(it, processJob->url(), true); + const KFileItem item(it, processJob->url()); if (name == QLatin1String(".")) { rootItem = item; continue; diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp index 21f26e78..1ff518c7 100644 --- a/kio/kio/kfileitem.cpp +++ b/kio/kio/kfileitem.cpp @@ -299,8 +299,8 @@ KFileItem::KFileItem() { } -KFileItem::KFileItem(const KIO::UDSEntry& entry, const KUrl& itemOrDirUrl, bool urlIsDirectory) - : d(new KFileItemPrivate(entry, KFileItem::Unknown, KFileItem::Unknown, itemOrDirUrl, urlIsDirectory)) +KFileItem::KFileItem(const KIO::UDSEntry& entry, const KUrl& itemOrDirUrl) + : d(new KFileItemPrivate(entry, KFileItem::Unknown, KFileItem::Unknown, itemOrDirUrl, true)) { } diff --git a/kio/kio/kfileitem.h b/kio/kio/kfileitem.h index cef5f382..5e37abc1 100644 --- a/kio/kio/kfileitem.h +++ b/kio/kio/kfileitem.h @@ -77,8 +77,7 @@ public: * When creating KFileItems out of the UDSEntry emitted by a KIO list job, * use KFileItem(entry, listjob->url(), true); */ - KFileItem(const KIO::UDSEntry &entry, const KUrl &itemOrDirUrl, - bool urlIsDirectory = false ); + KFileItem(const KIO::UDSEntry &entry, const KUrl &itemOrDirUrl); /** * Creates an item representing a file, from all the necessary info for it. diff --git a/kio/tests/kfileitemtest.cpp b/kio/tests/kfileitemtest.cpp index 123e40b7..e68dfcb9 100644 --- a/kio/tests/kfileitemtest.cpp +++ b/kio/tests/kfileitemtest.cpp @@ -172,7 +172,7 @@ void KFileItemTest::testMimeTypeOnDemand() QVERIFY(file.open()); { - KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, KUrl(file.fileName()), true /*on demand*/); + KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, KUrl(file.fileName())); QCOMPARE(fileItem.mimeTypePtr()->name(), KMimeType::defaultMimeType()); QVERIFY(!fileItem.isMimeTypeKnown()); //kDebug() << fileItem.determineMimeType()->name(); @@ -183,7 +183,7 @@ void KFileItemTest::testMimeTypeOnDemand() { // Calling mimeType directly also does mimetype determination - KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, KUrl(file.fileName()), true /*on demand*/); + KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, KUrl(file.fileName())); QVERIFY(!fileItem.isMimeTypeKnown()); QCOMPARE(fileItem.mimetype(), QString("application/x-zerosize")); QVERIFY(fileItem.isMimeTypeKnown()); @@ -191,7 +191,7 @@ void KFileItemTest::testMimeTypeOnDemand() { // Calling overlays should NOT do mimetype determination (#237668) - KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, KUrl(file.fileName()), true /*on demand*/); + KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, KUrl(file.fileName())); QVERIFY(!fileItem.isMimeTypeKnown()); fileItem.overlays(); QVERIFY(!fileItem.isMimeTypeKnown()); @@ -206,7 +206,7 @@ void KFileItemTest::testMimeTypeOnDemand() QString fileName = file.fileName(); QVERIFY(!fileName.isEmpty()); file.close(); - KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, KUrl(fileName), true /*on demand*/); + KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, KUrl(fileName)); QCOMPARE(fileItem.mimeTypePtr()->name(), KMimeType::defaultMimeType()); QVERIFY(!fileItem.isMimeTypeKnown()); QCOMPARE(fileItem.determineMimeType()->name(), QString("application/pdf")); @@ -223,17 +223,12 @@ void KFileItemTest::testMimeTypeOnDemand() QString fileName = file.fileName(); QVERIFY(!fileName.isEmpty()); file.close(); - KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, KUrl(fileName), true /*on demand*/); + KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, KUrl(fileName)); QCOMPARE(fileItem.mimeTypePtr()->name(), QString("text/plain")); QVERIFY(!fileItem.isMimeTypeKnown()); QCOMPARE(fileItem.determineMimeType()->name(), QString("text/plain")); QCOMPARE(fileItem.mimetype(), QString("text/plain")); QVERIFY(fileItem.isMimeTypeKnown()); - - // And if the mimetype is not on demand? - KFileItem fileItem2(KFileItem::Unknown, KFileItem::Unknown, KUrl(fileName)); - QCOMPARE(fileItem2.mimeTypePtr()->name(), QString("text/plain")); // XDG says: application/smil; but can't sniff all files so this can't work - QVERIFY(fileItem2.isMimeTypeKnown()); } } @@ -242,8 +237,8 @@ void KFileItemTest::testCmp() KTemporaryFile file; QVERIFY(file.open()); - KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, KUrl(file.fileName()), true /*on demand*/); - KFileItem fileItem2(KFileItem::Unknown, KFileItem::Unknown, KUrl(file.fileName()), false); + KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, KUrl(file.fileName())); + KFileItem fileItem2(KFileItem::Unknown, KFileItem::Unknown, KUrl(file.fileName())); QVERIFY(fileItem == fileItem2); // created independently, but still 'equal' QVERIFY(fileItem.d != fileItem2.d); QVERIFY(!(fileItem != fileItem2));