From d16a2a4e0617f21cba0e399dbe5ffa17d76886b9 Mon Sep 17 00:00:00 2001 From: alwin Date: Wed, 16 Mar 2005 16:09:14 +0000 Subject: corrected some stuff --- 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 @@ -85,3 +85,11 @@ void ChrisHoliday::calc_easter() _days[d.addDays(-46)].append(QObject::tr("Ash Wednesday","holidays")); _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays")); } + +QMap ChrisHoliday::entries(const QDate&,const QDate&) +{ + QMap ret; + return ret; +} + +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 @@ -19,6 +19,7 @@ public: virtual QString description(); virtual QStringList entries(const QDate&); virtual QStringList entries(unsigned year, unsigned month, unsigned day); + virtual QMap entries(const QDate&,const QDate&); protected: HList _internallist; unsigned int _lastyear; @@ -29,5 +30,4 @@ protected: void calc_christmas(); }; -EXPORT_HOLIDAY_PLUGIN(ChrisHoliday); #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 @@ -18,3 +18,11 @@ QStringList DummyHoliday::entries(unsigned year, unsigned month, unsigned day) if (day%2==0) ret.append(QObject::tr("You have a holiday!","dummyholiday")); return ret; } + +QMap DummyHoliday::entries(const QDate&,const QDate&) +{ + QMap ret; + return ret; +} + +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 @@ -13,7 +13,7 @@ public: virtual QString description(); virtual QStringList entries(const QDate&); virtual QStringList entries(unsigned year, unsigned month, unsigned day); + virtual QMap entries(const QDate&,const QDate&); }; -EXPORT_HOLIDAY_PLUGIN(DummyHoliday); #endif -- cgit v0.9.0.2