diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ set(QT_REQUIRED_VERSION "5.10.0") set(KMIME_LIB_VERSION "5.11.40") set(CALENDARUTILS_LIB_VERSION "5.11.40") -set(KCALENDARCORE_LIB_VERSION "5.11.42") +set(KCALENDARCORE_LIB_VERSION "5.11.44") set(IDENTITYMANAGEMENT_LIB_VERSION "5.11.40") set(AKONADICALENDAR_LIB_VERSION "5.11.40") set(PIMCOMMON_LIB_VERSION "5.11.40") diff --git a/src/freebusymodel/autotests/testfreebusyitemmodel.cpp b/src/freebusymodel/autotests/testfreebusyitemmodel.cpp --- a/src/freebusymodel/autotests/testfreebusyitemmodel.cpp +++ b/src/freebusymodel/autotests/testfreebusyitemmodel.cpp @@ -42,8 +42,7 @@ const QDateTime dt1(QDate(2010, 7, 24), QTime(7, 0, 0), Qt::UTC); const QDateTime dt2(QDate(2010, 7, 24), QTime(10, 0, 0), Qt::UTC); - KCalCore::Attendee::Ptr a1(new KCalCore::Attendee(QStringLiteral("fred"), QStringLiteral( - "fred@example.com"))); + KCalCore::Attendee a1(QStringLiteral("fred"), QStringLiteral( "fred@example.com")); KCalCore::FreeBusy::Ptr fb1(new KCalCore::FreeBusy()); fb1->addPeriod(dt1, KCalCore::Duration(60 * 60)); @@ -57,9 +56,9 @@ QVERIFY(model->containsAttendee(a1)); QModelIndex i = model->index(0, 0); - QCOMPARE(a1->fullName(), model->data(i, Qt::DisplayRole).toString()); + QCOMPARE(a1.fullName(), model->data(i, Qt::DisplayRole).toString()); QCOMPARE(a1, - model->data(i, FreeBusyItemModel::AttendeeRole).value()); + model->data(i, FreeBusyItemModel::AttendeeRole).value()); QCOMPARE(item1->freeBusy(), model->data(i, FreeBusyItemModel::FreeBusyRole).value()); @@ -97,12 +96,9 @@ const QDateTime dt3(QDate(2010, 7, 24), QTime(12, 0, 0), Qt::UTC); const QDateTime dt4(QDate(2010, 7, 24), QTime(14, 0, 0), Qt::UTC); - KCalCore::Attendee::Ptr a1(new KCalCore::Attendee(QStringLiteral("fred"), QStringLiteral( - "fred@example.com"))); - KCalCore::Attendee::Ptr a2(new KCalCore::Attendee(QStringLiteral("joe"), QStringLiteral( - "joe@example.com"))); - KCalCore::Attendee::Ptr a3(new KCalCore::Attendee(QStringLiteral("max"), QStringLiteral( - "max@example.com"))); + KCalCore::Attendee a1(QStringLiteral("fred"), QStringLiteral( "fred@example.com")); + KCalCore::Attendee a2(QStringLiteral("joe"), QStringLiteral( "joe@example.com")); + KCalCore::Attendee a3(QStringLiteral("max"), QStringLiteral( "max@example.com")); KCalCore::FreeBusy::Ptr fb1(new KCalCore::FreeBusy()); KCalCore::FreeBusy::Ptr fb2(new KCalCore::FreeBusy()); KCalCore::FreeBusy::Ptr fb3(new KCalCore::FreeBusy()); @@ -134,24 +130,24 @@ QVERIFY(model->containsAttendee(a3)); QModelIndex i1 = model->index(0, 0); - QCOMPARE(a1->fullName(), model->data(i1, Qt::DisplayRole).toString()); + QCOMPARE(a1.fullName(), model->data(i1, Qt::DisplayRole).toString()); QCOMPARE(a1, - model->data(i1, FreeBusyItemModel::AttendeeRole).value()); + model->data(i1, FreeBusyItemModel::AttendeeRole).value()); QCOMPARE(item1->freeBusy(), model->data(i1, FreeBusyItemModel::FreeBusyRole).value()); QModelIndex i2 = model->index(1, 0); - QCOMPARE(a2->fullName(), model->data(i2, Qt::DisplayRole).toString()); + QCOMPARE(a2.fullName(), model->data(i2, Qt::DisplayRole).toString()); QCOMPARE(a2, - model->data(i2, FreeBusyItemModel::AttendeeRole).value()); + model->data(i2, FreeBusyItemModel::AttendeeRole).value()); QVERIFY(model->rowCount(i2) == 0); QVERIFY(model->data(i2, FreeBusyItemModel::FreeBusyRole).isValid() == false); QModelIndex i3 = model->index(2, 0); - QCOMPARE(a3->fullName(), + QCOMPARE(a3.fullName(), model->data(i3, Qt::DisplayRole).toString()); QCOMPARE(a3, - model->data(i3, FreeBusyItemModel::AttendeeRole).value()); + model->data(i3, FreeBusyItemModel::AttendeeRole).value()); QVERIFY(model->rowCount(i3) == 0); QVERIFY(model->data(i3, FreeBusyItemModel::FreeBusyRole).isValid() == false); @@ -220,8 +216,7 @@ const QDateTime dt1(QDate(2010, 7, 24), QTime(7, 0, 0), Qt::UTC); const QDateTime dt2(QDate(2010, 7, 24), QTime(10, 0, 0), Qt::UTC); - KCalCore::Attendee::Ptr a1(new KCalCore::Attendee(QStringLiteral("fred"), QStringLiteral( - "fred@example.com"))); + KCalCore::Attendee a1(QStringLiteral("fred"), QStringLiteral( "fred@example.com")); KCalCore::FreeBusy::Ptr fb1(new KCalCore::FreeBusy()); fb1->addPeriod(dt1, KCalCore::Duration(60 * 60)); fb1->addPeriod(dt2, KCalCore::Duration(60 * 60)); diff --git a/src/freebusymodel/freebusyitem.h b/src/freebusymodel/freebusyitem.h --- a/src/freebusymodel/freebusyitem.h +++ b/src/freebusymodel/freebusyitem.h @@ -39,12 +39,12 @@ /** * @param parentWidget is passed to Akonadi when fetching free/busy data. */ - FreeBusyItem(const KCalCore::Attendee::Ptr &attendee, QWidget *parentWidget); + FreeBusyItem(const KCalCore::Attendee &attendee, QWidget *parentWidget); ~FreeBusyItem() { } - KCalCore::Attendee::Ptr attendee() const; + KCalCore::Attendee attendee() const; void setFreeBusy(const KCalCore::FreeBusy::Ptr &fb); KCalCore::FreeBusy::Ptr freeBusy() const; @@ -57,11 +57,11 @@ Q_REQUIRED_RESULT bool isDownloading() const; Q_SIGNALS: - void attendeeChanged(const KCalCore::Attendee::Ptr &attendee); + void attendeeChanged(const KCalCore::Attendee &attendee); void freebusyChanged(const KCalCore::FreeBusy::Ptr fb); private: - KCalCore::Attendee::Ptr mAttendee; + KCalCore::Attendee mAttendee; KCalCore::FreeBusy::Ptr mFreeBusy; // This is used for the update timer diff --git a/src/freebusymodel/freebusyitem.cpp b/src/freebusymodel/freebusyitem.cpp --- a/src/freebusymodel/freebusyitem.cpp +++ b/src/freebusymodel/freebusyitem.cpp @@ -26,17 +26,17 @@ using namespace CalendarSupport; -FreeBusyItem::FreeBusyItem(const KCalCore::Attendee::Ptr &attendee, QWidget *parentWidget) +FreeBusyItem::FreeBusyItem(const KCalCore::Attendee &attendee, QWidget *parentWidget) : mAttendee(attendee) , mTimerID(0) , mIsDownloading(false) , mParentWidget(parentWidget) { - Q_ASSERT(attendee); + Q_ASSERT(!attendee.isNull()); setFreeBusy(KCalCore::FreeBusy::Ptr()); } -KCalCore::Attendee::Ptr FreeBusyItem::attendee() const +KCalCore::Attendee FreeBusyItem::attendee() const { return mAttendee; } @@ -54,7 +54,7 @@ QString FreeBusyItem::email() const { - return mAttendee->email(); + return mAttendee.email(); } void FreeBusyItem::setUpdateTimerID(int id) @@ -71,7 +71,7 @@ { mIsDownloading = true; Akonadi::FreeBusyManager *m = Akonadi::FreeBusyManager::self(); - if (!m->retrieveFreeBusy(attendee()->email(), forceDownload, mParentWidget)) { + if (!m->retrieveFreeBusy(attendee().email(), forceDownload, mParentWidget)) { mIsDownloading = false; } } diff --git a/src/freebusymodel/freebusyitemmodel.h b/src/freebusymodel/freebusyitemmodel.h --- a/src/freebusymodel/freebusyitemmodel.h +++ b/src/freebusymodel/freebusyitemmodel.h @@ -64,11 +64,11 @@ void addItem(const FreeBusyItem::Ptr &freebusy); void clear(); - void removeAttendee(const KCalCore::Attendee::Ptr &attendee); + void removeAttendee(const KCalCore::Attendee &attendee); void removeItem(const FreeBusyItem::Ptr &freebusy); void removeRow(int row); - Q_REQUIRED_RESULT bool containsAttendee(const KCalCore::Attendee::Ptr &attendee); + Q_REQUIRED_RESULT bool containsAttendee(const KCalCore::Attendee &attendee); /** * Queues a reload of free/busy data. diff --git a/src/freebusymodel/freebusyitemmodel.cpp b/src/freebusymodel/freebusyitemmodel.cpp --- a/src/freebusymodel/freebusyitemmodel.cpp +++ b/src/freebusymodel/freebusyitemmodel.cpp @@ -103,7 +103,7 @@ : QAbstractItemModel(parent) , d(new CalendarSupport::FreeBusyItemModelPrivate) { - qRegisterMetaType("KCalCore::Attendee::Ptr"); + qRegisterMetaType(); qRegisterMetaType("KCalCore::FreeBusy::Ptr"); qRegisterMetaType("KCalCore::Period"); @@ -138,7 +138,7 @@ switch (role) { case Qt::DisplayRole: - return d->mFreeBusyItems.at(row)->attendee()->fullName(); + return d->mFreeBusyItems.at(row)->attendee().fullName(); case FreeBusyItemModel::AttendeeRole: return QVariant::fromValue(d->mFreeBusyItems.at(row)->attendee()); case FreeBusyItemModel::FreeBusyRole: @@ -317,12 +317,12 @@ } } -void FreeBusyItemModel::removeAttendee(const KCalCore::Attendee::Ptr &attendee) +void FreeBusyItemModel::removeAttendee(const KCalCore::Attendee &attendee) { FreeBusyItem::Ptr anItem; for (int i = 0; i < d->mFreeBusyItems.count(); ++i) { anItem = d->mFreeBusyItems[i]; - if (*anItem->attendee() == *attendee) { + if (anItem->attendee() == attendee) { if (anItem->updateTimerID() != 0) { killTimer(anItem->updateTimerID()); } @@ -332,12 +332,12 @@ } } -bool FreeBusyItemModel::containsAttendee(const KCalCore::Attendee::Ptr &attendee) +bool FreeBusyItemModel::containsAttendee(const KCalCore::Attendee &attendee) { FreeBusyItem::Ptr anItem; for (int i = 0; i < d->mFreeBusyItems.count(); ++i) { anItem = d->mFreeBusyItems[i]; - if (*anItem->attendee() == *attendee) { + if (anItem->attendee() == attendee) { return true; } } diff --git a/src/printing/calprintdefaultplugins.cpp b/src/printing/calprintdefaultplugins.cpp --- a/src/printing/calprintdefaultplugins.cpp +++ b/src/printing/calprintdefaultplugins.cpp @@ -615,9 +615,9 @@ "'Name (Role): Status', e.g. 'Reinhold Kainhofer " " (Participant): Awaiting Response'", "%1 (%2): %3", - (*ait)->fullName(), - KCalUtils::Stringify::attendeeRole((*ait)->role()), - KCalUtils::Stringify::attendeeStatus((*ait)->status())); + (*ait).fullName(), + KCalUtils::Stringify::attendeeRole((*ait).role()), + KCalUtils::Stringify::attendeeStatus((*ait).status())); } drawBoxWithCaption(p, attendeesBox, attendeeCaption, attendeeString, /*sameLine=*/ false, /*expand=*/ false,