From 197a7f690571256c8007b78a8fea30edb176a978 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Wed, 7 Sep 2022 22:01:09 +0200 Subject: Port away from deprecated KIO API --- src/panels/folders/treeviewcontextmenu.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'src/panels/folders/treeviewcontextmenu.cpp') diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp index df96b9f25..893a494fb 100644 --- a/src/panels/folders/treeviewcontextmenu.cpp +++ b/src/panels/folders/treeviewcontextmenu.cpp @@ -14,8 +14,6 @@ #include #include #include -#include -#include #include #include #include @@ -24,6 +22,14 @@ #include #include +#include +#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0) +#include +#else +#include +#include +#endif + #include #include #include @@ -193,6 +199,11 @@ void TreeViewContextMenu::rename() void TreeViewContextMenu::moveToTrash() { +#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0) + using Iface = KIO::AskUserActionInterface; + auto *deleteJob = new KIO::DeleteOrTrashJob(QList{m_fileItem.url()}, Iface::Trash, Iface::DefaultConfirmation, m_parent); + deleteJob->start(); +#else const QList list{m_fileItem.url()}; KIO::JobUiDelegate uiDelegate; uiDelegate.setWindow(m_parent); @@ -202,10 +213,16 @@ void TreeViewContextMenu::moveToTrash() KJobWidgets::setWindow(job, m_parent); job->uiDelegate()->setAutoErrorHandlingEnabled(true); } +#endif } void TreeViewContextMenu::deleteItem() { +#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0) + using Iface = KIO::AskUserActionInterface; + auto *deleteJob = new KIO::DeleteOrTrashJob(QList{m_fileItem.url()}, Iface::Delete, Iface::DefaultConfirmation, m_parent); + deleteJob->start(); +#else const QList list{m_fileItem.url()}; KIO::JobUiDelegate uiDelegate; uiDelegate.setWindow(m_parent); @@ -214,6 +231,7 @@ void TreeViewContextMenu::deleteItem() KJobWidgets::setWindow(job, m_parent); job->uiDelegate()->setAutoErrorHandlingEnabled(true); } +#endif } void TreeViewContextMenu::showProperties() -- cgit v1.3