Commit 7da12a6b authored by Sergio Martins's avatar Sergio Martins
Browse files

Get rid of calendarsupport/mailclient{cpp,h}

parent a7d55972
......@@ -27,7 +27,6 @@ set(calendarsupport_LIB_SRCS
groupware.cpp
kcalmodel.cpp
kcalprefs.cpp
mailclient.cpp
utils.cpp
next/incidencefetchjob.cpp
......
......@@ -30,7 +30,6 @@
#include "groupware.h"
#include "kcalprefs.h"
#include "mailclient.h"
#include <akonadi/calendar/calendarsettings.h>
#include <KCalUtils/IncidenceFormatter>
......
......@@ -40,7 +40,6 @@ namespace Akonadi {
namespace CalendarSupport {
class MailScheduler;
class CALENDARSUPPORT_EXPORT GroupwareUiDelegate
{
......
......@@ -24,7 +24,6 @@
#include "utils.h"
#include "kcalprefs.h"
#include "mailclient.h"
#include <Akonadi/Collection>
#include <Akonadi/CollectionDialog>
......
......@@ -31,6 +31,7 @@ if(NOT WINCE)
${korgac_SRCS}
alarmdialog.cpp
alarmdockwindow.cpp
mailclient.cpp
)
endif()
......@@ -73,6 +74,7 @@ endif()
target_link_libraries(korgac
akonadi-calendar
akonadi-kmime
calendarsupport
incidenceeditorsng
kdepim
......
......@@ -27,10 +27,10 @@
#include "alarmdialog.h"
#include "kocore.h"
#include "korganizer_interface.h"
#include "mailclient.h"
#include <calendarsupport/next/incidenceviewer.h>
#include <calendarsupport/kcalprefs.h>
#include <calendarsupport/mailclient.h>
#include <calendarsupport/utils.h>
#include <incidenceeditor-ng/incidencedialog.h>
......@@ -651,7 +651,7 @@ void AlarmDialog::eventNotification()
body += '\n' + alarm->mailText();
}
//TODO: support attachments
CalendarSupport::MailClient mailer;
KOrg::MailClient mailer;
mailer.send( id, from, to, QString(), subject, body, true, false, QString(),
MailTransport::TransportManager::self()->defaultTransportName() );
}
......
......@@ -50,7 +50,7 @@
#include <KProtocolManager>
#include <KSystemTimeZone>
using namespace CalendarSupport;
using namespace KOrg;
MailClient::MailClient() : QObject()
{
......
......@@ -24,23 +24,28 @@
#ifndef CALENDARSUPPORT_MAILCLIENT_H
#define CALENDARSUPPORT_MAILCLIENT_H
#include "calendarsupport_export.h"
#include <KCalCore/IncidenceBase>
#include <QObject>
/**
* MailClient is in kdepimlibs/akonadi/calendar now, but it's private API and I don't
* feel like making public right now, hence this copy.
*
* Theres probably non calendaring-specific APIs to send e-mails, so I'd like to keep
* MailClient private in kdepimlibs.
*/
namespace KPIMIdentities {
class Identity;
}
namespace CalendarSupport {
namespace KOrg {
class CALENDARSUPPORT_EXPORT MailClient : public QObject
class MailClient : public QObject
{
public:
MailClient();
virtual ~MailClient();
~MailClient();
bool mailAttendees( const KCalCore::IncidenceBase::Ptr &,
const KPIMIdentities::Identity &identity,
......
......@@ -10,7 +10,7 @@ set(korganizer_xml ${CMAKE_SOURCE_DIR}/korganizer/org.kde.korganizer.Korganizer.
########### next target ###############
set(testalarmdlg_SRCS testalarmdlg.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../alarmdialog.cpp)
set(testalarmdlg_SRCS testalarmdlg.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../alarmdialog.cpp ../mailclient.cpp)
qt4_add_dbus_interface(testalarmdlg_SRCS ${korganizer_xml}
korganizer_interface
......@@ -20,9 +20,13 @@ kde4_add_executable(testalarmdlg TEST ${testalarmdlg_SRCS})
target_link_libraries(testalarmdlg
akonadi-calendar
akonadi-kmime
calendarsupport
incidenceeditorsng
kdepimdbusinterfaces
kio
kmime
kpimutils
korganizer_core
${KDEPIMLIBS_AKONADI_LIBS}
${KDEPIMLIBS_KCALCORE_LIBS}
......
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