diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ set(CALENDARUTILS_LIB_VERSION "5.11.40") set(AKONADI_LIB_VERSION "5.11.40") set(QT_REQUIRED_VERSION "5.10.0") -set(KCALENDARCORE_LIB_VERSION "5.11.42") +set(KCALENDARCORE_LIB_VERSION "5.11.44") set(AKONADICALENDAR_LIB_VERSION "5.11.40") set(KMIME_LIB_VERSION "5.11.40") set(LIBKDEPIM_LIB_VERSION "5.11.40") diff --git a/src/agenda/agendaitem.cpp b/src/agenda/agendaitem.cpp --- a/src/agenda/agendaitem.cpp +++ b/src/agenda/agendaitem.cpp @@ -144,16 +144,15 @@ mIconGroupTent = false; mIconOrganizer = true; } else { - KCalCore::Attendee::Ptr me - = mIncidence->attendeeByMails(mEventView->kcalPreferences()->allEmails()); + KCalCore::Attendee me = mIncidence->attendeeByMails(mEventView->kcalPreferences()->allEmails()); - if (me) { - if (me->status() == KCalCore::Attendee::NeedsAction && me->RSVP()) { + if (!me.isNull()) { + if (me.status() == KCalCore::Attendee::NeedsAction && me.RSVP()) { mIconReply = true; mIconGroup = false; mIconGroupTent = false; mIconOrganizer = false; - } else if (me->status() == KCalCore::Attendee::Tentative) { + } else if (me.status() == KCalCore::Attendee::Tentative) { mIconReply = false; mIconGroup = false; mIconGroupTent = true; @@ -643,7 +642,7 @@ QString name, email; KEmailAddress::extractEmailAddressAndName(newAttendee, email, name); if (!(name.isEmpty() && email.isEmpty())) { - mIncidence->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(name, email))); + mIncidence->addAttendee(KCalCore::Attendee(name, email)); KMessageBox::information( this, i18n("Attendee \"%1\" added to the calendar item \"%2\"", diff --git a/src/eventview.cpp b/src/eventview.cpp --- a/src/eventview.cpp +++ b/src/eventview.cpp @@ -634,7 +634,7 @@ KCalCore::Attendee::List attendees = ev->attendees(); KCalCore::Attendee::List::ConstIterator it; for (it = attendees.constBegin(); it != attendees.constEnd(); ++it) { - if (kcalPreferences()->thatIsMe((*it)->email())) { + if (kcalPreferences()->thatIsMe((*it).email())) { return true; } } diff --git a/src/todo/todomodel.cpp b/src/todo/todomodel.cpp --- a/src/todo/todomodel.cpp +++ b/src/todo/todomodel.cpp @@ -780,8 +780,7 @@ QString name, email, comment; if (KEmailAddress::splitAddress(*it, name, email, comment) == KEmailAddress::AddressOk) { - destTodo->addAttendee( - KCalCore::Attendee::Ptr(new KCalCore::Attendee(name, email))); + destTodo->addAttendee(KCalCore::Attendee(name, email)); } } } diff --git a/src/whatsnext/whatsnextview.cpp b/src/whatsnext/whatsnextview.cpp --- a/src/whatsnext/whatsnextview.cpp +++ b/src/whatsnext/whatsnextview.cpp @@ -192,9 +192,9 @@ events = calendar()->events(QDate::currentDate(), QDate(2975, 12, 6), QTimeZone::systemTimeZone()); for (const KCalCore::Event::Ptr &ev : qAsConst(events)) { - KCalCore::Attendee::Ptr me = ev->attendeeByMails(myEmails); - if (me != nullptr) { - if (me->status() == KCalCore::Attendee::NeedsAction && me->RSVP()) { + KCalCore::Attendee me = ev->attendeeByMails(myEmails); + if (!me.isNull()) { + if (me.status() == KCalCore::Attendee::NeedsAction && me.RSVP()) { if (replies == 0) { mText += QLatin1String("

"); kil->loadIcon(QStringLiteral("mail-reply-sender"), KIconLoader::NoGroup, 22, @@ -213,9 +213,9 @@ } todos = calendar()->todos(); for (const KCalCore::Todo::Ptr &to : qAsConst(todos)) { - KCalCore::Attendee::Ptr me = to->attendeeByMails(myEmails); - if (me != nullptr) { - if (me->status() == KCalCore::Attendee::NeedsAction && me->RSVP()) { + KCalCore::Attendee me = to->attendeeByMails(myEmails); + if (!me.isNull()) { + if (me.status() == KCalCore::Attendee::NeedsAction && me.RSVP()) { if (replies == 0) { mText += QLatin1String("

"); kil->loadIcon(QStringLiteral("mail-reply-sender"), KIconLoader::NoGroup, 22,