Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 18:32:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: adjust to KFileItem changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-27 19:29:45 +03:00
parent 0bc3eed75c
commit b8224cb851
8 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gwenview/importer/importer.cpp
View file

@ -112,12 +112,11 @@ struct ImporterPrivate
KUrl dst = src.upUrl(); KUrl dst = src.upUrl();
QString fileName; QString fileName;
if (mFileNameFormater.get()) { if (mFileNameFormater.get()) {
KFileItem item(KFileItem::Unknown, KFileItem::Unknown, src);
// Get the document time, but do not cache the result because the // Get the document time, but do not cache the result because the
// 'src' url is temporary: if we import "foo/image.jpg" and // 'src' url is temporary: if we import "foo/image.jpg" and
// "bar/image.jpg", both images will be temporarily saved in the // "bar/image.jpg", both images will be temporarily saved in the
// 'src' url. // 'src' url.
QDateTime dateTime = TimeUtils::dateTimeForFileItem(item, TimeUtils::SkipCache); QDateTime dateTime = TimeUtils::dateTimeForFileItem(KFileItem(src), TimeUtils::SkipCache);
fileName = mFileNameFormater->format(src, dateTime); fileName = mFileNameFormater->format(src, dateTime);
} else { } else {
fileName = src.fileName(); fileName = src.fileName();

3
gwenview/lib/contextmanager.cpp
View file

@ -73,8 +73,7 @@ struct ContextManagerPrivate
// the list if we are viewing a non-browsable url, for example // the list if we are viewing a non-browsable url, for example
// using http protocol) // using http protocol)
if (mSelectedFileItemList.isEmpty() && mCurrentUrl.isValid()) { if (mSelectedFileItemList.isEmpty() && mCurrentUrl.isValid()) {
KFileItem item(KFileItem::Unknown, KFileItem::Unknown, mCurrentUrl); mSelectedFileItemList << KFileItem(mCurrentUrl);
mSelectedFileItemList << item;
} }
mSelectedFileItemListNeedsUpdate = false; mSelectedFileItemListNeedsUpdate = false;

3
gwenview/lib/historymodel.cpp
View file

@ -138,8 +138,7 @@ private:
setData(qVariantFromValue(mUrl), KFilePlacesModel::UrlRole); setData(qVariantFromValue(mUrl), KFilePlacesModel::UrlRole);
KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, mUrl); setData(QVariant(KFileItem(mUrl)), KDirModel::FileItemRole);
setData(QVariant(fileItem), KDirModel::FileItemRole);
QString date = KGlobal::locale()->formatDateTime(mDateTime, QLocale::NarrowFormat); QString date = KGlobal::locale()->formatDateTime(mDateTime, QLocale::NarrowFormat);
setData(QVariant(i18n("Last visited: %1", date)), Qt::ToolTipRole); setData(QVariant(i18n("Last visited: %1", date)), Qt::ToolTipRole);

2
gwenview/lib/imagemetainfomodel.cpp
View file

@ -265,7 +265,7 @@ ImageMetaInfoModel::~ImageMetaInfoModel()
void ImageMetaInfoModel::setUrl(const KUrl& url) void ImageMetaInfoModel::setUrl(const KUrl& url)
{ {
KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); KFileItem item(url);
QString sizeString = KGlobal::locale()->formatByteSize(item.size()); QString sizeString = KGlobal::locale()->formatByteSize(item.size());
d->setGroupEntryValue(GeneralGroup, "General.Name", item.name()); d->setGroupEntryValue(GeneralGroup, "General.Name", item.name());

4
gwenview/tests/auto/timeutilstest.cpp
View file

@ -52,7 +52,7 @@ void TimeUtilsTest::testBasic_data()
NEW_ROW("date/exif-datetime-only.jpg", QDateTime::fromString("2003-03-25T02:02:21", Qt::ISODate)); NEW_ROW("date/exif-datetime-only.jpg", QDateTime::fromString("2003-03-25T02:02:21", Qt::ISODate));
KUrl url = urlForTestFile("test.png"); KUrl url = urlForTestFile("test.png");
KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); KFileItem item(url);
NEW_ROW("test.png", item.time(KFileItem::ModificationTime)); NEW_ROW("test.png", item.time(KFileItem::ModificationTime));
} }
@ -62,7 +62,7 @@ void TimeUtilsTest::testBasic()
QFETCH(QDateTime, expectedDateTime); QFETCH(QDateTime, expectedDateTime);
QDateTime dateTime; QDateTime dateTime;
KUrl url = urlForTestFile(fileName); KUrl url = urlForTestFile(fileName);
KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); KFileItem item(url);
dateTime = TimeUtils::dateTimeForFileItem(item); dateTime = TimeUtils::dateTimeForFileItem(item);
QCOMPARE(dateTime, expectedDateTime); QCOMPARE(dateTime, expectedDateTime);

2
kdeplasma-addons/wallpapers/pattern/backgroundlistmodel.cpp
View file

@ -164,7 +164,7 @@ QVariant BackgroundListModel::data(const QModelIndex &index, int role) const
if (!m_previewJobs.contains(file) && file.isValid()) { if (!m_previewJobs.contains(file) && file.isValid()) {
KFileItemList list; KFileItemList list;
list.append(KFileItem(file, QString(), 0)); list.append(KFileItem(file));
KIO::PreviewJob* job = KIO::filePreview(list, KIO::PreviewJob* job = KIO::filePreview(list,
QSize(BackgroundDelegate::SCREENSHOT_SIZE, QSize(BackgroundDelegate::SCREENSHOT_SIZE,
BackgroundDelegate::SCREENSHOT_SIZE/1.6)); BackgroundDelegate::SCREENSHOT_SIZE/1.6));

2
kdeplasma-addons/wallpapers/virus/backgroundlistmodel.cpp
View file

@ -204,7 +204,7 @@ QVariant BackgroundListModel::data(const QModelIndex &index, int role) const
KUrl file(b->filePath("preferred")); KUrl file(b->filePath("preferred"));
if (!m_previewJobs.contains(file) && file.isValid()) { if (!m_previewJobs.contains(file) && file.isValid()) {
KFileItemList list; KFileItemList list;
list.append(KFileItem(file, QString(), 0)); list.append(KFileItem(file));
KIO::PreviewJob* job = KIO::filePreview(list, KIO::PreviewJob* job = KIO::filePreview(list,
QSize(BackgroundDelegate::SCREENSHOT_SIZE, QSize(BackgroundDelegate::SCREENSHOT_SIZE,
BackgroundDelegate::SCREENSHOT_SIZE/1.6)); BackgroundDelegate::SCREENSHOT_SIZE/1.6));

2
okular/ui/snapshottaker.cpp
View file

@ -24,7 +24,7 @@ SnapshotTaker::SnapshotTaker( const KUrl &url, QObject *parent, const QSize &siz
const QSize biggersize = (size * 4); const QSize biggersize = (size * 4);
m_job = KIO::filePreview( m_job = KIO::filePreview(
KFileItemList() << KFileItem(url, QString(), 0), KFileItemList() << KFileItem(url),
biggersize, biggersize,
&m_plugins &m_plugins
); );