From 00c8b9a1a2a9d3261b51834264a216a546659747 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 27 May 2024 19:03:52 +0300 Subject: [PATCH] generic: adjust to KFileItem changes Signed-off-by: Ivailo Monev --- dolphin/src/dolphincontextmenu.cpp | 2 +- dolphin/src/dolphinviewcontainer.cpp | 2 +- dolphin/src/panels/information/informationpanel.cpp | 5 ++--- dolphin/src/settings/startup/startupsettingspage.cpp | 2 +- dolphin/src/views/dolphinview.cpp | 2 +- kate/src/app/katemainwindow.cpp | 2 +- kcontrol/autostart/autostart.cpp | 3 +-- kdialog/kdialog.cpp | 2 +- keditfiletype/kservicelistwidget.cpp | 2 +- kfind/kquery.cpp | 2 +- kioslave/trash/trashimpl.cpp | 3 +-- libs/konq/konq_operations.cpp | 11 ++++------- libs/konq/tests/konqpopupmenutest.cpp | 3 +-- plasma/applets/folderview/asyncfiletester.cpp | 2 +- plasma/applets/folderview/folderview.cpp | 3 +-- plasma/applets/folderview/popupview.cpp | 4 +--- plasma/applets/icon/icon.cpp | 2 +- plasma/wallpapers/image/backgroundlistmodel.cpp | 2 +- 18 files changed, 22 insertions(+), 32 deletions(-) diff --git a/dolphin/src/dolphincontextmenu.cpp b/dolphin/src/dolphincontextmenu.cpp index dbaf7d4f..17ea23a4 100644 --- a/dolphin/src/dolphincontextmenu.cpp +++ b/dolphin/src/dolphincontextmenu.cpp @@ -451,7 +451,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; } diff --git a/dolphin/src/dolphinviewcontainer.cpp b/dolphin/src/dolphinviewcontainer.cpp index 42e5c29e..94840ce7 100644 --- a/dolphin/src/dolphinviewcontainer.cpp +++ b/dolphin/src/dolphinviewcontainer.cpp @@ -436,7 +436,7 @@ void DolphinViewContainer::slotDirectoryLoadingCanceled() void DolphinViewContainer::slotUrlIsFileError(const KUrl& url) { - const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + const KFileItem item(url); // Find out if the file can be opened in the view. The mime type must be known for that. const KUrl& folderUrl = DolphinView::openItemAsFolderUrl(item); diff --git a/dolphin/src/panels/information/informationpanel.cpp b/dolphin/src/panels/information/informationpanel.cpp index f27abab2..4b619907 100644 --- a/dolphin/src/panels/information/informationpanel.cpp +++ b/dolphin/src/panels/information/informationpanel.cpp @@ -226,7 +226,7 @@ void InformationPanel::slotFileRenamed(const QString& source, const QString& des { if (m_shownUrl == KUrl(source)) { m_shownUrl = KUrl(dest); - m_fileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_shownUrl); + m_fileItem = KFileItem(m_shownUrl); if ((m_selection.count() == 1) && (m_selection[0].url() == KUrl(source))) { m_selection[0] = m_fileItem; @@ -245,8 +245,7 @@ void InformationPanel::slotFilesAdded(const QString& directory) if (m_shownUrl == KUrl(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, KUrl(directory)); - requestDelayedItemInfo(item); + requestDelayedItemInfo(KFileItem(KUrl(directory))); } } diff --git a/dolphin/src/settings/startup/startupsettingspage.cpp b/dolphin/src/settings/startup/startupsettingspage.cpp index e7e4bc3b..731ef94f 100644 --- a/dolphin/src/settings/startup/startupsettingspage.cpp +++ b/dolphin/src/settings/startup/startupsettingspage.cpp @@ -113,7 +113,7 @@ void StartupSettingsPage::applySettings() GeneralSettings* settings = GeneralSettings::self(); const KUrl url(m_homeUrl->text()); - KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, url); + KFileItem fileItem(url); if (url.isValid() && fileItem.isDir()) { settings->setHomeUrl(url.prettyUrl()); } else { diff --git a/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp index 044e4014..cfe1f90c 100644 --- a/dolphin/src/views/dolphinview.cpp +++ b/dolphin/src/views/dolphinview.cpp @@ -1607,7 +1607,7 @@ 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()); + item = KFileItem(url()); } KFileItemListProperties capabilities(KFileItemList() << item); diff --git a/kate/src/app/katemainwindow.cpp b/kate/src/app/katemainwindow.cpp index 18ad1f1d..09422a4a 100644 --- a/kate/src/app/katemainwindow.cpp +++ b/kate/src/app/katemainwindow.cpp @@ -660,7 +660,7 @@ void KateMainWindow::slotDropEvent( QDropEvent * event ) for (KUrl::List::Iterator i = textlist.begin(); i != textlist.end(); ++i) { // if url has no file component, try and recursively scan dir - KFileItem kitem( KFileItem::Unknown, KFileItem::Unknown, *i ); + KFileItem kitem(*i ); if( kitem.isDir() ) { KIO::ListJob *list_job = KIO::listRecursive(*i, KIO::DefaultFlags, false); connect(list_job, SIGNAL(entries(KIO::Job*,KIO::UDSEntryList)), diff --git a/kcontrol/autostart/autostart.cpp b/kcontrol/autostart/autostart.cpp index 9206fcfb..37c371ee 100644 --- a/kcontrol/autostart/autostart.cpp +++ b/kcontrol/autostart/autostart.cpp @@ -280,8 +280,7 @@ void Autostart::slotEditCMD(QTreeWidgetItem* ent) if (!ent) return; AutoStartItem *entry = dynamic_cast( ent ); if (entry) { - const KFileItem kfi = KFileItem( KFileItem::Unknown, KFileItem::Unknown, KUrl(entry->fileName())); - if (!slotEditCMD(kfi)) { + if (!slotEditCMD(KFileItem(KUrl(entry->fileName())))) { return; } diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index 3460dfab..a0625fb8 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -576,7 +576,7 @@ static int directCommand(KCmdLineArgs *args) // copied from KFileDialog::getSaveFileName(), so we can add geometry bool specialDir = ( startDir.at(0) == ':' ); if ( !specialDir ) { - KFileItem kfi(KFileItem::Unknown, KFileItem::Unknown, KUrl(startDir)); + KFileItem kfi = KFileItem(KUrl(startDir)); specialDir = kfi.isDir(); } KFileDialog dlg( specialDir ? startDir : QString(), filter, 0 ); diff --git a/keditfiletype/kservicelistwidget.cpp b/keditfiletype/kservicelistwidget.cpp index 174e6496..f1028119 100644 --- a/keditfiletype/kservicelistwidget.cpp +++ b/keditfiletype/kservicelistwidget.cpp @@ -320,7 +320,7 @@ void KServiceListWidget::editService() // path from KStandardDirs. path = KStandardDirs::locate("apps", path); // TODO use xdgdata-apps instead? - KFileItem item(KUrl(path), "application/x-desktop", KFileItem::Unknown); + KFileItem item = KFileItem(KUrl(path)); KPropertiesDialog dlg(item, this); if (dlg.exec() != QDialog::Accepted) return; diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp index f9bdd45d..ba54e98a 100644 --- a/kfind/kquery.cpp +++ b/kfind/kquery.cpp @@ -170,7 +170,7 @@ void KQuery::slotListEntries( QStringList list ) m_foundFilesList.clear(); for (; it != end; ++it) - processQuery( KFileItem( KFileItem::Unknown, KFileItem::Unknown, KUrl(*it)) ); + processQuery( KFileItem(KUrl(*it)) ); if( m_foundFilesList.size() > 0 ) emit foundFileList( m_foundFilesList ); diff --git a/kioslave/trash/trashimpl.cpp b/kioslave/trash/trashimpl.cpp index 5bc6b2b4..2ecc590c 100644 --- a/kioslave/trash/trashimpl.cpp +++ b/kioslave/trash/trashimpl.cpp @@ -514,9 +514,8 @@ bool TrashImpl::synchronousDel( const QString& path, bool setLastErrorCode, bool // otherwise we won't be able to delete files in them (#130780). if ( isDir ) { kDebug() << "chmod'ing " << url; - KFileItem fileItem( url, QString::fromLatin1("inode/directory"), KFileItem::Unknown ); KFileItemList fileItemList; - fileItemList.append( fileItem ); + fileItemList.append( KFileItem(url) ); KIO::ChmodJob* chmodJob = KIO::chmod( fileItemList, 0200, 0200, QString(), QString(), true /*recursive*/, KIO::HideProgressInfo ); connect( chmodJob, SIGNAL( result(KJob *) ), this, SLOT( jobFinished(KJob *) ) ); diff --git a/libs/konq/konq_operations.cpp b/libs/konq/konq_operations.cpp index 3b914926..fc8b9e51 100644 --- a/libs/konq/konq_operations.cpp +++ b/libs/konq/konq_operations.cpp @@ -572,10 +572,7 @@ void KonqOperations::doDropFileCopy() //now initialize the drop plugins KFileItemList fileItems; foreach(const KUrl& url, lst) { - fileItems.append(KFileItem( - KFileItem::Unknown, - KFileItem::Unknown, - url)); + fileItems.append(KFileItem(url)); } @@ -959,11 +956,11 @@ QPair KonqOperations::pasteInfo(const KUrl& targetUrl) if (!urls.isEmpty() || canPasteData) { // disable the paste action if no writing is supported - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, targetUrl); - ret.first = KFileItemListProperties(KFileItemList() << item).supportsWriting(); + ; + ret.first = KFileItemListProperties(KFileItemList() << KFileItem(targetUrl)).supportsWriting(); if (urls.count() == 1) { - const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, urls.first()); + const KFileItem item(urls.first()); ret.second = item.isDir() ? i18nc("@action:inmenu", "Paste One Folder") : i18nc("@action:inmenu", "Paste One File"); diff --git a/libs/konq/tests/konqpopupmenutest.cpp b/libs/konq/tests/konqpopupmenutest.cpp index 173179e7..9a7df332 100644 --- a/libs/konq/tests/konqpopupmenutest.cpp +++ b/libs/konq/tests/konqpopupmenutest.cpp @@ -197,9 +197,8 @@ void KonqPopupMenuTest::testFileInReadOnlyDirectory() QSKIP("/etc/passwd file is writable", SkipSingle); } - const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, KUrl(notwritablefile)); KFileItemList itemList; - itemList << item; + itemList << KFileItem(KUrl(notwritablefile)); KFileItemListProperties capabilities(itemList); QVERIFY(!capabilities.supportsMoving()); diff --git a/plasma/applets/folderview/asyncfiletester.cpp b/plasma/applets/folderview/asyncfiletester.cpp index 304ce2a2..d8475247 100644 --- a/plasma/applets/folderview/asyncfiletester.cpp +++ b/plasma/applets/folderview/asyncfiletester.cpp @@ -54,7 +54,7 @@ void AsyncFileTester::checkIfFolder(const QModelIndex &index, QObject *object, c if (file.readType() == "Link") { url = file.readUrl(); if (url.isLocalFile()) { - KFileItem destItem(KFileItem::Unknown, KFileItem::Unknown, url); + KFileItem destItem(url); callResultMethod(object, method, index, destItem.isDir()); return; } diff --git a/plasma/applets/folderview/folderview.cpp b/plasma/applets/folderview/folderview.cpp index 7c10f12e..f5a55e94 100644 --- a/plasma/applets/folderview/folderview.cpp +++ b/plasma/applets/folderview/folderview.cpp @@ -1749,8 +1749,7 @@ QList FolderView::contextualActions() // Create a new KFileItem to prevent the target URL in the root item // from being used. In this case we want the configured URL instead. - KFileItem item(rootItem.mode(), rootItem.permissions(), m_url); - KFileItemListProperties itemList(KFileItemList() << item); + KFileItemListProperties itemList(KFileItemList() << KFileItem(m_url)); m_itemActions->setItemListProperties(itemList); // FIXME: The actions instanciated by KFileItemActions::preferredOpenWithAction() diff --git a/plasma/applets/folderview/popupview.cpp b/plasma/applets/folderview/popupview.cpp index b03cf547..d4a50667 100644 --- a/plasma/applets/folderview/popupview.cpp +++ b/plasma/applets/folderview/popupview.cpp @@ -591,9 +591,7 @@ void PopupView::contextMenuEvent(QContextMenuEvent *event) if (!m_itemActions) { // Create a new KFileItem to prevent the target URL in the root item // from being used. In this case we want the configured URL instead. - KFileItem item(rootItem.mode(), rootItem.permissions(), m_url); - - KFileItemListProperties itemList(KFileItemList() << item); + KFileItemListProperties itemList(KFileItemList() << KFileItem(m_url)); m_itemActions = new KFileItemActions(this); m_itemActions->setItemListProperties(itemList); diff --git a/plasma/applets/icon/icon.cpp b/plasma/applets/icon/icon.cpp index 2aa7869d..a929a4c0 100644 --- a/plasma/applets/icon/icon.cpp +++ b/plasma/applets/icon/icon.cpp @@ -160,7 +160,7 @@ void IconApplet::setUrl(const KUrl& url, bool fromConfigDialog) connect(m_watcher, SIGNAL(dirty(QString)), this, SLOT(delayedDestroy())); QFileInfo fi(m_url.toLocalFile()); - KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, m_url.toLocalFile()); + KFileItem fileItem(m_url.toLocalFile()); if (fileItem.isDesktopFile()) { m_hasDesktopFile = true; diff --git a/plasma/wallpapers/image/backgroundlistmodel.cpp b/plasma/wallpapers/image/backgroundlistmodel.cpp index 072ab70c..dd2171a1 100644 --- a/plasma/wallpapers/image/backgroundlistmodel.cpp +++ b/plasma/wallpapers/image/backgroundlistmodel.cpp @@ -216,7 +216,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));