author | alwin <alwin> | 2005-03-16 16:09:14 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-16 16:09:14 (UTC) |
commit | d16a2a4e0617f21cba0e399dbe5ffa17d76886b9 (patch) (unidiff) | |
tree | 10e32b2cd5ed35feaf0a3647d2c3bd5dfa6e938f /core/pim/datebook | |
parent | 829995787660e9786269c4cd4e2626825472e9cd (diff) | |
download | opie-d16a2a4e0617f21cba0e399dbe5ffa17d76886b9.zip opie-d16a2a4e0617f21cba0e399dbe5ffa17d76886b9.tar.gz opie-d16a2a4e0617f21cba0e399dbe5ffa17d76886b9.tar.bz2 |
corrected some stuff
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 | |||
@@ -86,2 +86,10 @@ void ChrisHoliday::calc_easter() | |||
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 | |||
@@ -20,4 +20,5 @@ public: | |||
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; |
@@ -30,4 +31,3 @@ protected: | |||
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 | |||
@@ -19,2 +19,10 @@ QStringList DummyHoliday::entries(unsigned year, unsigned month, unsigned day) | |||
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 | |||
@@ -14,6 +14,6 @@ public: | |||
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 |