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 @@
 #include "chrisholiday.h"
 
 #include <qobject.h>
+#include <qpe/event.h>
 
 QString ChrisHoliday::description()
 {
@@ -87,9 +88,56 @@ void ChrisHoliday::calc_easter()
   _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays"));
 }
 
-QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&)
+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) {
+        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) {
+        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;
 }