* 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/libkcal/event.h b/libkcal/event.h
index 39980556c..fed0e41a0 100644
--- a/libkcal/event.h
+++ b/libkcal/event.h
@@ -72,21 +72,24 @@ class LIBKCAL_EXPORT Event : public Incidence
     /**
       Return end time as string formatted according to the users locale
       settings.
+      @deprecated use IncidenceFormatter::timeToString()
     */
-    TQString dtEndTimeStr() const;
+    TQString KDE_DEPRECATED dtEndTimeStr() const;
     /**
       Return end date as string formatted according to the users locale
       settings.
 
       @param shortfmt if true return string in short format, if false return
                       long format
+      @deprecated use IncidenceFormatter::dateToString()
     */
-    TQString dtEndDateStr( bool shortfmt = true ) const;
+    TQString KDE_DEPRECATED dtEndDateStr( bool shortfmt = true ) const;
     /**
       Return end date and time as string formatted according to the users locale
       settings.
+      @deprecated use IncidenceFormatter::dateTimeToString()
     */
-    TQString dtEndStr() const;
+    TQString KDE_DEPRECATED dtEndStr() const;
 
     /**
       Set whether the event has an end date/time.