Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	grantleeeditor/contactthemeeditor/contactdefaulttemplate.cpp
	kaddressbook/merge/searchduplicate/searchandmergecontactduplicatecontactdialog.cpp
	kmail/editor/kmcomposewin.cpp
	kmail/editor/kmcomposewin.h
	libksieve/ksieveui/templates/sievetemplatewidget.h
	mailcommon/snippets/snippetsmanager.cpp
	mailcommon/widgets/redirectdialog.cpp
	mailcommon/widgets/redirectdialog.h
	messagecomposer/composer/composerlineedit.cpp
	messagecomposer/composer/composerviewbase.cpp
	messagecomposer/composer/composerviewbase.h
	messagecomposer/composer/kmeditor.cpp
	messagecomposer/recipient/recipientseditorsidewidget.cpp
	pimsettingexporter/jot/importjotjob.cpp
	pimsettingexporter/mail/importmailjob.cpp
	pimsettingexporter/notes/importnotesjob.cpp
	sieveeditor/serversievelistwidget.cpp
	sieveeditor/sieveeditormanagesievewidget.cpp
	sieveeditor/sieveeditorutil.cpp

editor/kmcomposewin.cpp

@@ -1955,13 +1955,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();
     }
 }
@@ -1985,25 +1986,6 @@ void KMComposeWin::addAttach(KMime::Content *msgPart)
     setModified(true);
 }
 
-QString KMComposeWin::prettyMimeType(const QString &type)
-{
-    const QString t = type.toLower();
-    QMimeDatabase db;
-    const QMimeType st = db.mimeTypeForName(t);
-
-    if (st.isValid()) {
-        qCWarning(KMAIL_LOG) << "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);
@@ -3413,15 +3395,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();
     }
 }
 

editor/kmcomposewin.h

@@ -277,13 +277,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 Q_SLOTS: // kmkernel, callback
     void slotSendNow() Q_DECL_OVERRIDE;
     /**
@@ -680,8 +673,6 @@ private:
 
     QString mdbusObjectPath;
     static int s_composerNumber;
-    QDate mFollowUpDate;
-    Akonadi::Collection mFollowUpCollection;
 
     MessageComposer::ComposerViewBase *mComposerBase;
 

followupreminder/followupremindercreatejob.cpp

@@ -22,6 +22,8 @@
 #include <KLocalizedString>
 #include <AkonadiCore/ItemCreateJob>
 
+//KF5 move to messagecomposer
+
 FollowupReminderCreateJob::FollowupReminderCreateJob(QObject *parent)
     : KJob(parent),
       mInfo(new FollowUpReminder::FollowUpReminderInfo)