Use new pimcommon api

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")
 

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)
 
 
 

src/editor/potentialphishingemail/potentialphishingemailjob.cpp

@@ -20,6 +20,7 @@
 
 #include "potentialphishingemailjob.h"
 #include <KEmailAddress>
+#include <PimCommon/PimUtil>
 #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