summaryrefslogtreecommitdiff
authoralwin <alwin>2005-03-17 20:59:02 (UTC)
committer alwin <alwin>2005-03-17 20:59:02 (UTC)
commit59232fab8ee82af81884f7842e6e5380ccc8c427 (patch) (side-by-side diff)
treeb476021def6bf6491154d8c97ece5a54412274dc
parent120694217c012e3c1c394db0598da41f2705e965 (diff)
downloadopie-59232fab8ee82af81884f7842e6e5380ccc8c427.zip
opie-59232fab8ee82af81884f7842e6e5380ccc8c427.tar.gz
opie-59232fab8ee82af81884f7842e6e5380ccc8c427.tar.bz2
corrected an error in date-counting
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/datebook/holiday/christian/chrisholiday.cpp4
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
@@ -84,61 +84,61 @@ void ChrisHoliday::calc_easter()
_days[d.addDays(49)].append(QObject::tr("Whitsunday","holidays"));
_days[d.addDays(50)].append(QObject::tr("Whitmonday","holidays"));
_days[d.addDays(39)].append(QObject::tr("Ascension Day","holidays"));
_days[d.addDays(-46)].append(QObject::tr("Ash Wednesday","holidays"));
_days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays"));
}
QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&start,const QDate&end)
{
QMap<QDate,QStringList> ret;
if (start==end) {
ret[start]=entries(start);
return ret;
}
QDate d;
int daysto;
if (end < start) {
d = end;
daysto = end.daysTo(start);
} else {
d = start;
daysto = start.daysTo(end);
}
QStringList temp;
- for (int i=0;i<daysto;++i) {
+ for (int i=0;i<=daysto;++i) {
temp = entries(d.addDays(i));
if (temp.count()==0) continue;
ret[d.addDays(i)]+=temp;
temp.clear();
}
return ret;
}
QValueList<EffectiveEvent> ChrisHoliday::events(const QDate&start,const QDate&end)
{
QValueList<EffectiveEvent> ret;
QDate d = (start<end?start:end);
int daysto = start.daysTo(end);
if (daysto < 0) {
daysto = end.daysTo(start);
}
QStringList temp;
- for (int i =0; i<daysto;++i) {
+ for (int i =0; i<= daysto;++i) {
temp = entries(d.addDays(i));
if (temp.count()==0) {
continue;
}
for (unsigned j=0;j<temp.count();++j) {
Event ev;
ev.setDescription(temp[j]);
ev.setStart(d.addDays(i));
ev.setAllDay(true);
ret.append(EffectiveEvent(ev,d.addDays(i)));
}
}
return ret;
}
EXPORT_HOLIDAY_PLUGIN(ChrisHoliday);