* 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, 6 insertions, 3 deletions

diff --git a/korganizer/kotodoeditor.h b/korganizer/kotodoeditor.h
index 3b6df5b38..5ab3e36dd 100644
--- a/korganizer/kotodoeditor.h
+++ b/korganizer/kotodoeditor.h
@@ -60,12 +60,12 @@ class KOTodoEditor : public KOIncidenceEditor
     */
     void setTexts( const TQString &summary, const TQString &description = TQString::null );
     /** Edit an existing todo. */
-    void editIncidence(Incidence *incidence, Calendar* calendar);
+    void editIncidence(Incidence *incidence, const TQDate &date, Calendar* calendar);
 
     /** Set widgets to default values */
     void setDates( const TQDateTime &due, bool allDay = true, Todo *relatedTodo = 0 );
     /** Read event object and setup widgets accordingly */
-    void readTodo(Todo *todo, Calendar *calendar);
+    void readTodo(Todo *todo, Calendar *calendar,  const TQDate &date);
     /** Write event settings to event object */
     void writeTodo(Todo *);
 
@@ -76,12 +76,14 @@ class KOTodoEditor : public KOIncidenceEditor
     bool processInput();
 
     /** This todo has been modified externally */
-    void modified (int change=0);
+    void modified();
 
   protected slots:
     void loadDefaults();
     void deleteTodo();
+
     void slotSaveTemplate( const TQString & );
+    void updateRecurrenceSummary();
 
   protected:
     void loadTemplate( /*const*/ CalendarLocal& );
@@ -98,6 +100,7 @@ class KOTodoEditor : public KOIncidenceEditor
     Todo *mRelatedTodo;
 
     KOEditorGeneralTodo *mGeneral;
+    KOEditorRecurrenceDialog *mRecurrenceDialog;
     KOEditorRecurrence *mRecurrence;
 };