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

diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index d2849e862..63e964eb9 100644
--- a/kresources/scalix/kcal/resourcescalix.cpp
+++ b/kresources/scalix/kcal/resourcescalix.cpp
@@ -510,6 +510,12 @@ bool ResourceScalix::addEvent( KCal::Event* event )
     return addIncidence( event, TQString::null, 0 );
 }
 
+bool ResourceScalix::addEvent( KCal::Event *event, const TQString &subresource )
+{
+  Q_UNUSED( subresource ); // ResourceScalix does not support subresources
+  return this->addEvent( event );
+}
+
 bool ResourceScalix::deleteIncidence( KCal::Incidence* incidence )
 {
   if ( incidence->isReadOnly() ) return false;
@@ -572,6 +578,12 @@ bool ResourceScalix::addTodo( KCal::Todo* todo )
     return addIncidence( todo, TQString::null, 0 );
 }
 
+bool ResourceScalix::addTodo( KCal::Todo *todo, const TQString &subresource )
+{
+  Q_UNUSED( subresource ); // ResourceScalix does not support subresources
+  return this->addTodo( todo );
+}
+
 bool ResourceScalix::deleteTodo( KCal::Todo* todo )
 {
   return deleteIncidence( todo );
@@ -600,6 +612,12 @@ bool ResourceScalix::addJournal( KCal::Journal* journal )
     return addIncidence( journal, TQString::null, 0 );
 }
 
+bool ResourceScalix::addJournal( KCal::Journal *journal, const TQString &subresource )
+{
+  Q_UNUSED( subresource ); // ResourceScalix does not support subresources
+  return this->addJournal( journal );
+}
+
 bool ResourceScalix::deleteJournal( KCal::Journal* journal )
 {
   return deleteIncidence( journal );