corrected an error in date-counting

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
@@ -1,144 +1,144 @@
 #include "chrisholiday.h"
 
 #include <qobject.h>
 #include <qpe/event.h>
 
 QString ChrisHoliday::description()
 {
     return QObject::tr("Christian holidays","holidays");
 }
 
 QStringList ChrisHoliday::entries(const QDate&aDate)
 {
     QStringList ret;
     ret+=_internallist.entries(aDate);
     calcit(aDate.year());
     tDayMap::Iterator it = _days.find(aDate);
     if (it!=_days.end()) {
         ret+=*it;
     }
 
     return ret;
 }
 
 QStringList ChrisHoliday::entries(unsigned year, unsigned month, unsigned day)
 {
     return entries(QDate(year,month,day));
 }
 
 void ChrisHoliday::calcit(int year)
 {
     if (year==_lastyear) return;
     _lastyear = year;
     _days.clear();
     calc_easter();
     calc_christmas();
 }
 
 void ChrisHoliday::calc_christmas()
 {
     QDate cday(_lastyear,12,24);
     int diff;
     if ( (diff=cday.dayOfWeek())!=7) {
         cday=cday.addDays(-diff);
         _days[cday].append(QObject::tr("4. Advent","holidays"));
     }
     _days[cday.addDays(-7)].append(QObject::tr("3. Advent","holidays"));
     _days[cday.addDays(-14)].append(QObject::tr("2. Advent","holidays"));
     _days[cday.addDays(-21)].append(QObject::tr("1. Advent","holidays"));
 }
 
 void ChrisHoliday::calc_easter()
 {
   unsigned long n = 0;
   unsigned long p = 0;
 
   if ( _lastyear > 1582 ) {
     unsigned long a = _lastyear%19;
     unsigned long b = _lastyear/100;
     unsigned long c = _lastyear%100;
     unsigned long d = b/4;
     unsigned long e = b%4;
     unsigned long f = (b+8)/25;
     unsigned long g = (b+f+1)/3;
     unsigned long h = (19*a+b-d-g+15)%30;
     unsigned long i = c/4;
     unsigned long j = c%4;
     unsigned long k = j%100;
     unsigned long l = (32+2*e+2*i-h-k)%7;
     unsigned long m = (a+11*h+22*l)/451;
     n = (h+l-7*m+114)/31;
     p = (h+l-7*m+114)%31;
   } else {
     unsigned long a = _lastyear%4;
     unsigned long b = _lastyear%7;
     unsigned long c = _lastyear%19;
     unsigned long d = (19*c+15)%30;
     unsigned long e = (2*a+4*b-d+34)%7;
     n = (d+e+114)/31;
     p = (d+e+114)%31;
   }
   p++;
   QDate d(_lastyear,n,p);
   _days[d].append(QObject::tr("Eastersunday","holidays"));
   _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);