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

Conflicts:
	kmail/editor/kmcomposewin.cpp
	kmail/editor/potentialphishingemail/potentialphishingdetaildialog.cpp
	libkdepim/addressline/blacklistbaloocompletion/autotests/blacklistbalooemailcompletionwidgettest.cpp
	libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp
	libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.h
	pimcommon/util/editorutil.cpp
	pimcommon/util/editorutil.h

editor/kmcomposewin.cpp

@@ -1931,13 +1931,11 @@ void KMComposeWin::autoSaveMessage(bool force)
 
 bool KMComposeWin::encryptToSelf()
 {
-    // return !Kpgp::Module::getKpgp() || Kpgp::Module::getKpgp()->encryptToSelf();
     return MessageComposer::MessageComposerSettings::self()->cryptoEncryptToSelf();
 }
 
 void KMComposeWin::slotSendFailed(const QString &msg, MessageComposer::ComposerViewBase::FailedType type)
 {
-    //   setModified( false );
     setEnabled(true);
     if (!msg.isEmpty()) {
         KMessageBox::sorry(mMainWidget, msg,
@@ -3459,19 +3457,22 @@ void KMComposeWin::addExtraCustomHeaders(const QMap<QByteArray, QString> &header
 void KMComposeWin::slotSentenceCase()
 {
     QTextCursor textCursor = mComposerBase->editor()->textCursor();
-    PimCommon::EditorUtil::sentenceCase(textCursor);
+    PimCommon::EditorUtil editorUtil;
+    editorUtil.sentenceCase(textCursor);
 }
 
 void KMComposeWin::slotUpperCase()
 {
+    PimCommon::EditorUtil editorUtil;
     QTextCursor textCursor = mComposerBase->editor()->textCursor();
-    PimCommon::EditorUtil::upperCase(textCursor);
+    editorUtil.upperCase(textCursor);
 }
 
 void KMComposeWin::slotLowerCase()
 {
     QTextCursor textCursor = mComposerBase->editor()->textCursor();
-    PimCommon::EditorUtil::lowerCase(textCursor);
+    PimCommon::EditorUtil editorUtil;
+    editorUtil.lowerCase(textCursor);
 }
 
 void KMComposeWin::slotExternalEditorStarted()

editor/potentialphishingemail/potentialphishingdetaildialog.cpp

@@ -100,10 +100,11 @@ void PotentialPhishingDetailDialog::slotSave()
     KConfigGroup group(KSharedConfig::openConfig(), "PotentialPhishing");
     QStringList potentialPhishing = group.readEntry("whiteList", QStringList());
     bool emailsAdded = false;
-    for (int i = 0; i < mListWidget->count(); ++i) {
+    const int numberOfItem(mListWidget->count());
+    for (int i=0; i < numberOfItem; ++i) {
         QListWidgetItem *item = mListWidget->item(i);
         if (item->checkState() == Qt::Checked) {
-            QString email = item->text();
+            const QString email = item->text();
             if (!potentialPhishing.contains(email)) {
                 potentialPhishing << email;
                 emailsAdded = true;