Make it compiles

CMakeLists.txt

@@ -33,10 +33,10 @@ configure_file(config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ente
 
 
 add_subdirectory(resources)
-#add_subdirectory(agents)
+add_subdirectory(agents)
 add_subdirectory(libkdepim-copy)
 #add_subdirectory(plugins)
-#add_subdirectory(accountwizard)
+add_subdirectory(accountwizard)
 add_subdirectory(defaultsetup)
 #add_subdirectory(resourcetester)
 add_subdirectory(kioslave)

resources/CMakeLists.txt

@@ -22,6 +22,7 @@ find_package(KF5Akonadi ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5CalendarCore ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5PimUtils ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Abc ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5AkonadiKMime ${KF5_VERSION} CONFIG REQUIRED)
 
 # Xsltproc
 find_package(Xsltproc)
@@ -66,10 +67,10 @@ set( AKONADI_IMAPATTRIBUTES_SHARED_SOURCES
 #add_subdirectory( akonotes )
 #add_subdirectory( kalarm )
 #add_subdirectory( contacts )
-#add_subdirectory( dav )
-add_subdirectory( ical )
+add_subdirectory( dav )
+#add_subdirectory( ical )
 #add_subdirectory( imap )
-#add_subdirectory( kdeaccounts )
+add_subdirectory( kdeaccounts )
 #if (Libkolab_FOUND AND Libkolabxml_FOUND)
 #    macro_optional_add_subdirectory( kolabproxy )
 #endif()
@@ -95,8 +96,8 @@ add_subdirectory( birthdays )
 #add_subdirectory( mailtransport_dummy )
 #add_subdirectory( mbox )
 #add_subdirectory( nntp )
-#add_subdirectory( vcarddir )
-#add_subdirectory( icaldir )
+add_subdirectory( vcarddir )
+add_subdirectory( icaldir )
 #add_subdirectory( vcard )
 #add_subdirectory( folderarchivesettings )
 

resources/contacts/CMakeLists.txt

@@ -22,7 +22,8 @@ add_library(akonadi_contacts_resource MODULE ${contactsresource_SRCS})
 
 target_link_libraries(akonadi_contacts_resource
   KF5::AkonadiCore
-  ${KDEPIMLIBS_KABC_LIBS}
+  KF5::AkonadiAgentBase
+  KF5::Abc
   KF5::KIOCore
 )
 

resources/contacts/contactsresource.cpp

@@ -34,6 +34,8 @@
 #include <dbusconnectionpool.h>
 #include <agentfactory.h>
 
+#include <KLocalizedString>
+
 using namespace Akonadi;
 using namespace Akonadi_Contacts_Resource;
 

resources/dav/resource/CMakeLists.txt

@@ -15,7 +15,7 @@ if (QT_QTXMLPATTERNS_LIBRARY)
       ../protocols/
   )
 
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+  kde_enable_exceptions()
 
 
   ########### next target ###############
@@ -67,14 +67,14 @@ if (QT_QTXMLPATTERNS_LIBRARY)
   file( GLOB providersFiles "../services/*.desktop" )
   install( FILES ${providersFiles} DESTINATION "${SERVICES_INSTALL_DIR}/akonadi/davgroupware-providers" )
 
-  kde4_add_kcfg_files(davgroupwareresource_SRCS settingsbase.kcfgc)
-  kde4_add_ui_files(davgroupwareresource_SRCS configdialog.ui urlconfigurationdialog.ui searchdialog.ui)
+  kconfig_add_kcfg_files(davgroupwareresource_SRCS settingsbase.kcfgc)
+  qt5_wrap_ui(davgroupwareresource_SRCS configdialog.ui urlconfigurationdialog.ui searchdialog.ui)
   kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/davgroupwareresource.kcfg org.kde.Akonadi.davGroupware.Settings)
-  qt4_add_dbus_adaptor(davgroupwareresource_SRCS
+  qt5_add_dbus_adaptor(davgroupwareresource_SRCS
     ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.davGroupware.Settings.xml settings.h Settings
   )
 
-  kde4_add_executable(akonadi_davgroupware_resource RUN_UNINSTALLED ${davgroupwareresource_SRCS})
+  add_executable(akonadi_davgroupware_resource RUN_UNINSTALLED ${davgroupwareresource_SRCS})
 
   if (Q_WS_MAC)
     set_target_properties(akonadi_davgroupware_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../../Info.plist.template)
@@ -83,16 +83,16 @@ if (QT_QTXMLPATTERNS_LIBRARY)
   endif ()
 
   target_link_libraries(akonadi_davgroupware_resource
-                        ${QT_QTCORE_LIBRARY}
-                        ${QT_QTDBUS_LIBRARY}
+                        
+                        
                         ${QT_QTXML_LIBRARY}
                         ${QT_QTXMLPATTERNS_LIBRARY}
                         ${KDE4_KDECORE_LIBS}
-                        ${KDE4_KIO_LIBS}
-                        ${KDEPIMLIBS_AKONADI_LIBS}
+                        KF5::KIOCore
+                        KF5::AkonadiCore
                         ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS}
                         ${KDEPIMLIBS_KABC_LIBS}
-                        ${KDEPIMLIBS_KCALCORE_LIBS})
+                        KF5::CalendarCore)
 
   if(${AccountsQt_FOUND} AND ${SignOnQt_FOUND})
     target_link_libraries(akonadi_davgroupware_resource

resources/folderarchivesettings/CMakeLists.txt

 project(folderarchivesettings)
-
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${KDEPIMLIBS_INCLUDE_DIR}
-)
-
-include(KDE4Defaults)
-
 kde_enable_exceptions()
 
 set(folderarchivesettings_SRCS
@@ -15,12 +7,10 @@ set(folderarchivesettings_SRCS
    folderarchiveaccountinfo.cpp 
 )
 
-kde4_add_library(folderarchivesettings ${LIBRARY_TYPE} ${folderarchivesettings_SRCS} )
+add_library(folderarchivesettings ${LIBRARY_TYPE} ${folderarchivesettings_SRCS} )
 
 target_link_libraries(folderarchivesettings
                       KF5::KMime
-                      ${AKONADI_COMMON_LIBRARIES}
-                      
                       KF5::AkonadiCore
 )
 

resources/icaldir/CMakeLists.txt

@@ -33,8 +33,7 @@ endif ()
 
 target_link_libraries(akonadi_icaldir_resource
   KF5::AkonadiCore
-  
-  ${KDE4_KDECORE_LIBS}
+  KF5::AkonadiAgentBase  
   KF5::CalendarCore
   KF5::KIOCore
 )

resources/icaldir/icaldirresource.cpp

@@ -31,6 +31,9 @@
 #include <KCalCore/MemoryCalendar>
 #include <KCalCore/FileStorage>
 #include <KCalCore/ICalFormat>
+#include <KIcon>
+#include <KLocalizedString>
+
 
 #include <QtCore/QDir>
 #include <QtCore/QDirIterator>

resources/kalarm/kalarm/CMakeLists.txt

@@ -6,7 +6,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../../ical/shared
 )
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+kde_enable_exceptions()
 
 ########### next target ###############
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5952)
@@ -22,14 +22,14 @@ set(kalarmresource_SRCS
 
 install(FILES kalarmresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
 
-kde4_add_ui_files(kalarmresource_SRCS ../shared/alarmtyperadiowidget.ui ${AKONADI_SINGLEFILERESOURCE_SHARED_UI})
-kde4_add_kcfg_files(kalarmresource_SRCS settings.kcfgc)
+qt5_wrap_ui(kalarmresource_SRCS ../shared/alarmtyperadiowidget.ui ${AKONADI_SINGLEFILERESOURCE_SHARED_UI})
+kconfig_add_kcfg_files(kalarmresource_SRCS settings.kcfgc)
 kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/kalarmresource.kcfg org.kde.Akonadi.KAlarm.Settings)
-qt4_add_dbus_adaptor(kalarmresource_SRCS
+qt5_add_dbus_adaptor(kalarmresource_SRCS
     ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.KAlarm.Settings.xml settings.h Akonadi_KAlarm_Resource::Settings icalsettingsadaptor ICalSettingsAdaptor)
 add_custom_target(kalarm_resource_xml ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.KAlarm.Settings.xml)
 
-kde4_add_plugin(akonadi_kalarm_resource ${kalarmresource_SRCS})
+add_library(akonadi_kalarm_resource MODULE ${kalarmresource_SRCS})
 
 if (Q_WS_MAC)
     set_target_properties(akonadi_kalarm_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
@@ -38,12 +38,12 @@ if (Q_WS_MAC)
 endif ()
 
 target_link_libraries(akonadi_kalarm_resource
-                      ${KDEPIMLIBS_KALARMCAL_LIBS}
+                      KF5::KAlarmCal
                       ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
-                      ${KDEPIMLIBS_AKONADI_LIBS}
-                      ${KDEPIMLIBS_KCALCORE_LIBS}
-                      ${KDE4_KIO_LIBS}
-                      ${QT_QTDBUS_LIBRARY}
+                      KF5::AkonadiCore
+                      KF5::CalendarCore
+                      KF5::KIOCore
+                      KF5::AkonadiAgentBase
                      )
 
 install(TARGETS akonadi_kalarm_resource DESTINATION ${PLUGIN_INSTALL_DIR})

resources/kalarm/kalarmdir/CMakeLists.txt

@@ -18,14 +18,14 @@ set(kalarmdirresource_SRCS
 
 install(FILES kalarmdirresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
 
-kde4_add_ui_files(kalarmdirresource_SRCS settingsdialog.ui ../shared/alarmtypewidget.ui)
-kde4_add_kcfg_files(kalarmdirresource_SRCS settings.kcfgc)
+qt5_wrap_ui(kalarmdirresource_SRCS settingsdialog.ui ../shared/alarmtypewidget.ui)
+kconfig_add_kcfg_files(kalarmdirresource_SRCS settings.kcfgc)
 kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/kalarmdirresource.kcfg org.kde.Akonadi.KAlarmDir.Settings)
-qt4_add_dbus_adaptor(kalarmdirresource_SRCS
+qt5_add_dbus_adaptor(kalarmdirresource_SRCS
     ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.KAlarmDir.Settings.xml settings.h Akonadi_KAlarm_Dir_Resource::Settings kalarmdirsettingsadaptor KAlarmDirSettingsAdaptor)
 add_custom_target(kalarmdir_resource_xml ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.KAlarmDir.Settings.xml)
 
-kde4_add_plugin(akonadi_kalarm_dir_resource ${kalarmdirresource_SRCS})
+add_library(akonadi_kalarm_dir_resource MODULE ${kalarmdirresource_SRCS})
 
 if (Q_WS_MAC)
     set_target_properties(akonadi_kalarm_dir_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
@@ -34,12 +34,12 @@ if (Q_WS_MAC)
 endif ()
 
 target_link_libraries(akonadi_kalarm_dir_resource
-                      ${KDEPIMLIBS_KALARMCAL_LIBS}
+                      KF5::KAlarmCal
                       ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
-                      ${KDEPIMLIBS_AKONADI_LIBS}
-                      ${KDEPIMLIBS_KCALCORE_LIBS}
-                      ${KDE4_KIO_LIBS}
-                      ${QT_QTDBUS_LIBRARY}
+                      KF5::AkonadiCore
+                      KF5::CalendarCore
+                      KF5::KIOCore
+                      KF5::AkonadiAgentBase 
                      )
 
 install(TARGETS akonadi_kalarm_dir_resource DESTINATION ${PLUGIN_INSTALL_DIR})

resources/kdeaccounts/CMakeLists.txt

@@ -29,6 +29,6 @@ if (Q_WS_MAC)
   set_target_properties(akonadi_kdeaccounts_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi KDEAccounts Resource")
 endif ()
 
-target_link_libraries(akonadi_kdeaccounts_resource KF5::AkonadiCore   ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KABC_LIBS} KF5::KIOCore)
+target_link_libraries(akonadi_kdeaccounts_resource KF5::AkonadiCore  KF5::Abc KF5::KIOCore KF5::AkonadiAgentBase)
 
 install(TARGETS akonadi_kdeaccounts_resource ${INSTALL_TARGETS_DEFAULT_ARGS})

resources/kdeaccounts/kdeaccountsresource.cpp

@@ -27,7 +27,7 @@
 #include <kfiledialog.h>
 #include <klocale.h>
 #include <KWindowSystem>
-
+#include <KIcon>
 
 using namespace Akonadi;
 

resources/maildir/CMakeLists.txt

-include_directories(
-    ${kdepim-runtime_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/libmaildir
-    ${QT_QTDBUS_INCLUDE_DIR}
-    ${Boost_INCLUDE_DIR}
-)
-
 kde_enable_exceptions()
 
-add_subdirectory( tests )
+#reactivate it
+#add_subdirectory( tests )
 add_subdirectory( wizard )
 
 # maildir access library
@@ -37,7 +31,7 @@ qt5_add_dbus_adaptor(maildirresource_SRCS
 
 add_library(akonadi_maildir_resource MODULE ${maildirresource_SRCS})
 
-target_link_libraries(akonadi_maildir_resource KF5::AkonadiCore KF5::AkonadiKMime maildir  KF5::KIOCore KF5::KMime folderarchivesettings )
+target_link_libraries(akonadi_maildir_resource KF5::AkonadiCore KF5::AkonadiKMime maildir  KF5::KIOCore KF5::KMime folderarchivesettings KF5::AkonadiAgentBase)
 
 install(TARGETS akonadi_maildir_resource DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml

resources/maildir/libmaildir/CMakeLists.txt

@@ -3,9 +3,9 @@ add_subdirectory( tests )
 
 set(maildir_LIB_SRCS keycache.cpp maildir.cpp)
 
-kde4_add_library(maildir ${LIBRARY_TYPE} ${maildir_LIB_SRCS})
+add_library(maildir ${LIBRARY_TYPE} ${maildir_LIB_SRCS})
 
-target_link_libraries(maildir ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${QT_QTNETWORK_LIBRARY})
+target_link_libraries(maildir KF5::PimUtils KF5::AkonadiKMime KF5::AkonadiCore)
 
 set_target_properties(maildir PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 

resources/maildir/libmaildir/maildir.cpp

@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kpimutils/kfileio.h>
-#include <kmime/messageflags.h>
+#include <akonadi/kmime/messageflags.h>
 
 #include <kde_file.h>
 #include <time.h>

resources/maildir/maildirresource.cpp

@@ -26,7 +26,7 @@
 #include <QtCore/QDir>
 #include <QtDBus/QDBusConnection>
 
-#include <kmime/messageparts.h>
+#include <akonadi/kmime/messageparts.h>
 #include <changerecorder.h>
 #include <itemfetchscope.h>
 #include <itemfetchjob.h>

resources/maildir/retrieveitemsjob.h

@@ -20,9 +20,9 @@
 #ifndef MAILDIR_RETRIEVEITEMSJOB_H
 #define MAILDIR_RETRIEVEITEMSJOB_H
 
-#include <Akonadi/Item>
-#include <Akonadi/Job>
-#include <Akonadi/Collection>
+#include <item.h>
+#include <job.h>
+#include <collection.h>
 
 #include "maildir.h"
 

resources/mbox/CMakeLists.txt

-include_directories(
-    ${kdepim-runtime_SOURCE_DIR}
-    ${QT_QTDBUS_INCLUDE_DIR}
-    ${Boost_INCLUDE_DIR}
-)
-
 kde_enable_exceptions()
 
+find_package(KF5Mbox ${KF5_VERSION} CONFIG REQUIRED)
+
 add_subdirectory(wizard)
 
 ########### next target ###############
@@ -39,6 +35,6 @@ if (Q_WS_MAC)
   set_target_properties(akonadi_mbox_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Mbox Resource")
 endif ()
 
-target_link_libraries(akonadi_mbox_resource ${KDEPIMLIBS_KMBOX_LIBS} KF5::AkonadiCore KF5::AkonadiKMime  KF5::KIOCore KF5::KMime)
+target_link_libraries(akonadi_mbox_resource KF5::Mbox KF5::AkonadiCore KF5::AkonadiKMime  KF5::KIOCore KF5::KMime KF5::AkonadiAgentBase)
 
 install(TARGETS akonadi_mbox_resource DESTINATION ${PLUGIN_INSTALL_DIR})

resources/mbox/compactpage.cpp

@@ -22,6 +22,8 @@
 #include <collectionfetchjob.h>
 #include <collectionmodifyjob.h>
 #include <kmbox/mbox.h>
+#include <KLocalizedString>
+#include <KUrl>
 
 #include "deleteditemsattribute.h"
 

resources/mbox/mboxresource.cpp

@@ -31,6 +31,7 @@
 #include <kmbox/mbox.h>
 #include <kmime/kmime_message.h>
 #include <KWindowSystem>
+#include <KIcon>
 
 #include "compactpage.h"
 #include "deleteditemsattribute.h"

resources/vcard/CMakeLists.txt

-include_directories(
-    ${kdepim-runtime_SOURCE_DIR}
-    ${QT_QTDBUS_INCLUDE_DIR}
-)
-
 kde_enable_exceptions()
-add_subdirectory( tests )
+#Reactivate it
+#add_subdirectory( tests )
 
 ########### next target ###############
 
@@ -32,7 +28,7 @@ if (Q_WS_MAC)
   set_target_properties(akonadi_vcard_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi VCard Resource")
 endif ()
 
-target_link_libraries(akonadi_vcard_resource KF5::AkonadiCore   ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KABC_LIBS} KF5::KIOCore)
+target_link_libraries(akonadi_vcard_resource KF5::AkonadiCore KF5::KIOCore   KF5::AkonadiAgentBase KF5::Abc)
 
 install(TARGETS akonadi_vcard_resource DESTINATION ${PLUGIN_INSTALL_DIR})
 

resources/vcarddir/CMakeLists.txt

@@ -33,9 +33,8 @@ endif ()
 
 target_link_libraries(akonadi_vcarddir_resource
   KF5::AkonadiCore
-  
-  ${KDE4_KDECORE_LIBS}
-  ${KDEPIMLIBS_KABC_LIBS}
+  KF5::AkonadiAgentBase
+  KF5::Abc  
   KF5::KIOCore
 )
 

resources/vcarddir/vcarddirresource.cpp

@@ -31,6 +31,9 @@
 #include <entitydisplayattribute.h>
 #include <itemfetchscope.h>
 
+#include <KIcon>
+#include <KLocalizedString>
+
 using namespace Akonadi;
 
 VCardDirResource::VCardDirResource( const QString &id )