author | alwin <alwin> | 2005-03-17 13:50:01 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-17 13:50:01 (UTC) |
commit | afee05f4b4c1e8dab8463e3423fcfc8f9d45aa8b (patch) (unidiff) | |
tree | a76984183d368187b6acc5cba014190e932832c5 /core/pim/datebook/holiday/christian/chrisholiday.cpp | |
parent | 8c3f9c35425a2f2dbbbee61e6aa3e9a312ccba0e (diff) | |
download | opie-afee05f4b4c1e8dab8463e3423fcfc8f9d45aa8b.zip opie-afee05f4b4c1e8dab8463e3423fcfc8f9d45aa8b.tar.gz opie-afee05f4b4c1e8dab8463e3423fcfc8f9d45aa8b.tar.bz2 |
inserted last missing stuff
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 | 50 |
1 files changed, 49 insertions, 1 deletions
diff --git a/core/pim/datebook/holiday/christian/chrisholiday.cpp b/core/pim/datebook/holiday/christian/chrisholiday.cpp index ef6516e..f8e310f 100644 --- a/core/pim/datebook/holiday/christian/chrisholiday.cpp +++ b/core/pim/datebook/holiday/christian/chrisholiday.cpp | |||
@@ -1,6 +1,7 @@ | |||
1 | #include "chrisholiday.h" | 1 | #include "chrisholiday.h" |
2 | 2 | ||
3 | #include <qobject.h> | 3 | #include <qobject.h> |
4 | #include <qpe/event.h> | ||
4 | 5 | ||
5 | QString ChrisHoliday::description() | 6 | QString ChrisHoliday::description() |
6 | { | 7 | { |
@@ -87,9 +88,56 @@ void ChrisHoliday::calc_easter() | |||
87 | _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays")); | 88 | _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays")); |
88 | } | 89 | } |
89 | 90 | ||
90 | QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&) | 91 | QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&start,const QDate&end) |
91 | { | 92 | { |
92 | QMap<QDate,QStringList> ret; | 93 | QMap<QDate,QStringList> ret; |
94 | if (start==end) { | ||
95 | ret[start]=entries(start); | ||
96 | return ret; | ||
97 | } | ||
98 | QDate d; | ||
99 | int daysto; | ||
100 | if (end < start) { | ||
101 | d = end; | ||
102 | daysto = end.daysTo(start); | ||
103 | } else { | ||
104 | d = start; | ||
105 | daysto = start.daysTo(end); | ||
106 | } | ||
107 | QStringList temp; | ||
108 | for (int i=0;i<daysto;++i) { | ||
109 | temp = entries(d.addDays(i)); | ||
110 | if (temp.count()==0) continue; | ||
111 | ret[d.addDays(i)]+=temp; | ||
112 | temp.clear(); | ||
113 | } | ||
114 | return ret; | ||
115 | } | ||
116 | |||
117 | QValueList<EffectiveEvent> ChrisHoliday::events(const QDate&start,const QDate&end) | ||
118 | { | ||
119 | QValueList<EffectiveEvent> ret; | ||
120 | QDate d = (start<end?start:end); | ||
121 | int daysto = start.daysTo(end); | ||
122 | if (daysto < 0) { | ||
123 | daysto = end.daysTo(start); | ||
124 | } | ||
125 | |||
126 | QStringList temp; | ||
127 | for (int i =0; i<daysto;++i) { | ||
128 | temp = entries(d.addDays(i)); | ||
129 | if (temp.count()==0) { | ||
130 | continue; | ||
131 | } | ||
132 | for (unsigned j=0;j<temp.count();++j) { | ||
133 | Event ev; | ||
134 | ev.setDescription(temp[j]); | ||
135 | ev.setStart(d.addDays(i)); | ||
136 | ev.setAllDay(true); | ||
137 | ret.append(EffectiveEvent(ev,d.addDays(i))); | ||
138 | } | ||
139 | } | ||
140 | |||
93 | return ret; | 141 | return ret; |
94 | } | 142 | } |
95 | 143 | ||