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

CMakeLists.txt

@@ -141,7 +141,8 @@ if (KDEPIM_BUILD_DESKTOP)
      warningwidgets/attachmentmissingwarning.cpp
   )
   set(kmailprivate_editor_potentialphishingemail_SRCS
-     editor/potentialphishingemail/potentialphisingemailwarning.cpp
+     editor/potentialphishingemail/potentialphishingemailwarning.cpp
+     editor/potentialphishingemail/potentialphishingemailjob.cpp
   )
   set(kmailprivate_dialogs_LIB_SRCS
      dialog/archivefolderdialog.cpp

editor/kmcomposewin.cpp

@@ -63,7 +63,7 @@
 #include "followupreminder/followupremindercreatejob.h"
 #include "agents/followupreminderagent/followupreminderutil.h"
 #include "pimcommon/util/vcardutil.h"
-#include "editor/potentialphishingemail/potentialphisingemailwarning.h"
+#include "editor/potentialphishingemail/potentialphishingemailwarning.h"
 
 #include "libkdepim/progresswidget/statusbarprogresswidget.h"
 #include "libkdepim/progresswidget/progressstatusbarwidget.h"
@@ -427,7 +427,7 @@ KMComposeWin::KMComposeWin(const KMime::Message::Ptr &aMsg, bool lastSignState,
     connect(mAttachmentMissing, &AttachmentMissingWarning::explicitClosedMissingAttachment, this, &KMComposeWin::slotExplicitClosedMissingAttachment);
     v->addWidget(mAttachmentMissing);
 
-    mPotentialPhishingEmailWarning = new PotentialPhisingEmailWarning(this);
+    mPotentialPhishingEmailWarning = new PotentialPhishingEmailWarning(this);
     v->addWidget(mPotentialPhishingEmailWarning);
 
     if (GlobalSettings::self()->showForgottenAttachmentWarning()) {

editor/kmcomposewin.h

@@ -70,7 +70,7 @@ class ExternalEditorWarning;
 class KActionMenu;
 class CryptoStateIndicatorWidget;
 class StatusBarLabelToggledState;
-class PotentialPhisingEmailWarning;
+class PotentialPhishingEmailWarning;
 
 namespace boost
 {
@@ -708,7 +708,7 @@ private:
     KToggleAction *mFollowUpToggleAction;
     StatusBarLabelToggledState *mStatusBarLabelToggledOverrideMode;
     StatusBarLabelToggledState *mStatusBarLabelSpellCheckingChangeMode;
-    PotentialPhisingEmailWarning *mPotentialPhishingEmailWarning;
+    PotentialPhishingEmailWarning *mPotentialPhishingEmailWarning;
 };
 
 #endif

editor/potentialphishingemail/potentialphishingemailwarning.cpp

@@ -19,9 +19,9 @@
 */
 
 
-#include "potentialphisingemailwarning.h"
+#include "potentialphishingemailwarning.h"
 
-PotentialPhisingEmailWarning::PotentialPhisingEmailWarning(QWidget *parent)
+PotentialPhishingEmailWarning::PotentialPhishingEmailWarning(QWidget *parent)
     : KMessageWidget(parent)
 {
     setVisible(false);
@@ -30,12 +30,12 @@ PotentialPhisingEmailWarning::PotentialPhisingEmailWarning(QWidget *parent)
     setWordWrap(true);
 }
 
-PotentialPhisingEmailWarning::~PotentialPhisingEmailWarning()
+PotentialPhishingEmailWarning::~PotentialPhishingEmailWarning()
 {
 
 }
 
-void PotentialPhisingEmailWarning::setWarningText(const QString &text)
+void PotentialPhishingEmailWarning::setWarningText(const QString &text)
 {
     animatedShow();
 }

editor/potentialphishingemail/potentialphishingemailwarning.h

@@ -18,19 +18,19 @@
 
 */
 
-#ifndef POTENTIALPHISINGEMAILWARNING_H
-#define POTENTIALPHISINGEMAILWARNING_H
+#ifndef POTENTIALPHISHINGEMAILWARNING_H
+#define POTENTIALPHISHINGEMAILWARNING_H
 
 #include <KMessageWidget>
 
-class PotentialPhisingEmailWarning : public KMessageWidget
+class PotentialPhishingEmailWarning : public KMessageWidget
 {
     Q_OBJECT
 public:
-    explicit PotentialPhisingEmailWarning(QWidget *parent = 0);
-    ~PotentialPhisingEmailWarning();
+    explicit PotentialPhishingEmailWarning(QWidget *parent = 0);
+    ~PotentialPhishingEmailWarning();
 
     void setWarningText(const QString &text);
 };
 
-#endif // POTENTIALPHISINGEMAILWARNING_H
+#endif // POTENTIALPHISHINGEMAILWARNING_H