Commit 651fd967 authored by Daniel Vrátil's avatar Daniel Vrátil 🤖

Port kdepim away from KPimUtils

KPimUtils is about to be removed, and the relevant classes have been moved
to KCoreAddons and KCodecs.
parent 35f8e877
......@@ -149,7 +149,7 @@ KF5::AkonadiCore
KF5::AkonadiMime
KF5::AkonadiContact
KF5::Holidays
KF5::PimUtils
KF5::Codecs
kdepim
KF5::KCMUtils
Phonon::phonon4qt5
......
......@@ -30,7 +30,6 @@
#include <kalarmcal/identities.h>
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
#include <KIdentityManagement/kidentitymanagement/identity.h>
#include <KPIMUtils/kpimutils/email.h>
#include <MailTransport/mailtransport/transportmanager.h>
#include <MailTransport/mailtransport/transport.h>
#include <MailTransport/mailtransport/messagequeuejob.h>
......@@ -39,6 +38,7 @@
#include <kmime/kmime_headers.h>
#include <kmime/kmime_message.h>
#include <KEmailAddress>
#include <K4AboutData>
#include <KLocale>
#include <KUrl>
......@@ -638,16 +638,16 @@ QString KAMail::getMailBody(quint32 serialNumber)
*/
QString extractEmailAndNormalize(const QString& emailAddress)
{
return KPIMUtils::extractEmailAddress(KPIMUtils::normalizeAddressesAndEncodeIdn(emailAddress));
return KEmailAddress::extractEmailAddress(KEmailAddress::normalizeAddressesAndEncodeIdn(emailAddress));
}
QStringList extractEmailsAndNormalize(const QString& emailAddresses)
{
const QStringList splitEmails(KPIMUtils::splitAddressList(emailAddresses));
const QStringList splitEmails(KEmailAddress::splitAddressList(emailAddresses));
QStringList normalizedEmail;
Q_FOREACH(const QString& email, splitEmails)
{
normalizedEmail << KPIMUtils::extractEmailAddress(KPIMUtils::normalizeAddressesAndEncodeIdn(email));
normalizedEmail << KEmailAddress::extractEmailAddress(KEmailAddress::normalizeAddressesAndEncodeIdn(email));
}
return normalizedEmail;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment