Add explicit moc includes to sources for moc-covered headers

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

diff --git a/src/trash/dolphintrash.cpp b/src/trash/dolphintrash.cpp
index 1446ab38812754fa6abe2f15e23c6d85a43b907a..b37a7430ddfc724c8851ef3338c1f80ff1255dd0 100644 (file)
--- a/src/trash/dolphintrash.cpp
+++ b/src/trash/dolphintrash.cpp
@@ -7,14 +7,19 @@
 
 #include "dolphintrash.h"
 
 
 #include "dolphintrash.h"
 

-#include <KIO/JobUiDelegate>
-#include <kio_version.h>
-#include <KJobWidgets>
-#include <QList>
-#include <KNotification>

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

+#include <KNotification>
+#include <QList>
+
+#include <kio_version.h>
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+#include <KIO/DeleteOrTrashJob>
+#else
+#include <KIO/JobUiDelegate>
+#include <KJobWidgets>
+#endif

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


@@ -44,24 +49,35 @@ 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)

 {
 {

+#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+    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();
+#else

     KIO::JobUiDelegate uiDelegate;
     uiDelegate.setWindow(window);
     bool confirmed = uiDelegate.askDeleteConfirmation(QList<QUrl>(), KIO::JobUiDelegate::EmptyTrash, KIO::JobUiDelegate::DefaultConfirmation);
     if (confirmed) {
     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();
+        KIO::Job *job = KIO::emptyTrash();

         KJobWidgets::setWindow(job, window);
         job->uiDelegate()->setAutoErrorHandlingEnabled(true);
         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;
+        QObject::connect(job, &KIO::Job::result, notifyEmptied);

     }
     }

-    return nullptr;
+#endif

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


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

+#include "moc_dolphintrash.cpp"