* 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, 5 deletions

diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h
index 60976698a..74fcf5d62 100644
--- a/libkcal/resourcecached.h
+++ b/libkcal/resourcecached.h
@@ -136,7 +136,9 @@ class KDE_EXPORT ResourceCached : public ResourceCalendar,
     /**
       Add event to calendar.
     */
-    bool addEvent(Event *anEvent);
+    KDE_DEPRECATED bool addEvent( Event *event );
+    bool addEvent( Event *event, const TQString &subresource );
+
     /**
       Deletes an event from this calendar.
     */
@@ -174,7 +176,9 @@ class KDE_EXPORT ResourceCached : public ResourceCalendar,
     /**
       Add a todo to the todolist.
     */
-    bool addTodo( Todo *todo );
+    KDE_DEPRECATED bool addTodo( Todo *todo );
+    bool addTodo( Todo *todo, const TQString &subresource );
+
     /**
       Remove a todo from the todolist.
     */
@@ -195,15 +199,17 @@ class KDE_EXPORT ResourceCached : public ResourceCalendar,
     /**
       Add a Journal entry to calendar
     */
-    virtual bool addJournal( Journal * );
+    KDE_DEPRECATED bool addJournal( Journal *journal );
+    bool addJournal( Journal *journal, const TQString &subresource );
+
     /**
       Remove a Journal from the calendar
     */
-    virtual bool deleteJournal( Journal * );
+    bool deleteJournal( Journal * );
     /**
       Return Journal with given unique id.
     */
-    virtual Journal *journal( const TQString &uid );
+    Journal *journal( const TQString &uid );
     /**
       Return list of all journals.
     */