From fcaa083d8dd84d092d1de6f4533ec4443f5555f5 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Tue, 27 Jan 2015 07:44:25 +0100 Subject: [PATCH] Commit all :) --- CMakeLists.txt | 3 ++- editor/kmcomposewin.cpp | 4 ++-- editor/kmcomposewin.h | 4 ++-- .../potentialphishingemailwarning.cpp | 8 ++++---- .../potentialphishingemailwarning.h | 12 ++++++------ 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8a94c20e..646a12728 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,7 +140,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 diff --git a/editor/kmcomposewin.cpp b/editor/kmcomposewin.cpp index 3f6c38248..1471e6efa 100644 --- a/editor/kmcomposewin.cpp +++ b/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" @@ -432,7 +432,7 @@ KMComposeWin::KMComposeWin( const KMime::Message::Ptr &aMsg, bool lastSignState, connect(mAttachmentMissing, SIGNAL(explicitClosedMissingAttachment()), this, SLOT(slotExplicitClosedMissingAttachment())); v->addWidget(mAttachmentMissing); - mPotentialPhishingEmailWarning = new PotentialPhisingEmailWarning(this); + mPotentialPhishingEmailWarning = new PotentialPhishingEmailWarning(this); v->addWidget(mPotentialPhishingEmailWarning); if (GlobalSettings::self()->showForgottenAttachmentWarning()) { diff --git a/editor/kmcomposewin.h b/editor/kmcomposewin.h index 6b0f07056..e82d888a4 100644 --- a/editor/kmcomposewin.h +++ b/editor/kmcomposewin.h @@ -70,7 +70,7 @@ class ExternalEditorWarning; class KActionMenu; class CryptoStateIndicatorWidget; class StatusBarLabelToggledState; -class PotentialPhisingEmailWarning; +class PotentialPhishingEmailWarning; namespace boost { template class shared_ptr; @@ -696,7 +696,7 @@ private: KToggleAction *mFollowUpToggleAction; StatusBarLabelToggledState *mStatusBarLabelToggledOverrideMode; StatusBarLabelToggledState *mStatusBarLabelSpellCheckingChangeMode; - PotentialPhisingEmailWarning *mPotentialPhishingEmailWarning; + PotentialPhishingEmailWarning *mPotentialPhishingEmailWarning; }; #endif diff --git a/editor/potentialphishingemail/potentialphishingemailwarning.cpp b/editor/potentialphishingemail/potentialphishingemailwarning.cpp index 8de753858..10f816d28 100644 --- a/editor/potentialphishingemail/potentialphishingemailwarning.cpp +++ b/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(); } diff --git a/editor/potentialphishingemail/potentialphishingemailwarning.h b/editor/potentialphishingemail/potentialphishingemailwarning.h index 30390aca4..fedd7b3fd 100644 --- a/editor/potentialphishingemail/potentialphishingemailwarning.h +++ b/editor/potentialphishingemail/potentialphishingemailwarning.h @@ -18,19 +18,19 @@ */ -#ifndef POTENTIALPHISINGEMAILWARNING_H -#define POTENTIALPHISINGEMAILWARNING_H +#ifndef POTENTIALPHISHINGEMAILWARNING_H +#define POTENTIALPHISHINGEMAILWARNING_H #include -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