From c1f8709cbc8d479a200ad55ed323d39f7ebbce95 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 10 May 2017 13:35:45 +0200 Subject: [PATCH] Use new pimcommon api --- CMakeLists.txt | 2 +- .../autotests/CMakeLists.txt | 4 ++-- .../potentialphishingemailjob.cpp | 14 ++------------ 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f94f389ca..ce307a015 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,7 @@ set(MAILCOMMON_LIB_VERSION_LIB "5.5.43") set(KDEPIM_APPS_LIB_VERSION_LIB "5.5.40") set(MESSAGELIB_LIB_VERSION_LIB "5.5.42") set(LIBKLEO_LIB_VERSION_LIB "5.5.40") -set(PIMCOMMON_LIB_VERSION_LIB "5.5.40") +set(PIMCOMMON_LIB_VERSION_LIB "5.5.41") set(LIBKDEPIM_LIB_VERSION_LIB "5.5.40") set(LIBKSIEVE_LIB_VERSION_LIB "5.5.40") diff --git a/src/editor/potentialphishingemail/autotests/CMakeLists.txt b/src/editor/potentialphishingemail/autotests/CMakeLists.txt index 374f8cdf8..6dca94cd9 100644 --- a/src/editor/potentialphishingemail/autotests/CMakeLists.txt +++ b/src/editor/potentialphishingemail/autotests/CMakeLists.txt @@ -4,7 +4,7 @@ set( kmail_potentialphishingemailjobtest_SRCS potentialphishingemailjobtest.cpp add_executable( kmail_potentialphishingemailjobtest ${kmail_potentialphishingemailjobtest_SRCS}) add_test(kmail_potentialphishingemailjobtest kmail_potentialphishingemailjobtest) ecm_mark_as_test(kmail_potentialphishingemailjobtest) -target_link_libraries( kmail_potentialphishingemailjobtest Qt5::Test KF5::Codecs) +target_link_libraries( kmail_potentialphishingemailjobtest Qt5::Test KF5::Codecs KF5::PimCommon) set( kmail_potentialphishingdetaildialogtest_SRCS potentialphishingdetaildialogtest.cpp ../potentialphishingdetaildialog.cpp ../potentialphishingdetailwidget.cpp) @@ -17,7 +17,7 @@ set( kmail_potentialphishingdetailwidgettest_SRCS potentialphishingdetailwidgett add_executable( kmail_potentialphishingdetailwidgettest ${kmail_potentialphishingdetailwidgettest_SRCS}) add_test(kmail_potentialphishingdetailwidgettest kmail_potentialphishingdetailwidgettest) ecm_mark_as_test(kmail_potentialphishingdetailwidgettest) -target_link_libraries( kmail_potentialphishingdetailwidgettest Qt5::Test Qt5::Widgets KF5::ConfigCore KF5::I18n KF5::WidgetsAddons) +target_link_libraries( kmail_potentialphishingdetailwidgettest Qt5::Test Qt5::Widgets KF5::ConfigCore KF5::I18n KF5::WidgetsAddons KF5::PimCommon) diff --git a/src/editor/potentialphishingemail/potentialphishingemailjob.cpp b/src/editor/potentialphishingemail/potentialphishingemailjob.cpp index b8f9478a1..08c393a3b 100644 --- a/src/editor/potentialphishingemail/potentialphishingemailjob.cpp +++ b/src/editor/potentialphishingemail/potentialphishingemailjob.cpp @@ -20,6 +20,7 @@ #include "potentialphishingemailjob.h" #include +#include #include "kmail_debug.h" PotentialPhishingEmailJob::PotentialPhishingEmailJob(QObject *parent) @@ -40,18 +41,7 @@ void PotentialPhishingEmailJob::setEmailWhiteList(const QStringList &emails) void PotentialPhishingEmailJob::setPotentialPhishingEmails(const QStringList &list) { - QString str; - for (int i = 0; i < list.count(); i++) { - QString tmpStr = list.at(i); - if (!tmpStr.trimmed().isEmpty()) { - if (!str.isEmpty()) { - str.append(QStringLiteral(", ")); - } - str.append(tmpStr); - } - } - const QStringList emails = KEmailAddress::splitAddressList(str); - mEmails = emails; + mEmails = PimCommon::Util::generateEmailList(list); } QStringList PotentialPhishingEmailJob::checkEmails() const