Make it compile pop3

resources/CMakeLists.txt

@@ -112,7 +112,7 @@ add_subdirectory( localbookmarks )
 #add_subdirectory( maildir )
 
 #add_subdirectory( openxchange )
-#add_subdirectory( pop3 )
+add_subdirectory( pop3 )
 
 #if( LibKGAPI2_FOUND )
 #  add_subdirectory( google )

resources/pop3/CMakeLists.txt

 project(pop3)
 
-if (XSLTPROC_EXECUTABLE)
-  # generates a D-Bus interface description from a KConfigXT file
-  macro( kcfg_generate_dbus_interface _kcfg _name )
-    add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml
-      COMMAND ${XSLTPROC_EXECUTABLE} --stringparam interfaceName ${_name}
-              ${KDEPIMLIBS_DATA_DIR}/akonadi-kde/kcfg2dbus.xsl
-              ${_kcfg}
-              > ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml
-      DEPENDS ${KDEPIMLIBS_DATA_DIR}/akonadi-kde/kcfg2dbus.xsl
-              ${_kcfg}
-    )
-  endmacro()
-endif ()
-
-include_directories(
-    ${KDE4_INCLUDES}
-    ${KDEPIMLIBS_INCLUDE_DIRS}
-)
-
 kde_enable_exceptions()
 
 
@@ -44,7 +24,8 @@ qt5_add_dbus_adaptor(pop3resource_SRCS
   ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.POP3.Settings.xml settings.h Settings
 )
 
-add_executable(akonadi_pop3_resource RUN_UNINSTALLED ${pop3resource_SRCS})
+#add_executable(akonadi_pop3_resource RUN_UNINSTALLED ${pop3resource_SRCS})
+add_executable(akonadi_pop3_resource ${pop3resource_SRCS})
 
 if (Q_WS_MAC)
   set_target_properties(akonadi_pop3_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
@@ -56,14 +37,12 @@ endif ()
 target_link_libraries( akonadi_pop3_resource
   KF5::AkonadiCore
   KF5::AkonadiKMime
-  
-  
-  
-  ${KDE4_KDECORE_LIBS}
   KF5::KIOCore
   KF5::KMime
   KF5::MailTransport
   KF5::PimUtils
+  KF5::AkonadiAgentBase
+  KF5::AkonadiWidgets
 )
 
 add_subdirectory( tests )

resources/pop3/accountdialog.cpp

@@ -27,12 +27,12 @@
 #include "settingsadaptor.h"
 
 // KDEPIMLIBS includes
-#include <Akonadi/Collection>
-#include <Akonadi/CollectionFetchJob>
-#include <kmime/specialmailcollections.h>
-#include <kmime/specialmailcollectionsrequestjob.h>
+#include <Collection>
+#include <CollectionFetchJob>
+#include <akonadi/kmime/specialmailcollections.h>
+#include <akonadi/kmime/specialmailcollectionsrequestjob.h>
 #include <resourcesettings.h>
-#include <Mailtransport/ServerTest>
+#include <MailTransport/ServerTest>
 
 // KDELIBS includes
 #include <KEMailSettings>
@@ -41,6 +41,8 @@
 #include <KUser>
 #include <KWindowSystem>
 #include <kwallet.h>
+#include <KDebug>
+#include <KGlobalSettings>
 
 using namespace MailTransport;
 using namespace Akonadi;
@@ -147,7 +149,6 @@ void AccountDialog::setupWidgets()
 
   folderRequester->setMimeTypeFilter(
       QStringList() << QLatin1String( "message/rfc822" ) );
-  folderRequester->setFrameStyle( QFrame::NoFrame );
   folderRequester->setAccessRightsFilter( Akonadi::Collection::CanCreateItem );
   folderRequester->changeCollectionDialogOptions( Akonadi::CollectionDialog::AllowToCreateNewChildCollection );
 

resources/pop3/jobs.cpp

@@ -20,10 +20,12 @@
 #include "jobs.h"
 #include "settings.h"
 
-#include <Mailtransport/Transport>
+#include <MailTransport/Transport>
 
 #include <KIO/Scheduler>
 #include <KIO/Slave>
+#include <KIO/Job>
+#include <KIO/TransferJob>
 #include <KDebug>
 #include <KLocalizedString>
 

resources/pop3/metatype.h

@@ -24,6 +24,6 @@
 
 #include <QtCore/QMetaType>
 
-Q_DECLARE_METATYPE(QList<int>)
+//Q_DECLARE_METATYPE(QList<int>)
 
 #endif

resources/pop3/pop3resource.cpp

@@ -22,19 +22,22 @@
 #include "jobs.h"
 #include "pop3resourceattribute.h"
 
-#include <Akonadi/CollectionFetchJob>
-#include <Akonadi/ItemCreateJob>
-#include <Akonadi/AttributeFactory>
-#include <kmime/messageflags.h>
-#include <kmime/specialmailcollectionsrequestjob.h>
-#include <kmime/specialmailcollections.h>
+#include <CollectionFetchJob>
+#include <ItemCreateJob>
+#include <AttributeFactory>
+#include <akonadi/kmime/messageflags.h>
+#include <akonadi/kmime/specialmailcollectionsrequestjob.h>
+#include <akonadi/kmime/specialmailcollections.h>
 #include <kmime/kmime_util.h>
-#include <Mailtransport/PrecommandJob>
-#include <Mailtransport/Transport>
+#include <MailTransport/PrecommandJob>
+#include <MailTransport/Transport>
 
+#include <kio/global.h>
+#include <kio/job.h>
 #include <KPasswordDialog>
 #include <KMessageBox>
 #include <kwallet.h>
+#include <KDebug>
 
 #include <QTimer>
 
@@ -204,7 +207,7 @@ void POP3Resource::showPasswordDialog( const QString &queryText )
   dlg->setUsername( Settings::self()->login() );
   dlg->setPassword( mPassword );
   dlg->setPrompt( queryText );
-  dlg->setCaption( name() );
+  dlg->setWindowTitle( name() );
   dlg->addCommentLine( i18n( "Account:" ), name() );
 
   bool gotIt = false;

resources/pop3/pop3resource.h

@@ -19,7 +19,7 @@
 #ifndef POP3RESOURCE_H
 #define POP3RESOURCE_H
 
-#include <Akonadi/ResourceBase>
+#include <ResourceBase>
 #include <KMime/Message>
 #include <KJob>
 

resources/pop3/popsettings.ui

@@ -428,12 +428,6 @@
             </item>
             <item row="0" column="1">
              <widget class="Akonadi::CollectionRequester" name="folderRequester">
-              <property name="frameShape">
-               <enum>QFrame::StyledPanel</enum>
-              </property>
-              <property name="frameShadow">
-               <enum>QFrame::Raised</enum>
-              </property>
              </widget>
             </item>
            </layout>
@@ -611,7 +605,7 @@ p, li { white-space: pre-wrap; }
   <customwidget>
    <class>Akonadi::CollectionRequester</class>
    <extends>QFrame</extends>
-   <header>Akonadi/CollectionRequester</header>
+   <header>CollectionRequester</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

resources/pop3/settings.cpp

@@ -21,6 +21,7 @@
 
 #include <KGlobal>
 #include <kwallet.h>
+#include <KDebug>
 
 class SettingsHelper
 {