diff options
| author | Jakob Petsovits <[email protected]> | 2023-05-12 16:56:36 -0400 |
|---|---|---|
| committer | Jakob Petsovits <[email protected]> | 2023-05-12 16:56:36 -0400 |
| commit | 1b0caf69a845d0a68c3d8d1a6bdf98568a673501 (patch) | |
| tree | c67f1558a531f4f5f3358320d52b1436c35af85a /src/panels | |
| parent | ac1f8131f9defa2e949804dc621f082b069c0e4b (diff) | |
Remove deprecated, ifdef'd code for old KIO versions
Diffstat (limited to 'src/panels')
| -rw-r--r-- | src/panels/folders/treeviewcontextmenu.cpp | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp index f6cafcac5..cff8bd029 100644 --- a/src/panels/folders/treeviewcontextmenu.cpp +++ b/src/panels/folders/treeviewcontextmenu.cpp @@ -13,7 +13,7 @@ #include <KConfigGroup> #include <KFileItemListProperties> #include <KIO/CopyJob> -#include <KIO/DeleteJob> +#include <KIO/DeleteOrTrashJob> #include <KIO/Paste> #include <KIO/PasteJob> #include <KJobWidgets> @@ -22,14 +22,6 @@ #include <KSharedConfig> #include <KUrlMimeData> -#include <kio_version.h> -#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0) -#include <KIO/DeleteOrTrashJob> -#else -#include <KIO/FileUndoManager> -#include <KIO/JobUiDelegate> -#endif - #include <QApplication> #include <QClipboard> #include <QMenu> @@ -197,39 +189,16 @@ 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<QUrl> list{m_fileItem.url()}; - KIO::JobUiDelegate uiDelegate; - uiDelegate.setWindow(m_parent); - if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Trash, KIO::JobUiDelegate::DefaultConfirmation)) { - KIO::Job *job = KIO::trash(list); - KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, list, QUrl(QStringLiteral("trash:/")), job); - 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<QUrl> list{m_fileItem.url()}; - KIO::JobUiDelegate uiDelegate; - uiDelegate.setWindow(m_parent); - if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Delete, KIO::JobUiDelegate::DefaultConfirmation)) { - KIO::Job *job = KIO::del(list); - KJobWidgets::setWindow(job, m_parent); - job->uiDelegate()->setAutoErrorHandlingEnabled(true); - } -#endif } void TreeViewContextMenu::showProperties() |