Make it compile

resources/CMakeLists.txt

@@ -23,6 +23,9 @@ 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)
+find_package(KF5PimIdentities ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5MailTransport ${KF5_VERSION} CONFIG REQUIRED)
+
 
 # Xsltproc
 find_package(Xsltproc)
@@ -69,7 +72,7 @@ set( AKONADI_IMAPATTRIBUTES_SHARED_SOURCES
 #add_subdirectory( contacts )
 add_subdirectory( dav )
 #add_subdirectory( ical )
-#add_subdirectory( imap )
+add_subdirectory( imap )
 add_subdirectory( kdeaccounts )
 #if (Libkolab_FOUND AND Libkolabxml_FOUND)
 #    macro_optional_add_subdirectory( kolabproxy )
@@ -93,11 +96,11 @@ add_subdirectory( localbookmarks )
 add_subdirectory( shared )
 add_subdirectory( birthdays )
 #add_subdirectory( mixedmaildir )
-#add_subdirectory( mailtransport_dummy )
+add_subdirectory( mailtransport_dummy )
 #add_subdirectory( mbox )
-#add_subdirectory( nntp )
+add_subdirectory( nntp )
 add_subdirectory( vcarddir )
 add_subdirectory( icaldir )
 #add_subdirectory( vcard )
-#add_subdirectory( folderarchivesettings )
+add_subdirectory( folderarchivesettings )
 

resources/folderarchivesettings/CMakeLists.txt

@@ -12,9 +12,10 @@ add_library(folderarchivesettings ${LIBRARY_TYPE} ${folderarchivesettings_SRCS}
 target_link_libraries(folderarchivesettings
                       KF5::KMime
                       KF5::AkonadiCore
+                      KF5::AkonadiWidgets
 )
 
-set_target_properties(folderarchivesettings PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+set_target_properties(folderarchivesettings PROPERTIES VERSION ${KF5_VERSION} SOVERSION ${KF5_VERSION} )
 
 install(TARGETS folderarchivesettings ${INSTALL_TARGETS_DEFAULT_ARGS})
 

resources/folderarchivesettings/folderarchiveaccountinfo.h

@@ -19,7 +19,7 @@
 #define FOLDERARCHIVEACCOUNTINFO_H
 
 #include <KConfigGroup>
-#include <Akonadi/Collection>
+#include <Collection>
 
 class FolderArchiveAccountInfo
 {

resources/folderarchivesettings/folderarchivesettingpage.cpp

@@ -19,7 +19,7 @@
 #include "folderarchiveaccountinfo.h"
 #include "folderarchiveutil.h"
 
-#include <Akonadi/CollectionRequester>
+#include <CollectionRequester>
 
 #include <kmime/kmime_message.h>
 

resources/mailtransport_dummy/CMakeLists.txt

@@ -17,6 +17,6 @@ qt5_add_dbus_adaptor(mtdummyresource_SRCS
 
 add_executable(akonadi_mailtransport_dummy_resource ${mtdummyresource_SRCS})
 
-target_link_libraries(akonadi_mailtransport_dummy_resource KF5::AkonadiCore    ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS})
+target_link_libraries(akonadi_mailtransport_dummy_resource KF5::AkonadiCore KF5::AkonadiWidgets KF5::AkonadiAgentBase)
 
 install(TARGETS akonadi_mailtransport_dummy_resource ${INSTALL_TARGETS_DEFAULT_ARGS})

resources/mailtransport_dummy/configdialog.cpp

@@ -20,8 +20,8 @@
 #include "configdialog.h"
 #include "settings.h"
 
-#include <Akonadi/Collection>
-#include <Akonadi/CollectionRequester>
+#include <Collection>
+#include <CollectionRequester>
 
 using namespace Akonadi;
 

resources/mailtransport_dummy/mtdummyresource.cpp

@@ -28,8 +28,8 @@
 
 #include <QtDBus/QDBusConnection>
 
-#include <Akonadi/ItemCopyJob>
-
+#include <ItemCopyJob>
+#include <KGlobal>
 using namespace Akonadi;
 
 MTDummyResource::MTDummyResource( const QString &id )

resources/mailtransport_dummy/mtdummyresource.h

@@ -21,9 +21,9 @@
 #ifndef MTDUMMYRESOURCE_H
 #define MTDUMMYRESOURCE_H
 
-#include <Akonadi/Item>
-#include <Akonadi/ResourceBase>
-#include <Akonadi/TransportResourceBase>
+#include <Item>
+#include <ResourceBase>
+#include <TransportResourceBase>
 
 class MTDummyResource : public Akonadi::ResourceBase, public Akonadi::TransportResourceBase
 {

resources/mailtransport_dummy/settings.ui

@@ -24,12 +24,6 @@
    </item>
    <item>
     <widget class="Akonadi::CollectionRequester" name="sink">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
     </widget>
    </item>
    <item>
@@ -51,7 +45,7 @@
   <customwidget>
    <class>Akonadi::CollectionRequester</class>
    <extends>QFrame</extends>
-   <header>akonadi/collectionrequester.h</header>
+   <header>collectionrequester.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

resources/nntp/CMakeLists.txt

@@ -31,6 +31,6 @@ if (Q_WS_MAC)
   set_target_properties(akonadi_nntp_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi NNTP Resource")
 endif ()
 
-target_link_libraries(akonadi_nntp_resource KF5::AkonadiCore KF5::AkonadiKMime   ${KDE4_KDECORE_LIBS} KF5::KIOCore KF5::KMime ${QT_QTCORE_LIBRARY})
+target_link_libraries(akonadi_nntp_resource KF5::AkonadiCore KF5::AkonadiKMime KF5::KIOCore KF5::KMime KF5::AkonadiAgentBase)
 
 install(TARGETS akonadi_nntp_resource ${INSTALL_TARGETS_DEFAULT_ARGS})

resources/nntp/nntpresource.cpp

@@ -27,7 +27,7 @@
 #include <cachepolicy.h>
 #include <collectionmodifyjob.h>
 #include <itemcreatejob.h>
-#include <kmime/messageparts.h>
+#include <akonadi/kmime/messageparts.h>
 #include <monitor.h>
 #include <session.h>
 #include <changerecorder.h>
@@ -37,6 +37,8 @@
 #include <kmime/kmime_util.h>
 
 #include <KWindowSystem>
+#include <KLocalizedString>
+#include <KIcon>
 
 #include <QDateTime>
 #include <QDir>