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

diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 477b758c6..89d45b085 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -66,6 +66,36 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ
     };
 
     /**
+      This class implements a visitor for adding an Incidence to a resource
+      plus subresource supporting addEvent(), addTodo() and addJournal() calls.
+    */
+    template<class T>
+    class AddSubResourceVisitor : public IncidenceBase::Visitor
+    {
+      public:
+        AddSubResourceVisitor( T *r, const TQString &subResource )
+          : mResource( r ), mSubResource( subResource ) {}
+
+      protected:
+        bool visit( Event *e )
+        {
+          return mResource->addEvent( e, mSubResource );
+        }
+        bool visit( Todo *t )
+        {
+          return mResource->addTodo( t, mSubResource );
+        }
+        bool visit( Journal *j )
+        {
+          return mResource->addJournal( j, mSubResource );
+        }
+
+      private:
+        T *mResource;
+        TQString mSubResource;
+    };
+
+    /**
       This class implements a visitor for deleting an Incidence from a resource
       supporting deleteEvent(), deleteTodo() and deleteJournal() calls.
     */