-rw-r--r-- | core/pim/datebook/holiday/christian/chrisholiday.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/pim/datebook/holiday/christian/chrisholiday.cpp b/core/pim/datebook/holiday/christian/chrisholiday.cpp index 2a260bf..03931bc 100644 --- a/core/pim/datebook/holiday/christian/chrisholiday.cpp +++ b/core/pim/datebook/holiday/christian/chrisholiday.cpp | |||
@@ -59,49 +59,49 @@ void ChrisHoliday::calc_easter() | |||
59 | unsigned long c = _lastyear%100; | 59 | unsigned long c = _lastyear%100; |
60 | unsigned long d = b/4; | 60 | unsigned long d = b/4; |
61 | unsigned long e = b%4; | 61 | unsigned long e = b%4; |
62 | unsigned long f = (b+8)/25; | 62 | unsigned long f = (b+8)/25; |
63 | unsigned long g = (b+f+1)/3; | 63 | unsigned long g = (b+f+1)/3; |
64 | unsigned long h = (19*a+b-d-g+15)%30; | 64 | unsigned long h = (19*a+b-d-g+15)%30; |
65 | unsigned long i = c/4; | 65 | unsigned long i = c/4; |
66 | unsigned long j = c%4; | 66 | unsigned long j = c%4; |
67 | unsigned long k = j%100; | 67 | unsigned long k = j%100; |
68 | unsigned long l = (32+2*e+2*i-h-k)%7; | 68 | unsigned long l = (32+2*e+2*i-h-k)%7; |
69 | unsigned long m = (a+11*h+22*l)/451; | 69 | unsigned long m = (a+11*h+22*l)/451; |
70 | n = (h+l-7*m+114)/31; | 70 | n = (h+l-7*m+114)/31; |
71 | p = (h+l-7*m+114)%31; | 71 | p = (h+l-7*m+114)%31; |
72 | } else { | 72 | } else { |
73 | unsigned long a = _lastyear%4; | 73 | unsigned long a = _lastyear%4; |
74 | unsigned long b = _lastyear%7; | 74 | unsigned long b = _lastyear%7; |
75 | unsigned long c = _lastyear%19; | 75 | unsigned long c = _lastyear%19; |
76 | unsigned long d = (19*c+15)%30; | 76 | unsigned long d = (19*c+15)%30; |
77 | unsigned long e = (2*a+4*b-d+34)%7; | 77 | unsigned long e = (2*a+4*b-d+34)%7; |
78 | n = (d+e+114)/31; | 78 | n = (d+e+114)/31; |
79 | p = (d+e+114)%31; | 79 | p = (d+e+114)%31; |
80 | } | 80 | } |
81 | p++; | 81 | p++; |
82 | QDate d(_lastyear,n,p); | 82 | QDate d(_lastyear,n,p); |
83 | _days[d].append(QObject::tr("Eastersunday","holidays")); | 83 | _days[d].append(QObject::tr("Easter Sunday","holidays")); |
84 | _days[d.addDays(-2)].append(QObject::tr("Good Friday","holidays")); | 84 | _days[d.addDays(-2)].append(QObject::tr("Good Friday","holidays")); |
85 | _days[d.addDays(49)].append(QObject::tr("Whitsunday","holidays")); | 85 | _days[d.addDays(49)].append(QObject::tr("Whitsunday","holidays")); |
86 | _days[d.addDays(50)].append(QObject::tr("Whitmonday","holidays")); | 86 | _days[d.addDays(50)].append(QObject::tr("Whitmonday","holidays")); |
87 | _days[d.addDays(39)].append(QObject::tr("Ascension Day","holidays")); | 87 | _days[d.addDays(39)].append(QObject::tr("Ascension Day","holidays")); |
88 | _days[d.addDays(-46)].append(QObject::tr("Ash Wednesday","holidays")); | 88 | _days[d.addDays(-46)].append(QObject::tr("Ash Wednesday","holidays")); |
89 | _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays")); | 89 | _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays")); |
90 | } | 90 | } |
91 | 91 | ||
92 | QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&start,const QDate&end) | 92 | QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&start,const QDate&end) |
93 | { | 93 | { |
94 | QMap<QDate,QStringList> ret; | 94 | QMap<QDate,QStringList> ret; |
95 | if (start==end) { | 95 | if (start==end) { |
96 | ret[start]=entries(start); | 96 | ret[start]=entries(start); |
97 | return ret; | 97 | return ret; |
98 | } | 98 | } |
99 | QDate d; | 99 | QDate d; |
100 | int daysto; | 100 | int daysto; |
101 | if (end < start) { | 101 | if (end < start) { |
102 | d = end; | 102 | d = end; |
103 | daysto = end.daysTo(start); | 103 | daysto = end.daysTo(start); |
104 | } else { | 104 | } else { |
105 | d = start; | 105 | d = start; |
106 | daysto = start.daysTo(end); | 106 | daysto = start.daysTo(end); |
107 | } | 107 | } |