From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch * Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- korganizer/kotimelineview.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'korganizer/kotimelineview.h') diff --git a/korganizer/kotimelineview.h b/korganizer/kotimelineview.h index 5c3ec6a7..81e1eef4 100644 --- a/korganizer/kotimelineview.h +++ b/korganizer/kotimelineview.h @@ -50,10 +50,10 @@ class KOTimelineView : public KOEventView ~KOTimelineView(); virtual KCal::ListBase selectedIncidences(); - virtual KCal::DateList selectedDates(); + virtual KCal::DateList selectedIncidenceDates(); virtual int currentDateCount(); virtual void showDates(const TQDate&, const TQDate&); - virtual void showIncidences(const KCal::ListBase&); + virtual void showIncidences(const KCal::ListBase&, const TQDate &date); virtual void updateView(); virtual void changeIncidenceDisplay(KCal::Incidence* incidence, int mode); virtual int maxDatesHint() { return 0; } -- cgit v1.2.3