Diffstat (limited to 'core/pim/datebook/holiday/christian/chrisholiday.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/datebook/holiday/christian/chrisholiday.cpp | 8 |
1 files changed, 8 insertions, 0 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 | |||
@@ -64,24 +64,32 @@ void ChrisHoliday::calc_easter() | |||
64 | unsigned long i = c/4; | 64 | unsigned long i = c/4; |
65 | unsigned long j = c%4; | 65 | unsigned long j = c%4; |
66 | unsigned long k = j%100; | 66 | unsigned long k = j%100; |
67 | unsigned long l = (32+2*e+2*i-h-k)%7; | 67 | unsigned long l = (32+2*e+2*i-h-k)%7; |
68 | unsigned long m = (a+11*h+22*l)/451; | 68 | unsigned long m = (a+11*h+22*l)/451; |
69 | n = (h+l-7*m+114)/31; | 69 | n = (h+l-7*m+114)/31; |
70 | p = (h+l-7*m+114)%31; | 70 | p = (h+l-7*m+114)%31; |
71 | } else { | 71 | } else { |
72 | unsigned long a = _lastyear%4; | 72 | unsigned long a = _lastyear%4; |
73 | unsigned long b = _lastyear%7; | 73 | unsigned long b = _lastyear%7; |
74 | unsigned long c = _lastyear%19; | 74 | unsigned long c = _lastyear%19; |
75 | unsigned long d = (19*c+15)%30; | 75 | unsigned long d = (19*c+15)%30; |
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 | |||
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 | ||