| author | alwin <alwin> | 2005-03-16 16:09:14 (UTC) |
|---|---|---|
| committer | alwin <alwin> | 2005-03-16 16:09:14 (UTC) |
| commit | d16a2a4e0617f21cba0e399dbe5ffa17d76886b9 (patch) (side-by-side diff) | |
| tree | 10e32b2cd5ed35feaf0a3647d2c3bd5dfa6e938f /core | |
| parent | 829995787660e9786269c4cd4e2626825472e9cd (diff) | |
| download | opie-d16a2a4e0617f21cba0e399dbe5ffa17d76886b9.zip opie-d16a2a4e0617f21cba0e399dbe5ffa17d76886b9.tar.gz opie-d16a2a4e0617f21cba0e399dbe5ffa17d76886b9.tar.bz2 | |
corrected some stuff
4 files changed, 18 insertions, 2 deletions
diff --git a/core/pim/datebook/holiday/christian/chrisholiday.cpp b/core/pim/datebook/holiday/christian/chrisholiday.cpp index 6ef102a..3427b73 100644 --- a/core/pim/datebook/holiday/christian/chrisholiday.cpp +++ b/core/pim/datebook/holiday/christian/chrisholiday.cpp @@ -85,3 +85,11 @@ void ChrisHoliday::calc_easter() _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&,const QDate&)
+{
+ QMap<QDate,QStringList> ret;
+ return ret;
+}
+
+EXPORT_HOLIDAY_PLUGIN(ChrisHoliday);
\ No newline at end of file diff --git a/core/pim/datebook/holiday/christian/chrisholiday.h b/core/pim/datebook/holiday/christian/chrisholiday.h index 5f43e85..8dcf4c6 100644 --- a/core/pim/datebook/holiday/christian/chrisholiday.h +++ b/core/pim/datebook/holiday/christian/chrisholiday.h @@ -19,6 +19,7 @@ public: virtual QString description();
virtual QStringList entries(const QDate&);
virtual QStringList entries(unsigned year, unsigned month, unsigned day);
+ virtual QMap<QDate,QStringList> entries(const QDate&,const QDate&);
protected:
HList _internallist;
unsigned int _lastyear;
@@ -29,5 +30,4 @@ protected: void calc_christmas();
};
-EXPORT_HOLIDAY_PLUGIN(ChrisHoliday);
#endif
diff --git a/core/pim/datebook/holiday/dummy/dummyholiday.cpp b/core/pim/datebook/holiday/dummy/dummyholiday.cpp index dd00b9b..6429a8f 100644 --- a/core/pim/datebook/holiday/dummy/dummyholiday.cpp +++ b/core/pim/datebook/holiday/dummy/dummyholiday.cpp @@ -18,3 +18,11 @@ QStringList DummyHoliday::entries(unsigned year, unsigned month, unsigned day) if (day%2==0) ret.append(QObject::tr("You have a holiday!","dummyholiday"));
return ret;
}
+
+QMap<QDate,QStringList> DummyHoliday::entries(const QDate&,const QDate&)
+{
+ QMap<QDate,QStringList> ret;
+ return ret;
+}
+
+EXPORT_HOLIDAY_PLUGIN(DummyHoliday);
diff --git a/core/pim/datebook/holiday/dummy/dummyholiday.h b/core/pim/datebook/holiday/dummy/dummyholiday.h index 9b28f24..7d86b20 100644 --- a/core/pim/datebook/holiday/dummy/dummyholiday.h +++ b/core/pim/datebook/holiday/dummy/dummyholiday.h @@ -13,7 +13,7 @@ public: virtual QString description();
virtual QStringList entries(const QDate&);
virtual QStringList entries(unsigned year, unsigned month, unsigned day);
+ virtual QMap<QDate,QStringList> entries(const QDate&,const QDate&);
};
-EXPORT_HOLIDAY_PLUGIN(DummyHoliday);
#endif
|