Commit 8530205c authored by Laurent Montel's avatar Laurent Montel 😁

Move in own directory

parent 50eed00e
......@@ -40,7 +40,7 @@
#include <akonadi/dispatchmodeattribute.h>
#include <akonadi/errorattribute.h>
#include <messagequeuejob.h>
#include <akonadi/messagequeuejob.h>
#include <akonadi/sentbehaviourattribute.h>
#include <transport.h>
#include <akonadi/transportattribute.h>
......
......@@ -17,20 +17,20 @@ set(mailtransport_lib_srcs
socket.cpp
servertest.cpp
dispatcherinterface.cpp
messagequeuejob.cpp
outboxactions.cpp
)
set(mailtransport_akonadi_srcs
akonadi/dispatcherinterface.cpp
akonadi/attributeregistrar.cpp
akonadi/dispatchmodeattribute.cpp
akonadi/errorattribute.cpp
akonadi/transportattribute.cpp
akonadi/sentactionattribute.cpp
akonadi/sentbehaviourattribute.cpp
akonadi/messagequeuejob.cpp
akonadi/outboxactions.cpp
)
set(mailtransport_widgets_srcs
......@@ -93,11 +93,6 @@ set_target_properties(KF5MailTransport PROPERTIES
)
if(MAILTRANSPORT_INPROCESS_SMTP)
target_link_libraries(mailtransport ${Sasl2_LIBRARIES} KF5::PimUtils)
endif()
install(TARGETS KF5MailTransport EXPORT KF5MailTransportTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES mailtransport.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
......@@ -107,8 +102,6 @@ add_subdirectory(kcm)
ecm_generate_headers(MailTransport_CamelCase_HEADERS
HEADER_NAMES
DispatcherInterface
MessageQueueJob
PrecommandJob
ServerTest
SmtpJob
......@@ -131,6 +124,8 @@ ecm_generate_headers(MailTransport_widgets_CamelCase_HEADERS
ecm_generate_headers(MailTransport_akonadi_CamelCase_HEADERS
HEADER_NAMES
DispatcherInterface
MessageQueueJob
TransportAttribute
SentBehaviourAttribute
DispatchModeAttribute
......
......@@ -20,7 +20,7 @@
#include "dispatcherinterface.h"
#include "dispatcherinterface_p.h"
#include "outboxactions_p.h"
#include "akonadi/outboxactions_p.h"
#include "mailtransport_debug.h"
......
......@@ -70,19 +70,6 @@ class SmtpJobPrivate
public:
SmtpJobPrivate(SmtpJob *parent) : q(parent) {}
void smtpSessionResult(SmtpSession *session)
{
#ifndef MAILTRANSPORT_INPROCESS_SMTP
Q_UNUSED(session);
#else
if (!session->errorMessage().isEmpty()) {
q->setError(KJob::UserDefinedError);
q->setErrorText(session->errorMessage());
}
q->emitResult();
#endif
}
SmtpJob *q;
KIO::Slave *slave;
enum State {
......@@ -218,7 +205,6 @@ void SmtpJob::startSmtpJob()
destination.setPath(QStringLiteral("/send"));
destination.setQuery(destinationQuery);
#ifndef MAILTRANSPORT_INPROCESS_SMTP
d->slave = s_slavePool->slaves.value(transport()->id());
if (!d->slave) {
KIO::MetaData slaveConfig;
......@@ -248,16 +234,6 @@ void SmtpJob::startSmtpJob()
addSubjob(job);
KIO::Scheduler::assignJobToSlave(d->slave, job);
#else
SmtpSession *session = new SmtpSession(this);
connect(session, SIGNAL(result(MailTransport::SmtpSession*)),
SLOT(smtpSessionResult(MailTransport::SmtpSession*)));
session->setUseTLS(transport()->encryption() == Transport::EnumEncryption::TLS);
if (transport()->requiresAuthentication()) {
session->setSaslMethod(transport()->authenticationTypeString());
}
session->sendMessage(destination, buffer());
#endif
setTotalAmount(KJob::Bytes, data().length());
}
......
......@@ -38,7 +38,6 @@ class SmtpJobPrivate;
namespace MailTransport
{
class SmtpSession;
/**
Mail transport job for SMTP.
......@@ -83,7 +82,6 @@ private Q_SLOTS:
private:
friend class ::SmtpJobPrivate;
SmtpJobPrivate *const d;
Q_PRIVATE_SLOT(d, void smtpSessionResult(MailTransport::SmtpSession *))
};
} // namespace MailTransport
......
......@@ -106,7 +106,7 @@ public:
Note: The Transport objects become invalid as soon as a change occur, so
they are only suitable for immediate use.
*/
QList<Transport *>transports() const;
QList<Transport *> transports() const;
/**
Returns a list of all available transport types.
......
......@@ -26,7 +26,7 @@
#include <control.h>
#include <dispatcherinterface.h>
#include <akonadi/dispatcherinterface.h>
using namespace Akonadi;
using namespace MailTransport;
......
......@@ -24,7 +24,7 @@
#include <collection.h>
#include <control.h>
#include <filteractionjob_p.h>
#include <dispatcherinterface.h>
#include <akonadi/dispatcherinterface.h>
#include <specialmailcollections.h>
#include <specialmailcollectionsrequestjob.h>
......
......@@ -36,7 +36,7 @@
#include <QDialogButtonBox>
#include <akonadi/dispatchmodeattribute.h>
#include <messagequeuejob.h>
#include <akonadi/messagequeuejob.h>
#include <transportmanager.h>
#include <transport.h>
......
......@@ -24,7 +24,7 @@
#include <collection.h>
#include <control.h>
#include <filteractionjob_p.h>
#include <dispatcherinterface.h>
#include <akonadi/dispatcherinterface.h>
#include <specialmailcollections.h>
#include <specialmailcollectionsrequestjob.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