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

diff --git a/libkcal/todo.h b/libkcal/todo.h
index 1a7b050d4..74e1b39df 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -66,21 +66,26 @@ class LIBKCAL_EXPORT Todo : public Incidence
     /**
       Returns due time as string formatted according to the users locale
       settings.
+      @deprecated use IncidenceFormatter::timeToString()
     */
-    TQString dtDueTimeStr() const;
+    KDE_DEPRECATED TQString dtDueTimeStr() const;
+
     /**
       Returns due date as string formatted according to the users locale
       settings.
 
       @param shortfmt If set to true, use short date format, if set to false use
                       long format.
+      @deprecated use IncidenceFormatter::dateToString()
     */
-    TQString dtDueDateStr( bool shortfmt = true ) const;
+    KDE_DEPRECATED TQString dtDueDateStr( bool shortfmt = true ) const;
+
     /**
       Returns due date and time as string formatted according to the users locale
       settings.
+      @deprecated use IncidenceFormatter::dateTimeToString()
     */
-    TQString dtDueStr() const;
+    KDE_DEPRECATED TQString dtDueStr() const;
 
     /**
       Returns true if the todo has a due date, otherwise return false.
@@ -218,7 +223,14 @@ class LIBKCAL_EXPORT Todo : public Incidence
 
   private:
     bool accept(Visitor &v) { return v.visit( this ); }
-    /** Returns true if the todo got a new date, else false will be returned. */
+
+    /**
+      * If the todo recurs, mDtRecurrence is set to the next occurrence
+      * that's after today, mPercentComplete is set to 0 and true is returned.
+      *
+      * If the todo doesn't recur or if there aren't anymore occurrences
+      * it just returns false.
+      */
     bool recurTodo();
 
     TQDateTime mDtDue;                    // due date of todo