Skip to content

Commit

Permalink
Merge branch 'kf5' into 'master'
Browse files Browse the repository at this point in the history 
[mkcal] Update to use KF5 CalendarCore from upstream.

See merge request mer-core/mkcal!16
  • Loading branch information
blam committed Dec 20, 2020
2 parents 969005d + c484373 commit 53ff43c
Show file tree
Hide file tree
Showing 25 changed files with 1,103 additions and 1,204 deletions.
23 changes: 12 additions & 11 deletions plugins/defaultinvitationplugin/defaultinvitationplugin.cpp
View file
Expand Up @@ -17,15 +17,16 @@
#include "defaultinvitationplugin.h"
#include <extendedcalendar.h>
#include <QDebug>
#include <icalformat.h>
#include <QTimer>

#include <KCalendarCore/ICalFormat>

#include <qmailaccount.h>
#include <qmailstore.h>
#include <qmailaddress.h>
#include <qmailserviceaction.h>

using namespace KCalCore;
using namespace KCalendarCore;

const QString name("DefaultInvitationPlugin");

Expand Down Expand Up @@ -226,8 +227,8 @@ bool DefaultInvitationPlugin::sendInvitation(const QString &accountId, const QSt
const QString &ical = icf.createScheduleMessage(invitation, iTIPRequest);

QStringList emails;
foreach (const Attendee::Ptr &att, attendees) {
emails.append(att->email());
foreach (const Attendee &att, attendees) {
emails.append(att.email());
}

const QString &description = invitation->description();
Expand Down Expand Up @@ -262,8 +263,8 @@ bool DefaultInvitationPlugin::sendUpdate(const QString &accountId, const Inciden
const QString &ical = icf.createScheduleMessage(invitationCopy, cancelled ? iTIPCancel : iTIPRequest);

QStringList emails;
foreach (const Attendee::Ptr &att, attendees) {
emails.append(att->email());
foreach (const Attendee &att, attendees) {
emails.append(att.email());
}

const QString &description = invitationCopy->description();
Expand All @@ -281,15 +282,15 @@ bool DefaultInvitationPlugin::sendResponse(const QString &accountId, const Incid
d->init();

// Is there an organizer?
Person::Ptr organizer = invitation->organizer();
if (organizer.isNull() || organizer->email().isEmpty()) { // we do not have an organizer
const Person &organizer = invitation->organizer();
if (organizer.isEmpty() || organizer.email().isEmpty()) { // we do not have an organizer
qWarning() << "sendResponse() called with wrong invitation: there is no organizer!";
return false;
}

// Check: Am I one of the attendees? Had the organizer requested RSVP from me?
Attendee::Ptr me = invitation->attendeeByMail(d->accountEmailAddress(accountId));
if (me.isNull() || (!me->RSVP())) {
const Attendee &me = invitation->attendeeByMail(d->accountEmailAddress(accountId));
if (me.isNull() || (!me.RSVP())) {
qWarning() << "sendResponse() called with wrong invitation: we are not invited or no response is expected.";
return false;
}
Expand All @@ -304,7 +305,7 @@ bool DefaultInvitationPlugin::sendResponse(const QString &accountId, const Incid

const QString &ical = icf.createScheduleMessage(invitationCopy, iTIPReply);

bool res = d->sendMail(accountId, QStringList(organizer->email()), invitationCopy->summary(), body, ical, false);
bool res = d->sendMail(accountId, QStringList(organizer.email()), invitationCopy->summary(), body, ical, false);

return res;
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/defaultinvitationplugin/defaultinvitationplugin.h
View file
Expand Up @@ -20,7 +20,7 @@
#include "servicehandlerif.h"
#include <QtCore/QObject>

using namespace KCalCore;
using namespace KCalendarCore;

/**
* \brief DefaultInvitationPlugin class.
Expand All @@ -40,7 +40,7 @@ class DefaultInvitationPlugin : public QObject, public InvitationHandlerInterfac
DefaultInvitationPlugin();
~DefaultInvitationPlugin();

//! \reimp InvitationHandler KCalCore
//! \reimp InvitationHandler KCalendarCore
bool sendInvitation(const QString &accountId, const QString &notebookId, const Incidence::Ptr &invitation,
const QString &body);
bool sendUpdate(const QString &accountId, const Incidence::Ptr &invitation, const QString &body);
Expand Down
2 changes: 1 addition & 1 deletion plugins/defaultinvitationplugin/defaultinvitationplugin.pro
View file
Expand Up @@ -13,7 +13,7 @@ QMAKE_CLEAN += *.so* .obj/* .moc/*
LIBS += -L../../src/ -lmkcal-qt5
CONFIG += link_pkgconfig
PKGCONFIG += QmfClient \
libkcalcoren-qt5
KF5CalendarCore

QT -= gui

Expand Down
5 changes: 1 addition & 4 deletions rpm/mkcal-qt5.spec
View file
Expand Up @@ -12,13 +12,10 @@ Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: kcalcore-qt5-devel >= 4.10.2+9git23
BuildRequires: pkgconfig(KF5CalendarCore)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(timed-qt5) >= 2.88
BuildRequires: pkgconfig(QmfClient)
Requires: kcalcore-qt5 >= 4.10.2+9git23
# One cannot use the pkgconfig test for kcalcore because the version is not update
# there due to local patching.

%description
Extended KDE kcal calendar library port for Maemo
Expand Down
61 changes: 31 additions & 30 deletions src/dummystorage.h
View file
Expand Up @@ -29,7 +29,7 @@

/**
* This module provides a simple storage abstraction which contains
* exactly nothing. It is only inteded to use for testing pouposes
* exactly nothing. It is only inteded to use for testing purposes
*/

class MKCAL_EXPORT DummyStorage : public mKCal::ExtendedStorage
Expand All @@ -46,23 +46,24 @@ class MKCAL_EXPORT DummyStorage : public mKCal::ExtendedStorage
Q_ASSERT(r);
}

void calendarModified(bool, KCalCore::Calendar *)
void calendarModified(bool, KCalendarCore::Calendar *)
{
}
void calendarIncidenceAdded(const KCalCore::Incidence::Ptr &)
void calendarIncidenceAdded(const KCalendarCore::Incidence::Ptr &)
{
}
void calendarIncidenceChanged(const KCalCore::Incidence::Ptr &)
void calendarIncidenceChanged(const KCalendarCore::Incidence::Ptr &)
{
}
void calendarIncidenceDeleted(const KCalCore::Incidence::Ptr &)
void calendarIncidenceDeleted(const KCalendarCore::Incidence::Ptr &)
{
}
void calendarIncidenceAdditionCanceled(const KCalCore::Incidence::Ptr &)
void calendarIncidenceAdditionCanceled(const KCalendarCore::Incidence::Ptr &)
{
}
bool purgeDeletedIncidences(const KCalCore::Incidence::List &)
bool purgeDeletedIncidences(const KCalendarCore::Incidence::List &)
{
return true;
}

/**
Expand Down Expand Up @@ -99,7 +100,7 @@ class MKCAL_EXPORT DummyStorage : public mKCal::ExtendedStorage
{
return true;
}
bool load(const QString &, const KDateTime &)
bool load(const QString &, const QDateTime &)
{
return true;
}
Expand Down Expand Up @@ -147,83 +148,83 @@ class MKCAL_EXPORT DummyStorage : public mKCal::ExtendedStorage
{
return 0;
}
int loadCompletedTodos(bool, int, KDateTime *)
int loadCompletedTodos(bool, int, QDateTime *)
{
return 0;
}
int loadIncidences(bool, int, KDateTime *)
int loadIncidences(bool, int, QDateTime *)
{
return 0;
}
int loadFutureIncidences(int, KDateTime *)
int loadFutureIncidences(int, QDateTime *)
{
return 0;
}
int loadGeoIncidences(bool, int, KDateTime *)
int loadGeoIncidences(bool, int, QDateTime *)
{
return 0;
}
int loadUnreadInvitationIncidences()
{
return 0;
}
int loadOldInvitationIncidences(int, KDateTime *)
int loadOldInvitationIncidences(int, QDateTime *)
{
return 0;
}
KCalCore::Person::List loadContacts()
KCalendarCore::Person::List loadContacts()
{
KCalCore::Person::List l;
KCalendarCore::Person::List l;
return l;
}
int loadContactIncidences(const KCalCore::Person::Ptr &, int, KDateTime *)
int loadContactIncidences(const KCalendarCore::Person &, int, QDateTime *)
{
return 0;
}
int loadJournals(int, KDateTime *)
int loadJournals(int, QDateTime *)
{
return 0;
}
bool notifyOpened(const KCalCore::Incidence::Ptr &)
bool notifyOpened(const KCalendarCore::Incidence::Ptr &)
{
return true;
}
bool cancel()
{
return true;
}
void calendarModified(bool, const KCalCore::Calendar *) const
void calendarModified(bool, const KCalendarCore::Calendar *) const
{
}
void calendarIncidenceAdded(const KCalCore::Incidence::Ptr &) const
void calendarIncidenceAdded(const KCalendarCore::Incidence::Ptr &) const
{
}
void calendarIncidenceChanged(const KCalCore::Incidence::Ptr &) const
void calendarIncidenceChanged(const KCalendarCore::Incidence::Ptr &) const
{
}
void calendarIncidenceDeleted(const KCalCore::Incidence::Ptr &) const
void calendarIncidenceDeleted(const KCalendarCore::Incidence::Ptr &) const
{
}
void calendarIncidenceAdditionCanceled(const KCalCore::Incidence::Ptr &) const
void calendarIncidenceAdditionCanceled(const KCalendarCore::Incidence::Ptr &) const
{
}
bool insertedIncidences(KCalCore::Incidence::List *, const KDateTime &, const QString &)
bool insertedIncidences(KCalendarCore::Incidence::List *, const QDateTime &, const QString &)
{
return true;
}
bool modifiedIncidences(KCalCore::Incidence::List *, const KDateTime &, const QString &)
bool modifiedIncidences(KCalendarCore::Incidence::List *, const QDateTime &, const QString &)
{
return true;
}
bool deletedIncidences(KCalCore::Incidence::List *, const KDateTime &, const QString &)
bool deletedIncidences(KCalendarCore::Incidence::List *, const QDateTime &, const QString &)
{
return true;
}
bool allIncidences(KCalCore::Incidence::List *, const QString &)
bool allIncidences(KCalendarCore::Incidence::List *, const QString &)
{
return true;
}
bool duplicateIncidences(KCalCore::Incidence::List *, const KCalCore::Incidence::Ptr &, const QString &)
bool duplicateIncidences(KCalendarCore::Incidence::List *, const KCalendarCore::Incidence::Ptr &, const QString &)
{
return true;
}
Expand All @@ -239,9 +240,9 @@ class MKCAL_EXPORT DummyStorage : public mKCal::ExtendedStorage
{
return true;
}
KDateTime incidenceDeletedDate(const KCalCore::Incidence::Ptr &incidence)
QDateTime incidenceDeletedDate(const KCalendarCore::Incidence::Ptr &)
{
return KDateTime();
return QDateTime();
}
int eventCount()
{
Expand Down

0 comments on commit 53ff43c

Please sign in to comment.