Allow to return info about "don't remove email"

kmail/checkbeforedeletemailplugins/confirmbeforedeleting/confirmbeforedeletinginterface.cpp

@@ -20,8 +20,9 @@ ConfirmBeforeDeletingInterface::~ConfirmBeforeDeletingInterface()
 Akonadi::Item::List ConfirmBeforeDeletingInterface::exec(const Akonadi::Item::List &list)
 {
     Akonadi::Item::List lst;
+    QString checkFoundStr;
     for (const auto &item : list) {
-        if (ConfirmBeforeDeletingManager::self()->deletingNeedToConfirm(item)) {
+        if (ConfirmBeforeDeletingManager::self()->deletingNeedToConfirm(item, checkFoundStr)) {
             // Use subject ?
             if (KMessageBox::questionYesNo(parentWidget(), i18n("Do you want to delete this email?"), i18n("Confirm Delete Mail")) == KMessageBox::Yes) {
                 lst << item;

kmail/checkbeforedeletemailplugins/confirmbeforedeleting/confirmbeforedeletingmanager.cpp

@@ -83,10 +83,10 @@ void ConfirmBeforeDeletingManager::saveRules()
     }
 }
 
-bool ConfirmBeforeDeletingManager::deletingNeedToConfirm(const Akonadi::Item &item) const
+bool ConfirmBeforeDeletingManager::deletingNeedToConfirm(const Akonadi::Item &item, QString &checkFound) const
 {
     for (const auto &r : std::as_const(mRules)) {
-        if (r.deletingNeedToConfirm(item)) {
+        if (r.deletingNeedToConfirm(item, checkFound)) {
             return true;
         }
     }

kmail/checkbeforedeletemailplugins/confirmbeforedeleting/confirmbeforedeletingmanager.h

@@ -25,7 +25,7 @@ public:
     void loadRules();
     void saveRules();
 
-    Q_REQUIRED_RESULT bool deletingNeedToConfirm(const Akonadi::Item &list) const;
+    Q_REQUIRED_RESULT bool deletingNeedToConfirm(const Akonadi::Item &list, QString &checkFound) const;
 
     Q_REQUIRED_RESULT const QVector<ConfirmBeforeDeletingRule> &rules() const;
 

kmail/checkbeforedeletemailplugins/confirmbeforedeleting/confirmbeforedeletingrule.cpp

@@ -90,7 +90,7 @@ QString ConfirmBeforeDeletingRule::ruleTypeToString(ConfirmBeforeDeletingRule::R
     return tmp;
 }
 
-bool ConfirmBeforeDeletingRule::deletingNeedToConfirm(const Akonadi::Item &item) const
+bool ConfirmBeforeDeletingRule::deletingNeedToConfirm(const Akonadi::Item &item, QString &checkFound) const
 {
     bool needToConfirm = false;
     if (item.hasPayload<KMime::Message::Ptr>()) {

kmail/checkbeforedeletemailplugins/confirmbeforedeleting/confirmbeforedeletingrule.h

@@ -32,7 +32,7 @@ public:
     Q_REQUIRED_RESULT RuleType ruleType() const;
     void setRuleType(RuleType newRuleType);
 
-    Q_REQUIRED_RESULT bool deletingNeedToConfirm(const Akonadi::Item &item) const;
+    Q_REQUIRED_RESULT bool deletingNeedToConfirm(const Akonadi::Item &item, QString &checkFound) const;
 
     void save(KConfigGroup &group) const;
     void load(const KConfigGroup &group);