From 18b1150ad7925b3581f42ba1f636288b78980108 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Thu, 5 Mar 2015 22:06:06 +0100
Subject: [PATCH 1/2] Add comment

---
 followupreminder/followupremindercreatejob.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/followupreminder/followupremindercreatejob.cpp b/followupreminder/followupremindercreatejob.cpp
index 901a08197..6a8ec447e 100644
--- a/followupreminder/followupremindercreatejob.cpp
+++ b/followupreminder/followupremindercreatejob.cpp
@@ -21,6 +21,8 @@
 #include <KLocalizedString>
 #include <akonadi/itemcreatejob.h>
 
+//KF5 move to messagecomposer
+
 FollowupReminderCreateJob::FollowupReminderCreateJob(QObject *parent)
     : KJob(parent),
       mInfo(new FollowUpReminder::FollowUpReminderInfo)

From 279e747232a0a1911d66b569776a17f09b57e03a Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Thu, 5 Mar 2015 22:07:30 +0100
Subject: [PATCH 2/2] move followup info in composerviewbase directly

---
 editor/kmcomposewin.cpp | 34 +++++++---------------------------
 editor/kmcomposewin.h   |  9 ---------
 2 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/editor/kmcomposewin.cpp b/editor/kmcomposewin.cpp
index 763017b1b..2c2d32739 100644
--- a/editor/kmcomposewin.cpp
+++ b/editor/kmcomposewin.cpp
@@ -176,8 +176,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <memory>
-#include <boost/shared_ptr.hpp>
 #include <widgets/splittercollapser.h>
 #include <Akonadi/Contact/ContactGroupExpandJob>
 #include <editor/potentialphishingemail/potentialphishingemailjob.h>
@@ -1995,13 +1993,14 @@ void KMComposeWin::slotSendSuccessful(const QString &messageId)
 
 void KMComposeWin::addFollowupReminder(const QString &messageId)
 {
-    if (mFollowUpDate.isValid()) {
+    const QDate date = mComposerBase->followUpDate();
+    if (date.isValid()) {
         FollowupReminderCreateJob *job = new FollowupReminderCreateJob;
         job->setSubject(subject());
         job->setMessageId(messageId);
         job->setTo(replyTo());
-        job->setFollowUpReminderDate(mFollowUpDate);
-        job->setCollectionToDo(mFollowUpCollection);
+        job->setFollowUpReminderDate(date);
+        job->setCollectionToDo(mComposerBase->followUpCollection());
         job->start();
     }
 }
@@ -2026,24 +2025,6 @@ void KMComposeWin::addAttach( KMime::Content *msgPart )
     setModified( true );
 }
 
-
-QString KMComposeWin::prettyMimeType( const QString &type )
-{
-    const QString t = type.toLower();
-    const KMimeType::Ptr st = KMimeType::mimeType( t );
-
-    if ( !st ) {
-        kWarning() <<"unknown mimetype" << t;
-        return t;
-    }
-
-    const QString pretty = !st->isDefault() ? st->comment() : t;
-    if ( pretty.isEmpty() )
-        return type;
-    else
-        return pretty;
-}
-
 void KMComposeWin::setAutoCharset()
 {
     mCodecAction->setCurrentItem( 0 );
@@ -3481,15 +3462,14 @@ void KMComposeWin::slotFollowUpMail(bool toggled)
     if (toggled) {
         QPointer<FollowUpReminderSelectDateDialog> dlg = new FollowUpReminderSelectDateDialog(this);
         if (dlg->exec()) {
-            mFollowUpDate = dlg->selectedDate();
-            mFollowUpCollection = dlg->collection();
+            mComposerBase->setFollowUpDate(dlg->selectedDate());
+            mComposerBase->setFollowUpCollection(dlg->collection());
         } else {
             mFollowUpToggleAction->setChecked(false);
         }
         delete dlg;
     } else {
-        mFollowUpDate = QDate();
-        mFollowUpCollection = Akonadi::Collection();
+        mComposerBase->clearFollowUp();
     }
 }
 
diff --git a/editor/kmcomposewin.h b/editor/kmcomposewin.h
index 07579f14b..3988fc95d 100644
--- a/editor/kmcomposewin.h
+++ b/editor/kmcomposewin.h
@@ -261,13 +261,6 @@ private:
     bool inlineSigningEncryptionSelected();
 
 
-    /**
-      * Tries to find the given mimetype @p type in the KDE Mimetype registry.
-      * If found, returns its localized description, otherwise the @p type
-      * in lowercase.
-      */
-    static QString prettyMimeType( const QString &type );
-
 public slots: // kmkernel, callback
     void slotSendNow();
     /**
@@ -668,8 +661,6 @@ private:
 
     QString mdbusObjectPath;
     static int s_composerNumber;
-    QDate mFollowUpDate;
-    Akonadi::Collection mFollowUpCollection;
 
     MessageComposer::ComposerViewBase* mComposerBase;