* 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/kojournaleditor.h b/korganizer/kojournaleditor.h
index 75edb1829..291940cf0 100644
--- a/korganizer/kojournaleditor.h
+++ b/korganizer/kojournaleditor.h
@@ -69,12 +69,12 @@ class KOJournalEditor : public KOIncidenceEditor
     */
     void setTexts( const TQString &summary, const TQString &description = TQString::null );
     /** Edit an existing Journal. */
-    void editIncidence(Incidence *, Calendar *);
+    void editIncidence(Incidence *, const TQDate &date, Calendar *);
 
     /** Set widgets to default values */
     void setDate( const TQDate &date );
     /** Read event object and setup widgets accordingly */
-    void readJournal( Journal * );
+    void readJournal( Journal *, const TQDate &date );
     /** Write event settings to event object */
     void writeJournal( Journal * );
 
@@ -86,7 +86,7 @@ class KOJournalEditor : public KOIncidenceEditor
     bool processInput();
 
     /** This Journal has been modified externally */
-    void modified (int change=0);
+    void modified();
 
   protected slots:
     void loadDefaults();