summaryrefslogtreecommitdiff
authoralwin <alwin>2005-03-17 01:28:40 (UTC)
committer alwin <alwin>2005-03-17 01:28:40 (UTC)
commit56bedc269df8d5838834895971c7688161eb930d (patch) (unidiff)
treec782505c895f3fcabe0a9a030f5e0703a57504db
parent2968c1e512240492bd71295320bd5153ee4a58be (diff)
downloadopie-56bedc269df8d5838834895971c7688161eb930d.zip
opie-56bedc269df8d5838834895971c7688161eb930d.tar.gz
opie-56bedc269df8d5838834895971c7688161eb930d.tar.bz2
inserted missing
corrected spelling
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/datebook/holiday/christian/chrisholiday.cpp1
-rw-r--r--core/pim/datebook/holiday/christian/chrisholiday.h0
-rw-r--r--core/pim/datebook/holiday/christian/hlist.cpp2
-rw-r--r--core/pim/datebook/holiday/christian/hlist.h0
4 files changed, 2 insertions, 1 deletions
diff --git a/core/pim/datebook/holiday/christian/chrisholiday.cpp b/core/pim/datebook/holiday/christian/chrisholiday.cpp
index be16bd0..ef6516e 100644
--- a/core/pim/datebook/holiday/christian/chrisholiday.cpp
+++ b/core/pim/datebook/holiday/christian/chrisholiday.cpp
@@ -73,23 +73,24 @@ void ChrisHoliday::calc_easter()
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(39)].append(QObject::tr("Ascension Day","holidays"));
85 _days[d.addDays(-46)].append(QObject::tr("Ash Wednesday","holidays")); 86 _days[d.addDays(-46)].append(QObject::tr("Ash Wednesday","holidays"));
86 _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays")); 87 _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays"));
87} 88}
88 89
89QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&) 90QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&)
90{ 91{
91 QMap<QDate,QStringList> ret; 92 QMap<QDate,QStringList> ret;
92 return ret; 93 return ret;
93} 94}
94 95
95EXPORT_HOLIDAY_PLUGIN(ChrisHoliday); 96EXPORT_HOLIDAY_PLUGIN(ChrisHoliday);
diff --git a/core/pim/datebook/holiday/christian/chrisholiday.h b/core/pim/datebook/holiday/christian/chrisholiday.h
index 8dcf4c6..9ae500e 100644
--- a/core/pim/datebook/holiday/christian/chrisholiday.h
+++ b/core/pim/datebook/holiday/christian/chrisholiday.h
diff --git a/core/pim/datebook/holiday/christian/hlist.cpp b/core/pim/datebook/holiday/christian/hlist.cpp
index 795b075..2ce13f5 100644
--- a/core/pim/datebook/holiday/christian/hlist.cpp
+++ b/core/pim/datebook/holiday/christian/hlist.cpp
@@ -2,17 +2,17 @@
2 2
3#include <qobject.h> 3#include <qobject.h>
4 4
5const QStringList HList::entries(const QDate&aDate)const 5const QStringList HList::entries(const QDate&aDate)const
6{ 6{
7 QStringList ret; 7 QStringList ret;
8 if (aDate.month()==12) { 8 if (aDate.month()==12) {
9 if (aDate.day()==24) { 9 if (aDate.day()==24) {
10 ret.append(QObject::tr("Christmas","holidays")); 10 ret.append(QObject::tr("Christmas","holidays"));
11 } 11 }
12 } else if (aDate.month()==1) { 12 } else if (aDate.month()==1) {
13 if (aDate.day()==1) { 13 if (aDate.day()==1) {
14 ret.append(QObject::tr("New year","holidays")); 14 ret.append(QObject::tr("New Year","holidays"));
15 } 15 }
16 } 16 }
17 return ret; 17 return ret;
18} 18}
diff --git a/core/pim/datebook/holiday/christian/hlist.h b/core/pim/datebook/holiday/christian/hlist.h
index 5904852..5a87c50 100644
--- a/core/pim/datebook/holiday/christian/hlist.h
+++ b/core/pim/datebook/holiday/christian/hlist.h