author | alwin <alwin> | 2005-03-17 20:59:02 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-17 20:59:02 (UTC) |
commit | 59232fab8ee82af81884f7842e6e5380ccc8c427 (patch) (unidiff) | |
tree | b476021def6bf6491154d8c97ece5a54412274dc /core/pim/datebook/holiday/christian/chrisholiday.cpp | |
parent | 120694217c012e3c1c394db0598da41f2705e965 (diff) | |
download | opie-59232fab8ee82af81884f7842e6e5380ccc8c427.zip opie-59232fab8ee82af81884f7842e6e5380ccc8c427.tar.gz opie-59232fab8ee82af81884f7842e6e5380ccc8c427.tar.bz2 |
corrected an error in date-counting
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/pim/datebook/holiday/christian/chrisholiday.cpp b/core/pim/datebook/holiday/christian/chrisholiday.cpp index f8e310f..2cccb85 100644 --- a/core/pim/datebook/holiday/christian/chrisholiday.cpp +++ b/core/pim/datebook/holiday/christian/chrisholiday.cpp | |||
@@ -96,44 +96,44 @@ QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&start,const QDate&end) | |||
96 | return ret; | 96 | return ret; |
97 | } | 97 | } |
98 | QDate d; | 98 | QDate d; |
99 | int daysto; | 99 | int daysto; |
100 | if (end < start) { | 100 | if (end < start) { |
101 | d = end; | 101 | d = end; |
102 | daysto = end.daysTo(start); | 102 | daysto = end.daysTo(start); |
103 | } else { | 103 | } else { |
104 | d = start; | 104 | d = start; |
105 | daysto = start.daysTo(end); | 105 | daysto = start.daysTo(end); |
106 | } | 106 | } |
107 | QStringList temp; | 107 | QStringList temp; |
108 | for (int i=0;i<daysto;++i) { | 108 | for (int i=0;i<=daysto;++i) { |
109 | temp = entries(d.addDays(i)); | 109 | temp = entries(d.addDays(i)); |
110 | if (temp.count()==0) continue; | 110 | if (temp.count()==0) continue; |
111 | ret[d.addDays(i)]+=temp; | 111 | ret[d.addDays(i)]+=temp; |
112 | temp.clear(); | 112 | temp.clear(); |
113 | } | 113 | } |
114 | return ret; | 114 | return ret; |
115 | } | 115 | } |
116 | 116 | ||
117 | QValueList<EffectiveEvent> ChrisHoliday::events(const QDate&start,const QDate&end) | 117 | QValueList<EffectiveEvent> ChrisHoliday::events(const QDate&start,const QDate&end) |
118 | { | 118 | { |
119 | QValueList<EffectiveEvent> ret; | 119 | QValueList<EffectiveEvent> ret; |
120 | QDate d = (start<end?start:end); | 120 | QDate d = (start<end?start:end); |
121 | int daysto = start.daysTo(end); | 121 | int daysto = start.daysTo(end); |
122 | if (daysto < 0) { | 122 | if (daysto < 0) { |
123 | daysto = end.daysTo(start); | 123 | daysto = end.daysTo(start); |
124 | } | 124 | } |
125 | 125 | ||
126 | QStringList temp; | 126 | QStringList temp; |
127 | for (int i =0; i<daysto;++i) { | 127 | for (int i =0; i<= daysto;++i) { |
128 | temp = entries(d.addDays(i)); | 128 | temp = entries(d.addDays(i)); |
129 | if (temp.count()==0) { | 129 | if (temp.count()==0) { |
130 | continue; | 130 | continue; |
131 | } | 131 | } |
132 | for (unsigned j=0;j<temp.count();++j) { | 132 | for (unsigned j=0;j<temp.count();++j) { |
133 | Event ev; | 133 | Event ev; |
134 | ev.setDescription(temp[j]); | 134 | ev.setDescription(temp[j]); |
135 | ev.setStart(d.addDays(i)); | 135 | ev.setStart(d.addDays(i)); |
136 | ev.setAllDay(true); | 136 | ev.setAllDay(true); |
137 | ret.append(EffectiveEvent(ev,d.addDays(i))); | 137 | ret.append(EffectiveEvent(ev,d.addDays(i))); |
138 | } | 138 | } |
139 | } | 139 | } |