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

diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp
index 1a4e8b19e..dacab7e9d 100644
--- a/libkcal/resourcecached.cpp
+++ b/libkcal/resourcecached.cpp
@@ -50,7 +50,7 @@ static bool m_editoropen = false;
 
 ResourceCached::ResourceCached( const KConfig* config )
   : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ),
-    mReloadPolicy( ReloadNever ),  mReloadInterval( 10 ), 
+    mReloadPolicy( ReloadNever ),  mReloadInterval( 10 ),
     mReloadTimer( 0, "mReloadTimer" ), mReloaded( false ),
     mSavePolicy( SaveNever ), mSaveInterval( 10 ),
     mSaveTimer( 0, "mSaveTimer" ), mIdMapper( "kcal/uidmaps/" )
@@ -161,6 +161,12 @@ bool ResourceCached::addEvent(Event *event)
   return mCalendar.addEvent( event );
 }
 
+bool ResourceCached::addEvent(Event *event, const TQString &subresource )
+{
+  Q_UNUSED( subresource ); // CalendarLocal does not support subresources
+  return mCalendar.addEvent( event );
+}
+
 // probably not really efficient, but...it works for now.
 bool ResourceCached::deleteEvent( Event *event )
 {
@@ -205,6 +211,12 @@ bool ResourceCached::addTodo( Todo *todo )
   return mCalendar.addTodo( todo );
 }
 
+bool ResourceCached::addTodo( Todo *todo, const TQString &subresource )
+{
+  Q_UNUSED( subresource ); // CalendarLocal does not support subresources
+  return mCalendar.addTodo( todo );
+}
+
 bool ResourceCached::deleteTodo( Todo *todo )
 {
   return mCalendar.deleteTodo( todo );
@@ -231,11 +243,14 @@ Todo::List ResourceCached::rawTodosForDate( const TQDate &date )
   return mCalendar.rawTodosForDate( date );
 }
 
-
 bool ResourceCached::addJournal( Journal *journal )
 {
-  kdDebug(5800) << "Adding Journal on " << journal->dtStart().toString() << endl;
+  return mCalendar.addJournal( journal );
+}
 
+bool ResourceCached::addJournal( Journal *journal, const TQString &subresource )
+{
+  Q_UNUSED( subresource ); // CalendarLocal does not support subresources
   return mCalendar.addJournal( journal );
 }