* 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, 11 insertions, 4 deletions

diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index e14c6bafd..dc0ceb7b7 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -42,13 +42,20 @@ class KDE_EXPORT KOEventViewerDialog : public KDialogBase
 {
     Q_OBJECT
   public:
-    KOEventViewerDialog( TQWidget *parent = 0, const char *name = 0,
-                         bool compact = false );
+    explicit KOEventViewerDialog( Calendar *calendar, TQWidget *parent = 0,
+                                  const char *name = 0, bool compact = false );
     virtual ~KOEventViewerDialog();
 
-    void setIncidence( Incidence *incidence ) { mEventViewer->setIncidence( incidence ); }
-    void appendIncidence( Incidence *incidence ) { mEventViewer->appendIncidence( incidence ); }
+    void setIncidence( Incidence *incidence, const TQDate &date  )
+    {
+      mEventViewer->setIncidence( incidence, date );
+    }
+    void appendIncidence( Incidence *incidence, const TQDate &date )
+    {
+      mEventViewer->appendIncidence( incidence, date );
+    }
 
+    void setCalendar( Calendar *calendar );
     void addText( const TQString &text );
 
   private: