summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/datebook/holiday/christian/chrisholiday.cpp2
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
@@ -71,25 +71,25 @@ void ChrisHoliday::calc_easter()
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
92QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&start,const QDate&end) 92QMap<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) {