Commit c732d668 authored by Volker Krause's avatar Volker Krause

Adapt to KCalUtils changes

parent 1695706b
......@@ -53,7 +53,7 @@ set(KCALENDARCORE_LIB_VERSION "5.6.40")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.6.40")
set(KLDAP_LIB_VERSION "5.6.40")
set(KMAILTRANSPORT_LIB_VERSION "5.6.40")
set(CALENDARUTILS_LIB_VERSION "5.6.40")
set(CALENDARUTILS_LIB_VERSION "5.6.42")
set(KHOLIDAYS_LIB_VERSION "5.6.40")
set(AKONADICALENDAR_LIB_VERSION "5.6.40")
set(KONTACTINTERFACE_LIB_VERSION "5.6.40")
......
......@@ -56,7 +56,6 @@
#include <KMessageBox>
#include <KNotification>
#include <KSharedConfig>
#include <KSystemTimeZone>
#include <KToolInvocation>
#include <KWindowSystem>
#include <KIconLoader>
......@@ -343,9 +342,7 @@ void AlarmDialog::addIncidence(const Akonadi::Item &incidenceitem,
QString tip =
IncidenceFormatter::toolTipStr(
CalendarSupport::displayName(mCalendar.data(), incidenceitem.parentCollection()),
incidence,
item->mRemindAt.date(), true,
KDateTime::Spec::LocalZone());
incidence, item->mRemindAt.date(), true);
if (!item->mDisplayText.isEmpty()) {
tip += QLatin1String("<br>") + item->mDisplayText;
}
......@@ -664,9 +661,7 @@ void AlarmDialog::eventNotification()
subject = i18nc("@title", "Reminder: %1", alarm->mailSubject());
}
QString body =
IncidenceFormatter::mailBodyStr(
parent.staticCast<IncidenceBase>(), KSystemTimeZones::local());
QString body = IncidenceFormatter::mailBodyStr(parent.staticCast<IncidenceBase>());
if (!alarm->mailText().isEmpty()) {
body += QLatin1Char('\n') + alarm->mailText();
}
......
......@@ -48,7 +48,6 @@
#include <KLocalizedString>
#include <KProtocolManager>
#include <KSystemTimeZone>
using namespace KOrg;
......@@ -131,7 +130,7 @@ bool MailClient::mailAttendees(const KCalCore::IncidenceBase::Ptr &incidence,
}
const QString body =
KCalUtils::IncidenceFormatter::mailBodyStr(incidence, KSystemTimeZones::local());
KCalUtils::IncidenceFormatter::mailBodyStr(incidence);
return send(identity, from, to, cc, subject, body, false,
bccMe, attachment, mailTransport);
......@@ -155,7 +154,7 @@ bool MailClient::mailOrganizer(const KCalCore::IncidenceBase::Ptr &incidence,
subject = i18n("Free Busy Message");
}
const QString body = KCalUtils::IncidenceFormatter::mailBodyStr(incidence, KSystemTimeZones::local());
const QString body = KCalUtils::IncidenceFormatter::mailBodyStr(incidence);
return send(identity, from, to, QString(), subject, body, false,
bccMe, attachment, mailTransport);
......@@ -176,7 +175,7 @@ bool MailClient::mailTo(const KCalCore::IncidenceBase::Ptr &incidence,
subject = i18n("Free Busy Message");
}
const QString body =
KCalUtils::IncidenceFormatter::mailBodyStr(incidence, KSystemTimeZones::local());
KCalUtils::IncidenceFormatter::mailBodyStr(incidence);
return send(identity, from, recipients, QString(), subject, body, false,
bccMe, attachment, mailTransport);
......
......@@ -218,9 +218,9 @@ SummaryEventInfo::List SummaryEventInfo::eventsForRange(const QDate &start, cons
// Print the date span for multiday, floating events, for the
// first day of the event only.
if (ev->isMultiDay() && ev->allDay() && firstDayOfMultiday && span > 1) {
str = IncidenceFormatter::dateToString(ev->dtStart(), false, spec) +
str = IncidenceFormatter::dateToString(ev->dtStart(), false) +
QLatin1String(" -\n ") +
IncidenceFormatter::dateToString(ev->dtEnd(), false, spec);
IncidenceFormatter::dateToString(ev->dtEnd(), false);
}
summaryEvent->dateSpan = str;
......@@ -306,8 +306,7 @@ SummaryEventInfo::List SummaryEventInfo::eventsForRange(const QDate &start, cons
kdt = kdt.addSecs(-1);
KDateTime next = ev->recurrence()->getNextDateTime(kdt);
QString tmp = IncidenceFormatter::dateTimeToString(
ev->recurrence()->getNextDateTime(next), ev->allDay(),
true, spec);
ev->recurrence()->getNextDateTime(next), ev->allDay(), true);
if (!summaryEvent->timeRange.isEmpty()) {
summaryEvent->timeRange += QLatin1String("<br>");
}
......
......@@ -103,7 +103,7 @@ void KOrganizerPart::slotChangeInfo(const Akonadi::Item &item, const QDate &date
const KCalCore::Incidence::Ptr incidence = CalendarSupport::incidence(item);
if (incidence) {
Q_EMIT textChanged(incidence->summary() + QLatin1String(" / ") +
KCalUtils::IncidenceFormatter::timeToString(incidence->dtStart()));
KCalUtils::IncidenceFormatter::timeToString(incidence->dtStart().toLocalZone().time()));
} else {
Q_EMIT textChanged(QString());
}
......
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