[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] /: KF5::Holidays port to changed API
From: John Layt <jlayt () kde ! org>
Date: 2015-09-02 18:08:14
Message-ID: E1ZXCSE-0003Pl-LD () scm ! kde ! org
[Download RAW message or body]
Git commit d33773cc3c355ebd6fd4c80e52974a67e50384a8 by John Layt.
Committed on 02/09/2015 at 17:24.
Pushed by jlayt into branch 'master'.
KF5::Holidays port to changed API
Port all kdepim apps to use the changed headers and api from the KF5
release of KHolidays.
M +3 -3 calendarsupport/utils.cpp
M +1 -1 kalarm/functions.cpp
M +1 -1 kalarm/prefdlg.cpp
M +1 -1 kalarm/preferences.cpp
M +2 -2 korganizer/actionmanager.cpp
M +1 -1 korganizer/calendarview.cpp
M +4 -4 korganizer/koglobals.cpp
M +2 -2 korganizer/kontactplugin/specialdates/sdsummarywidget.cpp
M +1 -1 korganizer/prefs/koprefsdialog.cpp
http://commits.kde.org/kdepim/d33773cc3c355ebd6fd4c80e52974a67e50384a8
diff --git a/calendarsupport/utils.cpp b/calendarsupport/utils.cpp
index b54dc82..9184087 100644
--- a/calendarsupport/utils.cpp
+++ b/calendarsupport/utils.cpp
@@ -35,7 +35,7 @@
#include <Akonadi/Calendar/PublishDialog>
#include <akonadi/calendar/calendarsettings.h>
-#include <KHolidays/kholidays/Holidays>
+#include <KHolidays/HolidayRegion>
#include <KIdentityManagement/IdentityManager>
@@ -679,7 +679,7 @@ QList<QDate> CalendarSupport::workDays(const QDate &startDate,
for (int i = 0; i < listCount; ++i) {
const Holiday &h = list.at(i);
if (h.dayType() == Holiday::NonWorkday) {
- result.removeAll(h.date());
+ result.removeAll(h.observedStartDate());
}
}
}
@@ -696,7 +696,7 @@ QStringList CalendarSupport::holiday(const QDate &date)
const int listCount = list.count();
hdays.reserve(listCount);
for (int i = 0; i < listCount; ++i) {
- hdays.append(list.at(i).text());
+ hdays.append(list.at(i).name());
}
return hdays;
}
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index b609fdd..55da926 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -51,7 +51,7 @@
using namespace KCalCore;
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KHolidays/kholidays/holidays.h>
+#include <KHolidays/HolidayRegion>
#include <kconfiggroup.h>
#include <KSharedConfig>
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index 3ee4ad3..fd78eba 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -55,7 +55,7 @@
#include <kalarmcal/identities.h>
-#include <KHolidays/kholidays/holidays.h>
+#include <KHolidays/HolidayRegion>
using namespace KHolidays;
#include <kvbox.h>
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp
index 926b08b..5f1056e 100644
--- a/kalarm/preferences.cpp
+++ b/kalarm/preferences.cpp
@@ -29,7 +29,7 @@
#include <KIdentityManagement/kidentitymanagement/identity.h>
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
-#include <KHolidays/kholidays/holidays.h>
+#include <KHolidays/HolidayRegion>
#include <kglobal.h>
#include <KSharedConfig>
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index caa212e..ee03d72 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -44,7 +44,7 @@
#include "reminderclient.h"
#include "kocheckableproxymodel.h"
-#include <KHolidays/kholidays/Holidays>
+#include <KHolidays/HolidayRegion>
#include <calendarsupport/collectionselection.h>
#include <calendarsupport/eventarchiver.h>
@@ -1076,7 +1076,7 @@ void ActionManager::exportHTML(KOrg::HTMLExportSettings \
*settings, bool autoMode
KHolidays::Holiday::List holidays = KOGlobals::self()->holidays()->holidays(
settings->dateStart().date(), \
settings->dateEnd().date()); foreach (const KHolidays::Holiday &holiday, holidays) {
- exportJob->addHoliday(holiday.date(), holiday.text());
+ exportJob->addHoliday(holiday.observedStartDate(), holiday.name());
}
}
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index adeeed9..5e39e90 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -53,7 +53,7 @@
#include "korganizer_debug.h"
#include <incidenceeditor-ng/globalsettings.h>
-#include <KHolidays/kholidays/Holidays>
+#include <KHolidays/HolidayRegion>
#include <calendarsupport/collectiongeneralpage.h>
#include <calendarsupport/collectionselection.h>
#include <calendarsupport/kcalprefs.h>
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index ae97f02..96a261f 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -25,7 +25,7 @@
#include "koglobals.h"
#include "prefs/koprefs.h"
-#include <KHolidays/kholidays/HolidayRegion>
+#include <KHolidays/HolidayRegion>
#include <KIconLoader>
@@ -87,7 +87,7 @@ QMap<QDate, QStringList> KOGlobals::holiday(const QDate &start, \
const QDate &end
const KHolidays::Holiday::List list = mHolidays->holidays(start, end);
for (int i = 0; i < list.count(); ++i) {
const KHolidays::Holiday &h = list.at(i);
- holidaysByDate[h.date()].append(h.text());
+ holidaysByDate[h.observedStartDate()].append(h.name());
}
return holidaysByDate;
}
@@ -111,9 +111,9 @@ QList<QDate> KOGlobals::workDays(const QDate &startDate,
const KHolidays::Holiday::List list = mHolidays->holidays(startDate, \
endDate); for (int i = 0; i < list.count(); ++i) {
const KHolidays::Holiday &h = list.at(i);
- const QString dateString = h.date().toString();
+ const QString dateString = h.observedStartDate().toString();
if (h.dayType() == KHolidays::Holiday::NonWorkday) {
- result.removeAll(h.date());
+ result.removeAll(h.observedStartDate());
}
}
}
diff --git a/korganizer/kontactplugin/specialdates/sdsummarywidget.cpp \
b/korganizer/kontactplugin/specialdates/sdsummarywidget.cpp index 1444aa2..d9e7c75 \
100644
--- a/korganizer/kontactplugin/specialdates/sdsummarywidget.cpp
+++ b/korganizer/kontactplugin/specialdates/sdsummarywidget.cpp
@@ -46,7 +46,7 @@
#include <KIconLoader>
#include <KConfigGroup>
#include <QDesktopServices>
-#include <KHolidays/kholidays/Holidays>
+#include <KHolidays/HolidayRegion>
#include <QDate>
#include <QEvent>
@@ -394,7 +394,7 @@ void SDSummaryWidget::createLabels()
entry.category = ((*it).dayType() == Holiday::NonWorkday) ?
CategoryHoliday : CategoryOther;
entry.date = dt;
- entry.summary = (*it).text();
+ entry.summary = (*it).name();
dateDiff(dt, entry.daysTo, entry.yearsOld);
entry.yearsOld = -1; //ignore age of holidays
entry.span = 1;
diff --git a/korganizer/prefs/koprefsdialog.cpp b/korganizer/prefs/koprefsdialog.cpp
index b0f2871..f620dd8 100644
--- a/korganizer/prefs/koprefsdialog.cpp
+++ b/korganizer/prefs/koprefsdialog.cpp
@@ -49,7 +49,7 @@
#include <KCalCore/Event>
#include <KCalCore/Journal>
-#include <KHolidays/Holidays>
+#include <KHolidays/HolidayRegion>
#include <MailTransport/TransportManagementWidget>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic