Port kdepim-runtime away from KPimUtils

KPimUtils is about to be removed, and the relevant classes have been moved
to KCoreAddons and KCodecs.

CMakeLists.txt

@@ -51,7 +51,7 @@ include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings)
 include(ECMInstallIcons)
 
-set(KF5_VERSION "5.4.0")
+set(KF5_VERSION "5.5.0")
 set(QT_REQUIRED_VERSION "5.3.0")
 
 set(KDEPIMLIBS_LIB_VERSION "4.75.0")
@@ -82,6 +82,7 @@ find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5ItemModels ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5NotifyConfig ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Kross ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5Codecs ${KF5_VERSION} CONFIG REQUIRED)
 
 # KdepimLibs package
 find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
@@ -94,7 +95,6 @@ find_package(KF5Contacts ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5AlarmCalendar ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5CalendarCore ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5CalendarUtils ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5PimUtils ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Mbox ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5PimTextEdit ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)

agents/newmailnotifier/CMakeLists.txt

@@ -31,7 +31,7 @@ target_link_libraries( akonadi_newmailnotifier_agent
   KF5::Mime
   KF5::AkonadiMime
   KF5::AkonadiContact
-  KF5::PimUtils
+  KF5::Codecs
   KF5::IdentityManagement
   KF5::NotifyConfig
   KF5::AkonadiAgentBase

agents/newmailnotifier/specialnotifierjob.cpp

@@ -26,7 +26,7 @@
 #include <Akonadi/KMime/MessageParts>
 
 #include <KNotification>
-#include <KPIMUtils/Email>
+#include <KEmailAddress>
 
 #include <KMime/Message>
 
@@ -76,7 +76,7 @@ void SpecialNotifierJob::slotItemFetchJobDone(KJob *job)
         if (NewMailNotifierAgentSettings::showPhoto()) {
             Akonadi::ContactSearchJob *job = new Akonadi::ContactSearchJob( this );
             job->setLimit( 1 );
-            job->setQuery( Akonadi::ContactSearchJob::Email, KPIMUtils::firstEmailAddress(mFrom).toLower(), Akonadi::ContactSearchJob::ExactMatch );
+            job->setQuery( Akonadi::ContactSearchJob::Email, KEmailAddress::firstEmailAddress(mFrom).toLower(), Akonadi::ContactSearchJob::ExactMatch );
             connect(job, &Akonadi::ItemFetchJob::result, this, &SpecialNotifierJob::slotSearchJobFinished);
         } else {
             emitNotification(Util::defaultPixmap());

migration/CMakeLists.txt

@@ -22,7 +22,6 @@ if ("${CMAKE_SOURCE_DIR}" STREQUAL "${migration_SOURCE_DIR}")
   find_package(KF5Contacts ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
   find_package(KF5MailTransport ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
   find_package(KF5Mbox ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
-  find_package(KF5PimUtils ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
   find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
   find_package(KF5PimTextEdit ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
   find_package(KF5Imap ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)

migration/kmail/CMakeLists.txt

@@ -45,7 +45,6 @@ add_executable(kmail-migrator ${kmail-migrator_srcs} )
 target_link_libraries(kmail-migrator
   KF5::Mbox
   KF5::Mime
-  KF5::PimUtils
   KF5::AkonadiMime
   KF5::AkonadiCore
   KF5::AkonadiAgentBase  

resources/CMakeLists.txt

@@ -31,7 +31,6 @@ if ("${CMAKE_SOURCE_DIR}" STREQUAL "${resources_SOURCE_DIR}")
   # Kdepimlibs package
   find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
   find_package(KF5CalendarCore ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
-  find_package(KF5PimUtils ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
   find_package(KF5Contacts ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
   find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
   find_package(KF5PimIdentities ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)

resources/birthdays/CMakeLists.txt

@@ -28,7 +28,7 @@ target_link_libraries(akonadi_birthdays_resource
   KF5::KIOCore
   KF5::AkonadiCore
   KF5::CalendarCore
-  KF5::PimUtils
+  KF5::Codecs
   KF5::AkonadiAgentBase
   KF5::Contacts
 )

resources/birthdays/birthdaysresource.cpp

@@ -32,7 +32,7 @@
 
 #include <kcontacts/addressee.h>
 
-#include <KPIMUtils/Email>
+#include <KCodecs/KEmailAddress>
 
 #include <QDebug>
 #include <KLocalizedString>
@@ -269,8 +269,8 @@ KCalCore::Event::Ptr BirthdaysResource::createAnniversary(const Akonadi::Item& c
     QString summary;
     if ( !spouseName.isEmpty() ) {
       QString tname, temail;
-      KPIMUtils::extractEmailAddressAndName( spouseName, temail, tname );
-      tname = KPIMUtils::quoteNameIfNecessary( tname );
+      KEmailAddress::extractEmailAddressAndName( spouseName, temail, tname );
+      tname = KEmailAddress::quoteNameIfNecessary( tname );
       if ( ( tname[0] == QLatin1Char('"') ) && ( tname[tname.length() - 1] == QLatin1Char('"') ) ) {
         tname.remove( 0, 1 );
         tname.truncate( tname.length() - 1 );

resources/facebook/CMakeLists.txt

@@ -61,7 +61,6 @@ target_link_libraries(akonadi_facebook_resource
   KF5::CalendarCore
   KF5::AkonadiNotes
   KF5::Mime
-  KF5::PimUtils
   KF5::FbAPI
   KF5::AkonadiSocialUtils
   KAccounts

resources/facebook/facebookresource_events.cpp

@@ -27,7 +27,7 @@
 #include <KFbAPI/eventjob.h>
 #include <KFbAPI/eventinfo.h>
 
-#include <KPIMUtils/LinkLocator>
+#include <KCoreAddons/KTextToHTML>
 #include <KCalCore/Attendee>
 
 #include <KLocalizedString>
@@ -116,7 +116,7 @@ KCalCore::Event::Ptr FacebookResource::convertEventInfoToEventPtr(const KFbAPI::
 {
     KCalCore::Event::Ptr event(new KCalCore::Event);
     QString desc = eventInfo.description();
-    desc = KPIMUtils::LinkLocator::convertToHtml(desc, KPIMUtils::LinkLocator::ReplaceSmileys);
+    desc = KTextToHTML::convertToHtml(desc, KTextToHTML::ReplaceSmileys);
     if (!desc.isEmpty()) {
         desc += "<br><br>";
     }

resources/maildir/libmaildir/CMakeLists.txt

@@ -8,7 +8,7 @@ set(maildir_LIB_SRCS keycache.cpp maildir.cpp)
 add_library(maildir ${LIBRARY_TYPE} ${maildir_LIB_SRCS})
 generate_export_header(maildir BASE_NAME maildir)
 
-target_link_libraries(maildir KF5::PimUtils KF5::AkonadiMime KF5::AkonadiCore)
+target_link_libraries(maildir KF5::Codecs KF5::AkonadiMime KF5::AkonadiCore)
 
 set_target_properties(maildir PROPERTIES VERSION ${KDEPIMRUNTIME_LIB_VERSION} SOVERSION ${KDEPIMRUNTIME_LIB_SOVERSION} )
 

resources/mixedmaildir/CMakeLists.txt

@@ -53,7 +53,6 @@ target_link_libraries(akonadi_mixedmaildir_resource
   KF5::KIOCore
   KF5::Mbox
   KF5::Mime
-  KF5::PimUtils
   KF5::AkonadiAgentBase
   akonadi-singlefileresource
 )

resources/mixedmaildir/autotests/CMakeLists.txt

@@ -47,7 +47,6 @@ set( common_link_libraries
   KF5::AkonadiCore
   KF5::Mbox
   KF5::Mime
-  KF5::PimUtils
   Qt5::Test
 )
 

resources/pop3/CMakeLists.txt

@@ -41,7 +41,6 @@ target_link_libraries( akonadi_pop3_resource
   KF5::KIOCore
   KF5::Mime
   KF5::MailTransport
-  KF5::PimUtils
   KF5::AkonadiAgentBase
   KF5::AkonadiWidgets
 )