diff --git a/gwenview/importer/importer.cpp b/gwenview/importer/importer.cpp index ac9a78fa..edd3cf08 100644 --- a/gwenview/importer/importer.cpp +++ b/gwenview/importer/importer.cpp @@ -112,12 +112,11 @@ struct ImporterPrivate KUrl dst = src.upUrl(); QString fileName; if (mFileNameFormater.get()) { - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, src); // Get the document time, but do not cache the result because the // 'src' url is temporary: if we import "foo/image.jpg" and // "bar/image.jpg", both images will be temporarily saved in the // 'src' url. - QDateTime dateTime = TimeUtils::dateTimeForFileItem(item, TimeUtils::SkipCache); + QDateTime dateTime = TimeUtils::dateTimeForFileItem(KFileItem(src), TimeUtils::SkipCache); fileName = mFileNameFormater->format(src, dateTime); } else { fileName = src.fileName(); diff --git a/gwenview/lib/contextmanager.cpp b/gwenview/lib/contextmanager.cpp index af792361..2646e4be 100644 --- a/gwenview/lib/contextmanager.cpp +++ b/gwenview/lib/contextmanager.cpp @@ -73,8 +73,7 @@ struct ContextManagerPrivate // the list if we are viewing a non-browsable url, for example // using http protocol) if (mSelectedFileItemList.isEmpty() && mCurrentUrl.isValid()) { - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, mCurrentUrl); - mSelectedFileItemList << item; + mSelectedFileItemList << KFileItem(mCurrentUrl); } mSelectedFileItemListNeedsUpdate = false; diff --git a/gwenview/lib/historymodel.cpp b/gwenview/lib/historymodel.cpp index 34c36b39..ade2bdb9 100644 --- a/gwenview/lib/historymodel.cpp +++ b/gwenview/lib/historymodel.cpp @@ -138,8 +138,7 @@ private: setData(qVariantFromValue(mUrl), KFilePlacesModel::UrlRole); - KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, mUrl); - setData(QVariant(fileItem), KDirModel::FileItemRole); + setData(QVariant(KFileItem(mUrl)), KDirModel::FileItemRole); QString date = KGlobal::locale()->formatDateTime(mDateTime, QLocale::NarrowFormat); setData(QVariant(i18n("Last visited: %1", date)), Qt::ToolTipRole); diff --git a/gwenview/lib/imagemetainfomodel.cpp b/gwenview/lib/imagemetainfomodel.cpp index 05e7a65e..fe845469 100644 --- a/gwenview/lib/imagemetainfomodel.cpp +++ b/gwenview/lib/imagemetainfomodel.cpp @@ -265,7 +265,7 @@ ImageMetaInfoModel::~ImageMetaInfoModel() void ImageMetaInfoModel::setUrl(const KUrl& url) { - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + KFileItem item(url); QString sizeString = KGlobal::locale()->formatByteSize(item.size()); d->setGroupEntryValue(GeneralGroup, "General.Name", item.name()); diff --git a/gwenview/tests/auto/timeutilstest.cpp b/gwenview/tests/auto/timeutilstest.cpp index 3590dc08..f4256dbb 100644 --- a/gwenview/tests/auto/timeutilstest.cpp +++ b/gwenview/tests/auto/timeutilstest.cpp @@ -52,7 +52,7 @@ void TimeUtilsTest::testBasic_data() NEW_ROW("date/exif-datetime-only.jpg", QDateTime::fromString("2003-03-25T02:02:21", Qt::ISODate)); KUrl url = urlForTestFile("test.png"); - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + KFileItem item(url); NEW_ROW("test.png", item.time(KFileItem::ModificationTime)); } @@ -62,7 +62,7 @@ void TimeUtilsTest::testBasic() QFETCH(QDateTime, expectedDateTime); QDateTime dateTime; KUrl url = urlForTestFile(fileName); - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + KFileItem item(url); dateTime = TimeUtils::dateTimeForFileItem(item); QCOMPARE(dateTime, expectedDateTime); diff --git a/kdeplasma-addons/wallpapers/pattern/backgroundlistmodel.cpp b/kdeplasma-addons/wallpapers/pattern/backgroundlistmodel.cpp index 7174108e..2f7ab4c6 100644 --- a/kdeplasma-addons/wallpapers/pattern/backgroundlistmodel.cpp +++ b/kdeplasma-addons/wallpapers/pattern/backgroundlistmodel.cpp @@ -164,7 +164,7 @@ QVariant BackgroundListModel::data(const QModelIndex &index, int role) const if (!m_previewJobs.contains(file) && file.isValid()) { KFileItemList list; - list.append(KFileItem(file, QString(), 0)); + list.append(KFileItem(file)); KIO::PreviewJob* job = KIO::filePreview(list, QSize(BackgroundDelegate::SCREENSHOT_SIZE, BackgroundDelegate::SCREENSHOT_SIZE/1.6)); diff --git a/kdeplasma-addons/wallpapers/virus/backgroundlistmodel.cpp b/kdeplasma-addons/wallpapers/virus/backgroundlistmodel.cpp index 66ffe1f3..255fd08e 100644 --- a/kdeplasma-addons/wallpapers/virus/backgroundlistmodel.cpp +++ b/kdeplasma-addons/wallpapers/virus/backgroundlistmodel.cpp @@ -204,7 +204,7 @@ QVariant BackgroundListModel::data(const QModelIndex &index, int role) const KUrl file(b->filePath("preferred")); if (!m_previewJobs.contains(file) && file.isValid()) { KFileItemList list; - list.append(KFileItem(file, QString(), 0)); + list.append(KFileItem(file)); KIO::PreviewJob* job = KIO::filePreview(list, QSize(BackgroundDelegate::SCREENSHOT_SIZE, BackgroundDelegate::SCREENSHOT_SIZE/1.6)); diff --git a/okular/ui/snapshottaker.cpp b/okular/ui/snapshottaker.cpp index 2ca99de9..3d2313d3 100644 --- a/okular/ui/snapshottaker.cpp +++ b/okular/ui/snapshottaker.cpp @@ -24,7 +24,7 @@ SnapshotTaker::SnapshotTaker( const KUrl &url, QObject *parent, const QSize &siz const QSize biggersize = (size * 4); m_job = KIO::filePreview( - KFileItemList() << KFileItem(url, QString(), 0), + KFileItemList() << KFileItem(url), biggersize, &m_plugins );