USe new pimcommonakonadi

CMakeLists.txt

@@ -33,7 +33,7 @@ set(KMIME_LIB_VERSION "5.4.41")
 set(KPIMTEXTEDIT_LIB_VERSION "5.4.40")
 set(LIBKDEPIM_LIB_VERSION "5.4.40")
 set(LIBKLEO_LIB_VERSION "5.4.40")
-set(PIMCOMMON_LIB_VERSION "5.4.40")
+set(PIMCOMMON_LIB_VERSION "5.4.44")
 set(GPGME_LIB_VERSION "1.8.0")
 set(AKONADI_CONTACT_VERSION "5.4.41")
 

messagecomposer/src/CMakeLists.txt

@@ -151,7 +151,7 @@ target_link_libraries(KF5MessageComposer
     PUBLIC
     KF5::Mime
     KF5::MessageCore
-    KF5::PimCommon
+    KF5::PimCommonAkonadi
     KF5::AkonadiCore
     KF5::IdentityManagement
     KF5::AkonadiMime

messagecomposer/src/plugineditor/plugineditor.h

@@ -21,7 +21,7 @@
 #define PLUGINEDITOR_H
 #include <QObject>
 #include "messagecomposer_export.h"
-#include <PimCommon/AbstractGenericPlugin>
+#include <PimCommonAkonadi/AbstractGenericPlugin>
 namespace MessageComposer
 {
 class PluginEditorPrivate;

messagecomposer/src/plugineditor/plugineditorinterface.h

@@ -21,7 +21,7 @@
 #define PLUGINEDITORINTERFACE_H
 
 #include <QObject>
-#include <PimCommon/AbstractGenericPluginInterface>
+#include <PimCommonAkonadi/AbstractGenericPluginInterface>
 #include "messagecomposer_export.h"
 class QAction;
 

messagecomposer/src/plugineditor/plugineditormanager.cpp

@@ -20,7 +20,7 @@
 #include "plugineditor.h"
 #include "messagecomposer_debug.h"
 #include "plugineditormanager.h"
-#include <PimCommon/PluginUtil>
+#include <PimCommonAkonadi/PluginUtil>
 
 #include <QFileInfo>
 #include <QSet>

messagecomposer/src/plugineditor/plugineditormanager.h

@@ -22,7 +22,7 @@
 
 #include <QObject>
 #include "messagecomposer_export.h"
-#include <PimCommon/PluginUtil>
+#include <PimCommonAkonadi/PluginUtil>
 namespace MessageComposer
 {
 class PluginEditorManagerPrivate;

messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendmanager.h

@@ -22,7 +22,7 @@
 
 #include <QObject>
 #include "messagecomposer_export.h"
-#include <PimCommon/PluginUtil>
+#include <PimCommonAkonadi/PluginUtil>
 namespace MessageComposer
 {
 class PluginEditorCheckBeforeSendManagerPrivate;

messagelist/src/CMakeLists.txt

@@ -69,7 +69,7 @@ target_link_libraries(KF5MessageList
     PRIVATE
     KF5::KIOCore
     KF5::MessageCore
-    KF5::PimCommon
+    KF5::PimCommonAkonadi
     KF5::AkonadiSearchPIM
     KF5::XmlGui
     KF5::IconThemes

messagelist/src/core/messageitem.cpp

@@ -22,7 +22,7 @@
 #include "messageitem.h"
 #include "messageitem_p.h"
 
-#include "PimCommon/AnnotationDialog"
+#include "PimCommonAkonadi/AnnotationDialog"
 #include "theme.h"
 
 #include <item.h>

messagelist/src/core/messageitem_p.h

@@ -23,7 +23,7 @@
 
 #include "messageitem.h"
 #include "item_p.h"
-#include "PimCommon/AnnotationDialog"
+#include "PimCommonAkonadi/AnnotationDialog"
 #include <Item>
 #include <Monitor>
 #include <Tag>

messageviewer/src/header/headerstylepluginmanager.h

@@ -22,7 +22,7 @@
 
 #include <QObject>
 #include "messageviewer_export.h"
-#include <PimCommon/PluginUtil>
+#include <PimCommonAkonadi/PluginUtil>
 namespace MessageViewer
 {
 class HeaderStylePlugin;

messageviewer/src/viewerplugins/viewerpluginmanager.h

@@ -22,7 +22,7 @@
 
 #include <QObject>
 #include "messageviewer_export.h"
-#include <PimCommon/PluginUtil>
+#include <PimCommonAkonadi/PluginUtil>
 namespace MessageViewer
 {
 class ViewerPluginManagerPrivate;

webengineviewer/src/CMakeLists.txt

@@ -96,7 +96,7 @@ target_include_directories(KF5WebEngineViewer INTERFACE "$<INSTALL_INTERFACE:${K
 target_link_libraries(KF5WebEngineViewer
     PUBLIC
     Qt5::WebEngineWidgets
-    KF5::PimCommon
+    KF5::PimCommonAkonadi
     PRIVATE
     KF5::CoreAddons
     KF5::XmlGui

webengineviewer/src/urlinterceptor/networkurlinterceptorpluginmanager.h

@@ -22,7 +22,7 @@
 
 #include <QObject>
 #include <QVector>
-#include <PimCommon/PluginUtil>
+#include <PimCommonAkonadi/PluginUtil>
 #include "webengineviewer_export.h"
 namespace WebEngineViewer
 {