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

diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h
index 223161b4b..11baa5ec0 100644
--- a/kresources/scalix/kcal/resourcescalix.h
+++ b/kresources/scalix/kcal/resourcescalix.h
@@ -70,6 +70,7 @@ public:
 
   // The libkcal functions. See the resource for descriptions
   bool addEvent( KCal::Event* anEvent );
+  bool addEvent( KCal::Event* anEvent, const TQString &subresource );
   bool deleteEvent( KCal::Event* );
   KCal::Event* event( const TQString &UniqueStr );
   KCal::Event::List rawEvents( EventSortField sortField = EventSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
@@ -82,12 +83,14 @@ public:
                                bool inclusive = false );
 
   bool addTodo( KCal::Todo* todo );
+  bool addTodo( KCal::Todo* todo, const TQString &subresource );
   bool deleteTodo( KCal::Todo* );
   KCal::Todo* todo( const TQString& uid );
   KCal::Todo::List rawTodos( TodoSortField sortField = TodoSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
   KCal::Todo::List rawTodosForDate( const TQDate& date );
 
   bool addJournal( KCal::Journal* );
+  bool addJournal( KCal::Journal* journal, const TQString &subresource );
   bool deleteJournal( KCal::Journal* );
   KCal::Journal* journal( const TQString& uid );
   KCal::Journal::List rawJournals( JournalSortField sortField = JournalSortUnsorted, SortDirection sortDirection = SortDirectionAscending );