* 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, 45 insertions, 1 deletions

diff --git a/libkcal/resourcecalendar.cpp b/libkcal/resourcecalendar.cpp
index c008f0308..9f611e75e 100644
--- a/libkcal/resourcecalendar.cpp
+++ b/libkcal/resourcecalendar.cpp
@@ -33,18 +33,38 @@
 using namespace KCal;
 
 ResourceCalendar::ResourceCalendar( const KConfig *config )
-    : KRES::Resource( config ),mResolveConflict( false )
+  : KRES::Resource( config ), mResolveConflict( false )
 {
+  mException = 0;
 }
 
 ResourceCalendar::~ResourceCalendar()
 {
+  delete mException;
+}
+
+void ResourceCalendar::clearException()
+{
+  delete mException;
+  mException = 0;
+}
+
+void ResourceCalendar::setException( ErrorFormat *exception )
+{
+  delete mException;
+  mException = exception;
+}
+
+ErrorFormat *ResourceCalendar::exception()
+{
+  return mException;
 }
 
 void ResourceCalendar::setResolveConflict( bool b)
 {
  mResolveConflict = b;
 }
+
 TQString ResourceCalendar::infoText() const
 {
   TQString txt;
@@ -84,6 +104,12 @@ bool ResourceCalendar::addIncidence( Incidence *incidence )
   return incidence->accept( v );
 }
 
+bool ResourceCalendar::addIncidence( Incidence *incidence, const TQString &subresource )
+{
+  Incidence::AddSubResourceVisitor<ResourceCalendar> v( this, subresource );
+  return incidence->accept( v );
+}
+
 bool ResourceCalendar::deleteIncidence( Incidence *incidence )
 {
   Incidence::DeleteVisitor<ResourceCalendar> v( this );
@@ -192,6 +218,8 @@ void ResourceCalendar::saveError( const TQString &err )
 
 bool ResourceCalendar::setValue( const TQString &key, const TQString &value )
 {
+  Q_UNUSED( key );
+  Q_UNUSED( value );
   return false;
 }
 
@@ -201,5 +229,21 @@ TQString ResourceCalendar::subresourceType( const TQString &resource )
   return TQString();
 }
 
+bool ResourceCalendar::subresourceWritable( const TQString &resource ) const
+{
+  if ( resource.isEmpty() ) {
+    return !readOnly();
+  } else {
+    return false;
+  }
+}
+
+void ResourceCalendar::beginAddingIncidences()
+{
+}
+
+void ResourceCalendar::endAddingIncidences()
+{
+}
 
 #include "resourcecalendar.moc"