* 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

1 files changed, 3 insertions, 3 deletions

diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index 9af95537..fbc38efb 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -25,8 +25,8 @@
 #define KOJOURNALVIEW_H
 
 #include <korganizer/baseview.h>
-#include "journalentry.h"
 
+class JournalDateEntry;
 class JournalEntry;
 class TQScrollView;
 class TQVBox;
@@ -48,7 +48,7 @@ class KOJournalView : public KOrg::BaseView
 
     virtual int currentDateCount();
     virtual Incidence::List selectedIncidences();
-    DateList selectedDates() { return DateList(); }
+    DateList selectedIncidenceDates() { return DateList(); }
     void appendJournal( Journal*journal, const TQDate &dt);
 
     CalPrinterBase::PrintType printType();
@@ -60,7 +60,7 @@ class KOJournalView : public KOrg::BaseView
     void flushView();
 
     void showDates( const TQDate &start, const TQDate &end );
-    void showIncidences( const Incidence::List &incidenceList );
+    void showIncidences( const Incidence::List &incidenceList, const TQDate &date );
 
     void changeIncidenceDisplay( Incidence *, int );
     void setIncidenceChanger( IncidenceChangerBase *changer );