mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +00:00
port away from deprecated KFileItem(mode_t mode, mode_t permissions, const QUrl &url, bool delayedMimeTypes = false);
This commit is contained in:
parent
895a7c941b
commit
a07d63d419
|
@ -468,7 +468,7 @@ KFileItemListProperties& DolphinContextMenu::selectedItemsProperties() const
|
|||
KFileItem DolphinContextMenu::baseFileItem()
|
||||
{
|
||||
if (!m_baseFileItem) {
|
||||
m_baseFileItem = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
|
||||
m_baseFileItem = new KFileItem(m_baseUrl);
|
||||
}
|
||||
return *m_baseFileItem;
|
||||
}
|
||||
|
|
|
@ -404,7 +404,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
|
|||
popupFlags |= KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp;
|
||||
item = m_view->rootItem();
|
||||
if (item.isNull())
|
||||
item = KFileItem( S_IFDIR, (mode_t)-1, url() );
|
||||
item = KFileItem(url());
|
||||
else
|
||||
item.setUrl(url()); // ensure we use the view url, not the canonical path (#213799)
|
||||
}
|
||||
|
|
|
@ -479,7 +479,7 @@ void DolphinViewContainer::slotDirectoryLoadingCanceled()
|
|||
|
||||
void DolphinViewContainer::slotUrlIsFileError(const QUrl& url)
|
||||
{
|
||||
const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
|
||||
const KFileItem item(url);
|
||||
|
||||
// Find out if the file can be opened in the view (for example, this is the
|
||||
// case if the file is an archive). The mime type must be known for that.
|
||||
|
|
|
@ -228,7 +228,7 @@ void InformationPanel::slotFileRenamed(const QString& source, const QString& des
|
|||
{
|
||||
if (m_shownUrl == QUrl::fromLocalFile(source)) {
|
||||
m_shownUrl = QUrl::fromLocalFile(dest);
|
||||
m_fileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_shownUrl);
|
||||
m_fileItem = KFileItem(m_shownUrl);
|
||||
|
||||
if ((m_selection.count() == 1) && (m_selection[0].url() == QUrl::fromLocalFile(source))) {
|
||||
m_selection[0] = m_fileItem;
|
||||
|
@ -247,7 +247,7 @@ void InformationPanel::slotFilesAdded(const QString& directory)
|
|||
if (m_shownUrl == QUrl::fromLocalFile(directory)) {
|
||||
// If the 'trash' icon changes because the trash has been emptied or got filled,
|
||||
// the signal filesAdded("trash:/") will be emitted.
|
||||
KFileItem item(KFileItem::Unknown, KFileItem::Unknown, QUrl::fromLocalFile(directory));
|
||||
KFileItem item(QUrl::fromLocalFile(directory));
|
||||
requestDelayedItemInfo(item);
|
||||
}
|
||||
}
|
||||
|
@ -277,7 +277,7 @@ void InformationPanel::slotFilesRemoved(const QStringList& files)
|
|||
void InformationPanel::slotEnteredDirectory(const QString& directory)
|
||||
{
|
||||
if (m_shownUrl == QUrl::fromLocalFile(directory)) {
|
||||
KFileItem item(KFileItem::Unknown, KFileItem::Unknown, QUrl::fromLocalFile(directory));
|
||||
KFileItem item(QUrl::fromLocalFile(directory));
|
||||
requestDelayedItemInfo(item);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -118,7 +118,7 @@ void StartupSettingsPage::applySettings()
|
|||
GeneralSettings* settings = GeneralSettings::self();
|
||||
|
||||
const QUrl url(QUrl::fromLocalFile(m_homeUrl->text()));
|
||||
KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, url);
|
||||
KFileItem fileItem(url);
|
||||
if ((url.isValid() && fileItem.isDir()) || (url.scheme() == QLatin1String("timeline"))) {
|
||||
settings->setHomeUrl(url.toDisplayString(QUrl::PreferLocalFile));
|
||||
} else {
|
||||
|
|
|
@ -1448,7 +1448,7 @@ void KFileItemModelTest::testInconsistentModel()
|
|||
// in the model yet). Otherwise, KFileItemModel::slotItemsAdded() will see that
|
||||
// it receives items that are in the model already and ignore them.
|
||||
QUrl url(m_model->directory().url() + "/a2");
|
||||
KFileItem newItem(KFileItem::Unknown, KFileItem::Unknown, url);
|
||||
KFileItem newItem(url);
|
||||
|
||||
KFileItemList items;
|
||||
items << newItem << m_model->fileItem(2) << m_model->fileItem(3);
|
||||
|
|
|
@ -1698,7 +1698,8 @@ void DolphinView::updateWritableState()
|
|||
if (item.isNull()) {
|
||||
// Try to find out if the URL is writable even if the "root item" is
|
||||
// null, see https://bugs.kde.org/show_bug.cgi?id=330001
|
||||
item = KFileItem(KFileItem::Unknown, KFileItem::Unknown, url(), true);
|
||||
item = KFileItem(url());
|
||||
item.setDelayedMimeTypes(true);
|
||||
}
|
||||
|
||||
KFileItemListProperties capabilities(KFileItemList() << item);
|
||||
|
|
Loading…
Reference in a new issue