Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 10:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kio: drop the boolean argument of KFileItem constructor

Browse source 
the argument name is so misleading, why is that? I did not name it..

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-27 17:51:43 +03:00
parent 825763d73f
commit b2a8af5dd6
4 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kio/kio/kdirlister.cpp
View file

@ -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;

4
kio/kio/kfileitem.cpp
View file

@ -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))
{
}

3
kio/kio/kfileitem.h
View file

@ -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.

19
kio/tests/kfileitemtest.cpp
View file

@ -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));