summaryrefslogtreecommitdiff
path: root/core/pim/datebook/holiday/christian
Unidiff
Diffstat (limited to 'core/pim/datebook/holiday/christian') (more/less context) (show whitespace changes)
-rw-r--r--core/pim/datebook/holiday/christian/chrisholiday.cpp8
-rw-r--r--core/pim/datebook/holiday/christian/chrisholiday.h2
2 files changed, 9 insertions, 1 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
@@ -76,12 +76,20 @@ void ChrisHoliday::calc_easter()
76 unsigned long e = (2*a+4*b-d+34)%7; 76 unsigned long e = (2*a+4*b-d+34)%7;
77 n = (d+e+114)/31; 77 n = (d+e+114)/31;
78 p = (d+e+114)%31; 78 p = (d+e+114)%31;
79 } 79 }
80 p++; 80 p++;
81 QDate d(_lastyear,n,p); 81 QDate d(_lastyear,n,p);
82 _days[d].append(QObject::tr("Eastersunday","holidays")); 82 _days[d].append(QObject::tr("Eastersunday","holidays"));
83 _days[d.addDays(49)].append(QObject::tr("Whitsunday","holidays")); 83 _days[d.addDays(49)].append(QObject::tr("Whitsunday","holidays"));
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
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
@@ -10,24 +10,24 @@
10 10
11class ChrisHoliday:public Opie::Datebook::HolidayPlugin 11class ChrisHoliday:public Opie::Datebook::HolidayPlugin
12{ 12{
13typedef QMap<QDate,QStringList> tDayMap; 13typedef QMap<QDate,QStringList> tDayMap;
14 14
15public: 15public:
16 ChrisHoliday():Opie::Datebook::HolidayPlugin(){_lastyear=0;} 16 ChrisHoliday():Opie::Datebook::HolidayPlugin(){_lastyear=0;}
17 virtual ~ChrisHoliday(){} 17 virtual ~ChrisHoliday(){}
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&);
22protected: 23protected:
23 HList _internallist; 24 HList _internallist;
24 unsigned int _lastyear; 25 unsigned int _lastyear;
25 tDayMap _days; 26 tDayMap _days;
26 27
27 void calcit(int year); 28 void calcit(int year);
28 void calc_easter(); 29 void calc_easter();
29 void calc_christmas(); 30 void calc_christmas();
30}; 31};
31 32
32EXPORT_HOLIDAY_PLUGIN(ChrisHoliday);
33#endif 33#endif