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) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/holiday/christian/chrisholiday.cpp191
-rw-r--r--core/pim/datebook/holiday/christian/chrisholiday.h66
-rw-r--r--core/pim/datebook/holiday/christian/hlist.cpp36
-rw-r--r--core/pim/datebook/holiday/christian/hlist.h32
4 files changed, 163 insertions, 162 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
@@ -1,95 +1,96 @@
1#include "chrisholiday.h" 1#include "chrisholiday.h"
2 2
3#include <qobject.h> 3#include <qobject.h>
4 4
5QString ChrisHoliday::description() 5QString ChrisHoliday::description()
6{ 6{
7 return QObject::tr("Christian holidays","holidays"); 7 return QObject::tr("Christian holidays","holidays");
8} 8}
9 9
10QStringList ChrisHoliday::entries(const QDate&aDate) 10QStringList ChrisHoliday::entries(const QDate&aDate)
11{ 11{
12 QStringList ret; 12 QStringList ret;
13 ret+=_internallist.entries(aDate); 13 ret+=_internallist.entries(aDate);
14 calcit(aDate.year()); 14 calcit(aDate.year());
15 tDayMap::Iterator it = _days.find(aDate); 15 tDayMap::Iterator it = _days.find(aDate);
16 if (it!=_days.end()) { 16 if (it!=_days.end()) {
17 ret+=*it; 17 ret+=*it;
18 } 18 }
19 19
20 return ret; 20 return ret;
21} 21}
22 22
23QStringList ChrisHoliday::entries(unsigned year, unsigned month, unsigned day) 23QStringList ChrisHoliday::entries(unsigned year, unsigned month, unsigned day)
24{ 24{
25 return entries(QDate(year,month,day)); 25 return entries(QDate(year,month,day));
26} 26}
27 27
28void ChrisHoliday::calcit(int year) 28void ChrisHoliday::calcit(int year)
29{ 29{
30 if (year==_lastyear) return; 30 if (year==_lastyear) return;
31 _lastyear = year; 31 _lastyear = year;
32 _days.clear(); 32 _days.clear();
33 calc_easter(); 33 calc_easter();
34 calc_christmas(); 34 calc_christmas();
35} 35}
36 36
37void ChrisHoliday::calc_christmas() 37void ChrisHoliday::calc_christmas()
38{ 38{
39 QDate cday(_lastyear,12,24); 39 QDate cday(_lastyear,12,24);
40 int diff; 40 int diff;
41 if ( (diff=cday.dayOfWeek())!=7) { 41 if ( (diff=cday.dayOfWeek())!=7) {
42 cday=cday.addDays(-diff); 42 cday=cday.addDays(-diff);
43 _days[cday].append(QObject::tr("4. Advent","holidays")); 43 _days[cday].append(QObject::tr("4. Advent","holidays"));
44 } 44 }
45 _days[cday.addDays(-7)].append(QObject::tr("3. Advent","holidays")); 45 _days[cday.addDays(-7)].append(QObject::tr("3. Advent","holidays"));
46 _days[cday.addDays(-14)].append(QObject::tr("2. Advent","holidays")); 46 _days[cday.addDays(-14)].append(QObject::tr("2. Advent","holidays"));
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
50void ChrisHoliday::calc_easter() 50void 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(39)].append(QObject::tr("Ascension Day","holidays"));
86 _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays")); 86 _days[d.addDays(-46)].append(QObject::tr("Ash Wednesday","holidays"));
87} 87 _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays"));
88 88}
89QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&) 89
90{ 90QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&)
91 QMap<QDate,QStringList> ret; 91{
92 return ret; 92 QMap<QDate,QStringList> ret;
93} 93 return ret;
94 94}
95EXPORT_HOLIDAY_PLUGIN(ChrisHoliday); 95
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
@@ -1,33 +1,33 @@
1#ifndef __DUMMY_HOLIDAY_H 1#ifndef __DUMMY_HOLIDAY_H
2#define __DUMMY_HOLIDAY_H 2#define __DUMMY_HOLIDAY_H
3 3
4#include "hlist.h" 4#include "hlist.h"
5 5
6#include <opie2/oholidayplugin.h> 6#include <opie2/oholidayplugin.h>
7#include <opie2/oholidaypluginif.h> 7#include <opie2/oholidaypluginif.h>
8 8
9#include <qmap.h> 9#include <qmap.h>
10 10
11class ChrisHoliday:public Opie::Datebook::HolidayPlugin 11class ChrisHoliday:public Opie::Datebook::HolidayPlugin
12{ 12{
13typedef QMap<QDate,QStringList> tDayMap; 13typedef QMap<QDate,QStringList> tDayMap;
14 14
15public: 15public:
16 ChrisHoliday():Opie::Datebook::HolidayPlugin(){_lastyear=0;} 16 ChrisHoliday():Opie::Datebook::HolidayPlugin(){_lastyear=0;}
17 virtual ~ChrisHoliday(){} 17 virtual ~ChrisHoliday(){}
18 18
19 virtual QString description(); 19 virtual QString description();
20 virtual QStringList entries(const QDate&); 20 virtual QStringList entries(const QDate&);
21 virtual QStringList entries(unsigned year, unsigned month, unsigned day); 21 virtual QStringList entries(unsigned year, unsigned month, unsigned day);
22 virtual QMap<QDate,QStringList> entries(const QDate&,const QDate&); 22 virtual QMap<QDate,QStringList> entries(const QDate&,const QDate&);
23protected: 23protected:
24 HList _internallist; 24 HList _internallist;
25 unsigned int _lastyear; 25 unsigned int _lastyear;
26 tDayMap _days; 26 tDayMap _days;
27 27
28 void calcit(int year); 28 void calcit(int year);
29 void calc_easter(); 29 void calc_easter();
30 void calc_christmas(); 30 void calc_christmas();
31}; 31};
32 32
33#endif 33#endif
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
@@ -1,18 +1,18 @@
1#include "hlist.h" 1#include "hlist.h"
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
@@ -1,16 +1,16 @@
1#ifndef _HLIST_H 1#ifndef _HLIST_H
2#define _HLIST_H 2#define _HLIST_H
3 3
4#include <qstringlist.h> 4#include <qstringlist.h>
5#include <qdatetime.h> 5#include <qdatetime.h>
6 6
7class HList 7class HList
8{ 8{
9public: 9public:
10 HList(){}; 10 HList(){};
11 virtual ~HList(){}; 11 virtual ~HList(){};
12 12
13 const QStringList entries(const QDate&)const; 13 const QStringList entries(const QDate&)const;
14}; 14};
15 15
16#endif 16#endif