Merge branch 'master' into kf6

[dolphin.git] / src / trash / dolphintrash.cpp

diff --git a/src/trash/dolphintrash.cpp b/src/trash/dolphintrash.cpp
index 35c5bbdfb30dd424e2ea2b5a6804589638b86fbe..bbc9c579f40ad80a040a42d865c055005065f592 100644 (file)
--- a/src/trash/dolphintrash.cpp
+++ b/src/trash/dolphintrash.cpp
@@ -7,13 +7,13 @@
 
 #include "dolphintrash.h"
 
 
 #include "dolphintrash.h"
 

-#include <KIO/JobUiDelegate>
-#include <KJobWidgets>
-#include <QList>
-#include <KNotification>

 #include <KConfig>
 #include <KConfigGroup>
 #include <KConfig>
 #include <KConfigGroup>

+#include <KIO/DeleteOrTrashJob>

 #include <KLocalizedString>
 #include <KLocalizedString>

+#include <KNotification>
+
+#include <QList>

 
 Trash::Trash()
     : m_trashDirLister(new KDirLister())
 
 Trash::Trash()
     : m_trashDirLister(new KDirLister())


@@ -21,13 +21,13 @@ Trash::Trash()
     // The trash icon must always be updated dependent on whether
     // the trash is empty or not. We use a KDirLister that automatically
     // watches for changes if the number of items has been changed.
     // The trash icon must always be updated dependent on whether
     // the trash is empty or not. We use a KDirLister that automatically
     // watches for changes if the number of items has been changed.

-    m_trashDirLister->setAutoErrorHandlingEnabled(false, nullptr);
+    m_trashDirLister->setAutoErrorHandlingEnabled(false);

     m_trashDirLister->setDelayedMimeTypes(true);
     auto trashDirContentChanged = [this]() {
         bool isTrashEmpty = m_trashDirLister->items().isEmpty();
     m_trashDirLister->setDelayedMimeTypes(true);
     auto trashDirContentChanged = [this]() {
         bool isTrashEmpty = m_trashDirLister->items().isEmpty();

-        emit emptinessChanged(isTrashEmpty);
+        Q_EMIT emptinessChanged(isTrashEmpty);

     };
     };

-    connect(m_trashDirLister, QOverload<>::of(&KCoreDirLister::completed), this, trashDirContentChanged);
+    connect(m_trashDirLister, &KCoreDirLister::completed, this, trashDirContentChanged);

     connect(m_trashDirLister, &KDirLister::itemsDeleted, this, trashDirContentChanged);
     m_trashDirLister->openUrl(QUrl(QStringLiteral("trash:/")));
 }
     connect(m_trashDirLister, &KDirLister::itemsDeleted, this, trashDirContentChanged);
     m_trashDirLister->openUrl(QUrl(QStringLiteral("trash:/")));
 }


@@ -43,24 +43,23 @@ Trash &Trash::instance()
     return result;
 }
 
     return result;
 }
 

-KIO::Job *Trash::empty(QWidget *window)
+static void notifyEmptied()
+{
+    // As long as KIO doesn't do this, do it ourselves
+    KNotification::event(QStringLiteral("Trash: emptied"),
+                         i18n("Trash Emptied"),
+                         i18n("The Trash was emptied."),
+                         QStringLiteral("user-trash"),
+                         nullptr,
+                         KNotification::DefaultEvent);
+}
+
+void Trash::empty(QWidget *window)

 {
 {

-    KIO::JobUiDelegate uiDelegate;
-    uiDelegate.setWindow(window);
-    bool confirmed = uiDelegate.askDeleteConfirmation(QList<QUrl>(), KIO::JobUiDelegate::EmptyTrash, KIO::JobUiDelegate::DefaultConfirmation);
-    if (confirmed) {
-        KIO::Job* job = KIO::emptyTrash();
-        KJobWidgets::setWindow(job, window);
-        job->uiDelegate()->setAutoErrorHandlingEnabled(true);
-         // as long as KIO doesn't do this, do it ourselves
-        connect(job, &KIO::Job::result, []() {
-            KNotification::event(QStringLiteral("Trash: emptied"), i18n("Trash Emptied"),
-                                 i18n("The Trash was emptied."), QStringLiteral("user-trash"),
-                                 nullptr, KNotification::DefaultEvent);
-        });
-        return job;
-    }
-    return nullptr;
+    using Iface = KIO::AskUserActionInterface;
+    auto *emptyJob = new KIO::DeleteOrTrashJob(QList<QUrl>{}, Iface::EmptyTrash, Iface::DefaultConfirmation, window);
+    QObject::connect(emptyJob, &KIO::Job::result, notifyEmptied);
+    emptyJob->start();

 }
 
 bool Trash::isEmpty()
 }
 
 bool Trash::isEmpty()


@@ -69,3 +68,4 @@ bool Trash::isEmpty()
     return (trashConfig.group("Status").readEntry("Empty", true));
 }
 
     return (trashConfig.group("Status").readEntry("Empty", true));
 }
 

+#include "moc_dolphintrash.cpp"