diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ set(KALARM_LIB_VERSION ${PIM_VERSION}) -set(CALENDARCORE_LIB_VERSION "5.11.40") +set(CALENDARCORE_LIB_VERSION "5.11.42") set(CALENDARUTILS_LIB_VERSION "5.11.40") set(IDENTITYMANAGER_LIB_VERSION "5.11.40") set(AKONADI_LIB_VERSION "5.11.40") diff --git a/autotests/kaeventtest.cpp b/autotests/kaeventtest.cpp --- a/autotests/kaeventtest.cpp +++ b/autotests/kaeventtest.cpp @@ -241,7 +241,7 @@ { // Email alarm const QString subject(QStringLiteral("Subject 1")); - const Person::Ptr addressee(new Person{QStringLiteral("Fred"), QStringLiteral("fred@freddy.com")}); + const Person addressee{QStringLiteral("Fred"), QStringLiteral("fred@freddy.com")}; const Person::List addressees{addressee}; const QStringList attachments{QStringLiteral("/tmp/xyz"), QStringLiteral("/home/fred/attch.p")}; Event::Ptr kcalevent(new Event); @@ -552,7 +552,7 @@ kcalalarm->setProgramArguments(QStringLiteral("-a PERM")); break; case Alarm::Email: { - Person::Ptr addr(new Person(QStringLiteral("Cliff Edge"), QStringLiteral("cliff@edge.com"))); + Person addr(QStringLiteral("Cliff Edge"), QStringLiteral("cliff@edge.com")); kcalalarm->setMailSubject(QStringLiteral("Subject")); kcalalarm->setMailText(QStringLiteral("message")); kcalalarm->setMailAddress(addr); diff --git a/src/kaevent.cpp b/src/kaevent.cpp --- a/src/kaevent.cpp +++ b/src/kaevent.cpp @@ -5770,7 +5770,7 @@ { clear(); for (int p = 0, end = addresses.count(); p < end; ++p) { - if (!addresses[p]->email().isEmpty()) { + if (!addresses[p].email().isEmpty()) { append(addresses[p]); } } @@ -5818,8 +5818,8 @@ } QString result; bool quote = false; - const Person::Ptr person = (*this)[index]; - const QString name = person->name(); + const Person &person = (*this)[index]; + const QString name = person.name(); if (!name.isEmpty()) { // Need to enclose the name in quotes if it has any special characters for (int i = 0, len = name.length(); i < len; ++i) { @@ -5830,12 +5830,12 @@ break; } } - result += (*this)[index]->name(); + result += (*this)[index].name(); result += (quote ? QLatin1String("\" <") : QLatin1String(" <")); quote = true; // need angle brackets round email address } - result += person->email(); + result += person.email(); if (quote) { result += QLatin1Char('>'); } @@ -5849,7 +5849,7 @@ { QStringList list; for (int p = 0, end = count(); p < end; ++p) { - list += at(p)->email(); + list += at(p).email(); } return list; } @@ -5867,7 +5867,7 @@ } else { result += separator; } - result += at(p)->email(); + result += at(p).email(); } return result; }