mirror of
https://bitbucket.org/smil3y/kde-extraapps.git
synced 2025-02-23 02:12:54 +00:00
generic: adjust to KFileItem changes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
0bc3eed75c
commit
b8224cb851
8 changed files with 9 additions and 12 deletions
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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());
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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
|
||||
);
|
||||
|
|
Loading…
Add table
Reference in a new issue