Commit c349e05d authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Start to reorganize lib

parent ce8a641a
......@@ -23,11 +23,11 @@
#include <qtest_akonadi.h>
#include <addressattribute.h>
#include <dispatchmodeattribute.h>
#include <errorattribute.h>
#include <sentactionattribute.h>
#include <sentbehaviourattribute.h>
#include <transportattribute.h>
#include <akonadi/dispatchmodeattribute.h>
#include <akonadi/errorattribute.h>
#include <akonadi/sentactionattribute.h>
#include <akonadi/sentbehaviourattribute.h>
#include <akonadi/transportattribute.h>
using namespace Akonadi;
using namespace MailTransport;
......
......@@ -38,12 +38,12 @@
#include <kmime/kmime_message.h>
#include <dispatchmodeattribute.h>
#include <errorattribute.h>
#include <akonadi/dispatchmodeattribute.h>
#include <akonadi/errorattribute.h>
#include <messagequeuejob.h>
#include <sentbehaviourattribute.h>
#include <akonadi/sentbehaviourattribute.h>
#include <transport.h>
#include <transportattribute.h>
#include <akonadi/transportattribute.h>
#include <transportmanager.h>
#include <qsignalspy.h>
......
......@@ -8,7 +8,6 @@ set(mailtransport_lib_srcs
transportmanager.cpp
transporttype.cpp
transportcombobox.cpp
transportconfigwidget.cpp
filteractionjob.cpp
......@@ -17,7 +16,6 @@ set(mailtransport_lib_srcs
smtpjob.cpp
precommandjob.cpp
legacydecrypt.cpp
socket.cpp
servertest.cpp
......@@ -25,20 +23,27 @@ set(mailtransport_lib_srcs
messagequeuejob.cpp
outboxactions.cpp
attributeregistrar.cpp
dispatchmodeattribute.cpp
errorattribute.cpp
sentactionattribute.cpp
sentbehaviourattribute.cpp
transportattribute.cpp
transportconfigdialog.cpp
smtpconfigwidget.cpp
transportlistview.cpp
transportmanagementwidget.cpp
addtransportdialog.cpp
)
set(mailtransport_akonadi_srcs
akonadi/attributeregistrar.cpp
akonadi/dispatchmodeattribute.cpp
akonadi/errorattribute.cpp
akonadi/transportattribute.cpp
akonadi/sentactionattribute.cpp
akonadi/sentbehaviourattribute.cpp
)
set(mailtransport_widgets_srcs
widgets/transportcombobox.cpp
widgets/transportlistview.cpp
widgets/transportmanagementwidget.cpp
)
ecm_qt_declare_logging_category(mailtransport_lib_srcs HEADER mailtransport_debug.h IDENTIFIER MAILTRANSPORT_LOG CATEGORY_NAME org.kde.pim.mailtransport)
ki18n_wrap_ui(mailtransport_lib_srcs
......@@ -49,7 +54,10 @@ ki18n_wrap_ui(mailtransport_lib_srcs
kconfig_add_kcfg_files(mailtransport_lib_srcs transportbase.kcfgc)
add_library(KF5MailTransport ${mailtransport_lib_srcs})
add_library(KF5MailTransport ${mailtransport_lib_srcs}
${mailtransport_widgets_srcs}
${mailtransport_akonadi_srcs}
)
generate_export_header(KF5MailTransport BASE_NAME mailtransport)
......@@ -101,34 +109,51 @@ add_subdirectory(kcm)
ecm_generate_headers(MailTransport_CamelCase_HEADERS
HEADER_NAMES
DispatcherInterface
DispatchModeAttribute
ErrorAttribute
MessageQueueJob
PrecommandJob
SentBehaviourAttribute
ServerTest
SmtpJob
Transport
TransportAttribute
#TransportBase
TransportComboBox
TransportJob
TransportManagementWidget
TransportManager
TransportType
PREFIX MailTransport
REQUIRED_HEADERS MailTransport_HEADERS
)
ecm_generate_headers(MailTransport_widgets_CamelCase_HEADERS
HEADER_NAMES
TransportComboBox
TransportManagementWidget
PREFIX MailTransport
REQUIRED_HEADERS MailTransport_widgets_HEADERS
RELATIVE widgets
)
ecm_generate_headers(MailTransport_akonadi_CamelCase_HEADERS
HEADER_NAMES
TransportAttribute
SentBehaviourAttribute
DispatchModeAttribute
ErrorAttribute
SentActionAttribute
PREFIX MailTransport
REQUIRED_HEADERS MailTransport_akonadi_HEADERS
RELATIVE akonadi
)
install(FILES
${MailTransport_CamelCase_HEADERS}
${MailTransport_widgets_CamelCase_HEADERS}
${MailTransport_akonadi_CamelCase_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/MailTransport/MailTransport/ COMPONENT Devel )
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/mailtransport_export.h
${MailTransport_HEADERS}
${MailTransport_widgets_HEADERS}
${MailTransport_akonadi_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/transportbase.h
sentactionattribute.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/MailTransport/mailtransport COMPONENT Devel
)
......
#! /bin/sh
$EXTRACTRC `find . -name \*.ui -o -iname \*.kcfg` >> rc.cpp || exit 11
$XGETTEXT *.cpp -o $podir/libmailtransport5.pot
$XGETTEXT `find . -name \*.cpp` -o $podir/libmailtransport5.pot
......@@ -27,7 +27,7 @@
#include <agentmanager.h>
#include <collection.h>
#include <specialmailcollections.h>
#include "transportattribute.h"
#include "akonadi/transportattribute.h"
using namespace Akonadi;
using namespace MailTransport;
......
......@@ -18,7 +18,7 @@
*/
#include "configmodule.h"
#include "transportmanagementwidget.h"
#include "widgets/transportmanagementwidget.h"
#include <KPluginFactory>
#include <KPluginLoader>
......
......@@ -20,7 +20,7 @@
#include "messagequeuejob.h"
#include "transport.h"
#include "transportattribute.h"
#include "akonadi/transportattribute.h"
#include "transportmanager.h"
#include "mailtransport_debug.h"
......
......@@ -22,10 +22,10 @@
#include <mailtransport_export.h>
#include "dispatchmodeattribute.h"
#include "sentactionattribute.h"
#include "sentbehaviourattribute.h"
#include "transportattribute.h"
#include "akonadi/dispatchmodeattribute.h"
#include "akonadi/sentactionattribute.h"
#include "akonadi/sentbehaviourattribute.h"
#include "akonadi/transportattribute.h"
#include <QtCore/QDateTime>
#include <QtCore/QString>
......
......@@ -20,8 +20,8 @@
#include "outboxactions_p.h"
#include "mailtransport_debug.h"
#include "dispatchmodeattribute.h"
#include "errorattribute.h"
#include "akonadi/dispatchmodeattribute.h"
#include "akonadi/errorattribute.h"
#include <itemmodifyjob.h>
#include <messageflags.h>
......
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