Commit e47446b0 authored by Laurent Montel's avatar Laurent Montel 😁

Make it compile pop3

parent 9d97a37e
...@@ -112,7 +112,7 @@ add_subdirectory( localbookmarks ) ...@@ -112,7 +112,7 @@ add_subdirectory( localbookmarks )
#add_subdirectory( maildir ) #add_subdirectory( maildir )
#add_subdirectory( openxchange ) #add_subdirectory( openxchange )
#add_subdirectory( pop3 ) add_subdirectory( pop3 )
#if( LibKGAPI2_FOUND ) #if( LibKGAPI2_FOUND )
# add_subdirectory( google ) # add_subdirectory( google )
......
project(pop3) 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() kde_enable_exceptions()
...@@ -44,7 +24,8 @@ qt5_add_dbus_adaptor(pop3resource_SRCS ...@@ -44,7 +24,8 @@ qt5_add_dbus_adaptor(pop3resource_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.POP3.Settings.xml settings.h Settings ${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) if (Q_WS_MAC)
set_target_properties(akonadi_pop3_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template) set_target_properties(akonadi_pop3_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
...@@ -56,14 +37,12 @@ endif () ...@@ -56,14 +37,12 @@ endif ()
target_link_libraries( akonadi_pop3_resource target_link_libraries( akonadi_pop3_resource
KF5::AkonadiCore KF5::AkonadiCore
KF5::AkonadiKMime KF5::AkonadiKMime
${KDE4_KDECORE_LIBS}
KF5::KIOCore KF5::KIOCore
KF5::KMime KF5::KMime
KF5::MailTransport KF5::MailTransport
KF5::PimUtils KF5::PimUtils
KF5::AkonadiAgentBase
KF5::AkonadiWidgets
) )
add_subdirectory( tests ) add_subdirectory( tests )
......
...@@ -27,12 +27,12 @@ ...@@ -27,12 +27,12 @@
#include "settingsadaptor.h" #include "settingsadaptor.h"
// KDEPIMLIBS includes // KDEPIMLIBS includes
#include <Akonadi/Collection> #include <Collection>
#include <Akonadi/CollectionFetchJob> #include <CollectionFetchJob>
#include <kmime/specialmailcollections.h> #include <akonadi/kmime/specialmailcollections.h>
#include <kmime/specialmailcollectionsrequestjob.h> #include <akonadi/kmime/specialmailcollectionsrequestjob.h>
#include <resourcesettings.h> #include <resourcesettings.h>
#include <Mailtransport/ServerTest> #include <MailTransport/ServerTest>
// KDELIBS includes // KDELIBS includes
#include <KEMailSettings> #include <KEMailSettings>
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
#include <KUser> #include <KUser>
#include <KWindowSystem> #include <KWindowSystem>
#include <kwallet.h> #include <kwallet.h>
#include <KDebug>
#include <KGlobalSettings>
using namespace MailTransport; using namespace MailTransport;
using namespace Akonadi; using namespace Akonadi;
...@@ -147,7 +149,6 @@ void AccountDialog::setupWidgets() ...@@ -147,7 +149,6 @@ void AccountDialog::setupWidgets()
folderRequester->setMimeTypeFilter( folderRequester->setMimeTypeFilter(
QStringList() << QLatin1String( "message/rfc822" ) ); QStringList() << QLatin1String( "message/rfc822" ) );
folderRequester->setFrameStyle( QFrame::NoFrame );
folderRequester->setAccessRightsFilter( Akonadi::Collection::CanCreateItem ); folderRequester->setAccessRightsFilter( Akonadi::Collection::CanCreateItem );
folderRequester->changeCollectionDialogOptions( Akonadi::CollectionDialog::AllowToCreateNewChildCollection ); folderRequester->changeCollectionDialogOptions( Akonadi::CollectionDialog::AllowToCreateNewChildCollection );
......
...@@ -20,10 +20,12 @@ ...@@ -20,10 +20,12 @@
#include "jobs.h" #include "jobs.h"
#include "settings.h" #include "settings.h"
#include <Mailtransport/Transport> #include <MailTransport/Transport>
#include <KIO/Scheduler> #include <KIO/Scheduler>
#include <KIO/Slave> #include <KIO/Slave>
#include <KIO/Job>
#include <KIO/TransferJob>
#include <KDebug> #include <KDebug>
#include <KLocalizedString> #include <KLocalizedString>
......
...@@ -24,6 +24,6 @@ ...@@ -24,6 +24,6 @@
#include <QtCore/QMetaType> #include <QtCore/QMetaType>
Q_DECLARE_METATYPE(QList<int>) //Q_DECLARE_METATYPE(QList<int>)
#endif #endif
...@@ -22,19 +22,22 @@ ...@@ -22,19 +22,22 @@
#include "jobs.h" #include "jobs.h"
#include "pop3resourceattribute.h" #include "pop3resourceattribute.h"
#include <Akonadi/CollectionFetchJob> #include <CollectionFetchJob>
#include <Akonadi/ItemCreateJob> #include <ItemCreateJob>
#include <Akonadi/AttributeFactory> #include <AttributeFactory>
#include <kmime/messageflags.h> #include <akonadi/kmime/messageflags.h>
#include <kmime/specialmailcollectionsrequestjob.h> #include <akonadi/kmime/specialmailcollectionsrequestjob.h>
#include <kmime/specialmailcollections.h> #include <akonadi/kmime/specialmailcollections.h>
#include <kmime/kmime_util.h> #include <kmime/kmime_util.h>
#include <Mailtransport/PrecommandJob> #include <MailTransport/PrecommandJob>
#include <Mailtransport/Transport> #include <MailTransport/Transport>
#include <kio/global.h>
#include <kio/job.h>
#include <KPasswordDialog> #include <KPasswordDialog>
#include <KMessageBox> #include <KMessageBox>
#include <kwallet.h> #include <kwallet.h>
#include <KDebug>
#include <QTimer> #include <QTimer>
...@@ -204,7 +207,7 @@ void POP3Resource::showPasswordDialog( const QString &queryText ) ...@@ -204,7 +207,7 @@ void POP3Resource::showPasswordDialog( const QString &queryText )
dlg->setUsername( Settings::self()->login() ); dlg->setUsername( Settings::self()->login() );
dlg->setPassword( mPassword ); dlg->setPassword( mPassword );
dlg->setPrompt( queryText ); dlg->setPrompt( queryText );
dlg->setCaption( name() ); dlg->setWindowTitle( name() );
dlg->addCommentLine( i18n( "Account:" ), name() ); dlg->addCommentLine( i18n( "Account:" ), name() );
bool gotIt = false; bool gotIt = false;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef POP3RESOURCE_H #ifndef POP3RESOURCE_H
#define POP3RESOURCE_H #define POP3RESOURCE_H
#include <Akonadi/ResourceBase> #include <ResourceBase>
#include <KMime/Message> #include <KMime/Message>
#include <KJob> #include <KJob>
......
...@@ -428,12 +428,6 @@ ...@@ -428,12 +428,6 @@
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="Akonadi::CollectionRequester" name="folderRequester"> <widget class="Akonadi::CollectionRequester" name="folderRequester">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
...@@ -611,7 +605,7 @@ p, li { white-space: pre-wrap; } ...@@ -611,7 +605,7 @@ p, li { white-space: pre-wrap; }
<customwidget> <customwidget>
<class>Akonadi::CollectionRequester</class> <class>Akonadi::CollectionRequester</class>
<extends>QFrame</extends> <extends>QFrame</extends>
<header>Akonadi/CollectionRequester</header> <header>CollectionRequester</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <KGlobal> #include <KGlobal>
#include <kwallet.h> #include <kwallet.h>
#include <KDebug>
class SettingsHelper class SettingsHelper
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment