4 files changed, 18 insertions, 2 deletions
diff --git a/core/pim/datebook/holiday/christian/chrisholiday.cpp b/core/pim/datebook/holiday/christian/chrisholiday.cpp index 6ef102a..3427b73 100644 --- a/core/pim/datebook/holiday/christian/chrisholiday.cpp +++ b/core/pim/datebook/holiday/christian/chrisholiday.cpp | |||
@@ -84,4 +84,12 @@ void ChrisHoliday::calc_easter() | |||
84 | _days[d.addDays(50)].append(QObject::tr("Whitmonday","holidays")); | 84 | _days[d.addDays(50)].append(QObject::tr("Whitmonday","holidays")); |
85 | _days[d.addDays(-46)].append(QObject::tr("Ash Wednesday","holidays")); | 85 | _days[d.addDays(-46)].append(QObject::tr("Ash Wednesday","holidays")); |
86 | _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays")); | 86 | _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays")); |
87 | } | 87 | } |
88 | |||
89 | QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&) | ||
90 | { | ||
91 | QMap<QDate,QStringList> ret; | ||
92 | return ret; | ||
93 | } | ||
94 | |||
95 | EXPORT_HOLIDAY_PLUGIN(ChrisHoliday); \ No newline at end of file | ||
diff --git a/core/pim/datebook/holiday/christian/chrisholiday.h b/core/pim/datebook/holiday/christian/chrisholiday.h index 5f43e85..8dcf4c6 100644 --- a/core/pim/datebook/holiday/christian/chrisholiday.h +++ b/core/pim/datebook/holiday/christian/chrisholiday.h | |||
@@ -18,8 +18,9 @@ public: | |||
18 | 18 | ||
19 | virtual QString description(); | 19 | virtual QString description(); |
20 | virtual QStringList entries(const QDate&); | 20 | virtual QStringList entries(const QDate&); |
21 | virtual QStringList entries(unsigned year, unsigned month, unsigned day); | 21 | virtual QStringList entries(unsigned year, unsigned month, unsigned day); |
22 | virtual QMap<QDate,QStringList> entries(const QDate&,const QDate&); | ||
22 | protected: | 23 | protected: |
23 | HList _internallist; | 24 | HList _internallist; |
24 | unsigned int _lastyear; | 25 | unsigned int _lastyear; |
25 | tDayMap _days; | 26 | tDayMap _days; |
@@ -28,6 +29,5 @@ protected: | |||
28 | void calc_easter(); | 29 | void calc_easter(); |
29 | void calc_christmas(); | 30 | void calc_christmas(); |
30 | }; | 31 | }; |
31 | 32 | ||
32 | EXPORT_HOLIDAY_PLUGIN(ChrisHoliday); | ||
33 | #endif | 33 | #endif |
diff --git a/core/pim/datebook/holiday/dummy/dummyholiday.cpp b/core/pim/datebook/holiday/dummy/dummyholiday.cpp index dd00b9b..6429a8f 100644 --- a/core/pim/datebook/holiday/dummy/dummyholiday.cpp +++ b/core/pim/datebook/holiday/dummy/dummyholiday.cpp | |||
@@ -17,4 +17,12 @@ QStringList DummyHoliday::entries(unsigned year, unsigned month, unsigned day) | |||
17 | QStringList ret; | 17 | QStringList ret; |
18 | if (day%2==0) ret.append(QObject::tr("You have a holiday!","dummyholiday")); | 18 | if (day%2==0) ret.append(QObject::tr("You have a holiday!","dummyholiday")); |
19 | return ret; | 19 | return ret; |
20 | } | 20 | } |
21 | |||
22 | QMap<QDate,QStringList> DummyHoliday::entries(const QDate&,const QDate&) | ||
23 | { | ||
24 | QMap<QDate,QStringList> ret; | ||
25 | return ret; | ||
26 | } | ||
27 | |||
28 | EXPORT_HOLIDAY_PLUGIN(DummyHoliday); | ||
diff --git a/core/pim/datebook/holiday/dummy/dummyholiday.h b/core/pim/datebook/holiday/dummy/dummyholiday.h index 9b28f24..7d86b20 100644 --- a/core/pim/datebook/holiday/dummy/dummyholiday.h +++ b/core/pim/datebook/holiday/dummy/dummyholiday.h | |||
@@ -12,8 +12,8 @@ public: | |||
12 | 12 | ||
13 | virtual QString description(); | 13 | virtual QString description(); |
14 | virtual QStringList entries(const QDate&); | 14 | virtual QStringList entries(const QDate&); |
15 | virtual QStringList entries(unsigned year, unsigned month, unsigned day); | 15 | virtual QStringList entries(unsigned year, unsigned month, unsigned day); |
16 | virtual QMap<QDate,QStringList> entries(const QDate&,const QDate&); | ||
16 | }; | 17 | }; |
17 | 18 | ||
18 | EXPORT_HOLIDAY_PLUGIN(DummyHoliday); | ||
19 | #endif | 19 | #endif |