Prepare to add important/unread

kmail/checkbeforedeletemailplugins/confirmbeforedeleting/confirmbeforedeletingcreaterulewidget.cpp

@@ -62,6 +62,8 @@ void ConfirmBeforeDeletingCreateRuleWidget::fillComboBox()
     mRuleTypeComboBox->addItem(i18n("To"), ConfirmBeforeDeletingRule::ruleTypeToString(ConfirmBeforeDeletingRule::To));
     mRuleTypeComboBox->addItem(i18n("Cc"), ConfirmBeforeDeletingRule::ruleTypeToString(ConfirmBeforeDeletingRule::Cc));
     mRuleTypeComboBox->addItem(i18n("Bcc"), ConfirmBeforeDeletingRule::ruleTypeToString(ConfirmBeforeDeletingRule::Bcc));
+    mRuleTypeComboBox->addItem(i18n("Unread"), ConfirmBeforeDeletingRule::ruleTypeToString(ConfirmBeforeDeletingRule::Unread));
+    mRuleTypeComboBox->addItem(i18n("Important"), ConfirmBeforeDeletingRule::ruleTypeToString(ConfirmBeforeDeletingRule::Important));
 }
 
 bool ConfirmBeforeDeletingCreateRuleWidget::ConfirmBeforeDeletingInfo::operator==(const ConfirmBeforeDeletingInfo &other) const

kmail/checkbeforedeletemailplugins/confirmbeforedeleting/confirmbeforedeletingrule.cpp

@@ -64,6 +64,10 @@ ConfirmBeforeDeletingRule::RuleType ConfirmBeforeDeletingRule::stringToRuleType(
         return Cc;
     } else if (str == QLatin1String("bcc")) {
         return Bcc;
+    } else if (str == QLatin1String("unread")) {
+        return Unread;
+    } else if (str == QLatin1String("important")) {
+        return Important;
     }
     return Unknown;
 }
@@ -94,6 +98,12 @@ QString ConfirmBeforeDeletingRule::ruleTypeToString(ConfirmBeforeDeletingRule::R
     case Bcc:
         tmp = QStringLiteral("bcc");
         break;
+    case Unread:
+        tmp = QStringLiteral("unread");
+        break;
+    case Important:
+        tmp = QStringLiteral("important");
+        break;
     }
     return tmp;
 }

kmail/checkbeforedeletemailplugins/confirmbeforedeleting/confirmbeforedeletingrule.h

@@ -22,10 +22,8 @@ public:
         To,
         Cc,
         Bcc,
-#if 0
         Unread,
         Important,
-#endif
     };
     Q_ENUM(RuleType)