From 2dc0e64bce118887380d52fb581eecd537763a9e Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Thu, 21 Jul 2016 06:45:14 +0200
Subject: [PATCH] We need to move expunge method in kernel class. It will allow
 to move expunge trash outside kmail when we close kmail

---
 CMakeLists.txt                                           | 2 +-
 autotests/dummykernel.cpp                                | 6 ++++++
 autotests/dummykernel.h                                  | 1 +
 src/filter/filterimporter/autotests/filtertestkernel.cpp | 6 ++++++
 src/filter/filterimporter/autotests/filtertestkernel.h   | 1 +
 src/interfaces/mailinterfaces.h                          | 1 +
 6 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 381ecf1..a0aedc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMQtDeclareLoggingCategory)
 include(ECMAddTests)
 
-set(PIM_VERSION "5.2.80")
+set(PIM_VERSION "5.2.81")
 set(MAILCOMMON_LIB_VERSION ${PIM_VERSION})
 set(AKONADIMIME_LIB_VERSION "5.2.80")
 set(MESSAGELIB_LIB_VERSION "5.2.80")
diff --git a/autotests/dummykernel.cpp b/autotests/dummykernel.cpp
index e71803c..ea30178 100644
--- a/autotests/dummykernel.cpp
+++ b/autotests/dummykernel.cpp
@@ -76,6 +76,12 @@ bool DummyKernel::showPopupAfterDnD()
     return false;
 }
 
+void DummyKernel::expunge(Akonadi::Collection::Id col, bool sync)
+{
+    Q_UNUSED(col);
+    Q_UNUSED(sync);
+}
+
 qreal DummyKernel::closeToQuotaThreshold()
 {
     return 80;
diff --git a/autotests/dummykernel.h b/autotests/dummykernel.h
index 60c54f6..336a5d1 100644
--- a/autotests/dummykernel.h
+++ b/autotests/dummykernel.h
@@ -35,6 +35,7 @@ public:
     Akonadi::Collection::Id lastSelectedFolder() Q_DECL_OVERRIDE;
     void setLastSelectedFolder(Akonadi::Collection::Id col) Q_DECL_OVERRIDE;
     bool showPopupAfterDnD() Q_DECL_OVERRIDE;
+    void expunge(Akonadi::Collection::Id col, bool sync) Q_DECL_OVERRIDE;
 
 private:
     KIdentityManagement::IdentityManager *mIdentityManager;
diff --git a/src/filter/filterimporter/autotests/filtertestkernel.cpp b/src/filter/filterimporter/autotests/filtertestkernel.cpp
index 265f33a..7137898 100644
--- a/src/filter/filterimporter/autotests/filtertestkernel.cpp
+++ b/src/filter/filterimporter/autotests/filtertestkernel.cpp
@@ -92,6 +92,12 @@ bool FilterTestKernel::showPopupAfterDnD()
     return false;
 }
 
+void FilterTestKernel::expunge(Akonadi::Collection::Id col, bool sync)
+{
+    Q_UNUSED(col);
+    Q_UNUSED(sync);
+}
+
 qreal FilterTestKernel::closeToQuotaThreshold()
 {
     return 80;
diff --git a/src/filter/filterimporter/autotests/filtertestkernel.h b/src/filter/filterimporter/autotests/filtertestkernel.h
index 960cccf..a204283 100644
--- a/src/filter/filterimporter/autotests/filtertestkernel.h
+++ b/src/filter/filterimporter/autotests/filtertestkernel.h
@@ -51,6 +51,7 @@ public:
     Akonadi::Collection::Id lastSelectedFolder() Q_DECL_OVERRIDE;
     void setLastSelectedFolder(Akonadi::Collection::Id col) Q_DECL_OVERRIDE;
     bool showPopupAfterDnD() Q_DECL_OVERRIDE;
+    void expunge(Akonadi::Collection::Id col, bool sync) Q_DECL_OVERRIDE;
 
 private:
     KIdentityManagement::IdentityManager *mIdentityManager;
diff --git a/src/interfaces/mailinterfaces.h b/src/interfaces/mailinterfaces.h
index 3e59791..f41b872 100644
--- a/src/interfaces/mailinterfaces.h
+++ b/src/interfaces/mailinterfaces.h
@@ -67,6 +67,7 @@ public:
     virtual Akonadi::ChangeRecorder *folderCollectionMonitor() const = 0;
     virtual void updateSystemTray() = 0;
     virtual MessageComposer::MessageSender *msgSender() = 0;
+    virtual void expunge(Akonadi::Collection::Id col, bool sync) = 0;
 
     virtual ~IKernel()
     {