author | alwin <alwin> | 2005-03-16 20:10:47 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-16 20:10:47 (UTC) |
commit | ea80ab0e1d30bd52d87b7330a934e63354716f2e (patch) (unidiff) | |
tree | e6e3e902454d54240f553993ccba7a84017aaa11 /core/pim/datebook/holiday/christian/chrisholiday.cpp | |
parent | 176c8e8bb543603b68e853660db93d6068c52bfa (diff) | |
download | opie-ea80ab0e1d30bd52d87b7330a934e63354716f2e.zip opie-ea80ab0e1d30bd52d87b7330a934e63354716f2e.tar.gz opie-ea80ab0e1d30bd52d87b7330a934e63354716f2e.tar.bz2 |
added birthday display into datebook
Diffstat (limited to 'core/pim/datebook/holiday/christian/chrisholiday.cpp') (more/less context) (ignore whitespace changes)
-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 3427b73..be16bd0 100644 --- a/core/pim/datebook/holiday/christian/chrisholiday.cpp +++ b/core/pim/datebook/holiday/christian/chrisholiday.cpp | |||
@@ -47,49 +47,49 @@ void ChrisHoliday::calc_christmas() | |||
47 | _days[cday.addDays(-21)].append(QObject::tr("1. Advent","holidays")); | 47 | _days[cday.addDays(-21)].append(QObject::tr("1. Advent","holidays")); |
48 | } | 48 | } |
49 | 49 | ||
50 | void ChrisHoliday::calc_easter() | 50 | void ChrisHoliday::calc_easter() |
51 | { | 51 | { |
52 | unsigned long n = 0; | 52 | unsigned long n = 0; |
53 | unsigned long p = 0; | 53 | unsigned long p = 0; |
54 | 54 | ||
55 | if ( _lastyear > 1582 ) { | 55 | if ( _lastyear > 1582 ) { |
56 | unsigned long a = _lastyear%19; | 56 | unsigned long a = _lastyear%19; |
57 | unsigned long b = _lastyear/100; | 57 | unsigned long b = _lastyear/100; |
58 | unsigned long c = _lastyear%100; | 58 | unsigned long c = _lastyear%100; |
59 | unsigned long d = b/4; | 59 | unsigned long d = b/4; |
60 | unsigned long e = b%4; | 60 | unsigned long e = b%4; |
61 | unsigned long f = (b+8)/25; | 61 | unsigned long f = (b+8)/25; |
62 | unsigned long g = (b+f+1)/3; | 62 | unsigned long g = (b+f+1)/3; |
63 | unsigned long h = (19*a+b-d-g+15)%30; | 63 | unsigned long h = (19*a+b-d-g+15)%30; |
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 | 88 | ||
89 | QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&) | 89 | QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&) |
90 | { | 90 | { |
91 | QMap<QDate,QStringList> ret; | 91 | QMap<QDate,QStringList> ret; |
92 | return ret; | 92 | return ret; |
93 | } | 93 | } |
94 | 94 | ||
95 | EXPORT_HOLIDAY_PLUGIN(ChrisHoliday); \ No newline at end of file | 95 | EXPORT_HOLIDAY_PLUGIN(ChrisHoliday); |