summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/holiday/christian/chrisholiday.cpp8
-rw-r--r--core/pim/datebook/holiday/christian/chrisholiday.h2
-rw-r--r--core/pim/datebook/holiday/dummy/dummyholiday.cpp8
-rw-r--r--core/pim/datebook/holiday/dummy/dummyholiday.h2
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
@@ -85,3 +85,11 @@ void ChrisHoliday::calc_easter()
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
89QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&)
90{
91 QMap<QDate,QStringList> ret;
92 return ret;
93}
94
95EXPORT_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:
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&);
22protected: 23protected:
23 HList _internallist; 24 HList _internallist;
24 unsigned int _lastyear; 25 unsigned int _lastyear;
@@ -29,5 +30,4 @@ protected:
29 void calc_christmas(); 30 void calc_christmas();
30}; 31};
31 32
32EXPORT_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
@@ -18,3 +18,11 @@ QStringList DummyHoliday::entries(unsigned year, unsigned month, unsigned day)
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
22QMap<QDate,QStringList> DummyHoliday::entries(const QDate&,const QDate&)
23{
24 QMap<QDate,QStringList> ret;
25 return ret;
26}
27
28EXPORT_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:
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
18EXPORT_HOLIDAY_PLUGIN(DummyHoliday);
19#endif 19#endif