* 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, 16 insertions, 11 deletions

diff --git a/libkcal/scheduler.h b/libkcal/scheduler.h
index 17e19ec47..bf22c9c81 100644
--- a/libkcal/scheduler.h
+++ b/libkcal/scheduler.h
@@ -49,14 +49,14 @@ class ScheduleMessage
     */
     enum Status { PublishNew, PublishUpdate, Obsolete, RequestNew,
                   RequestUpdate, Unknown };
-  
+
     /**
       Create a scheduling message with method as defined in Scheduler::Method
       and a status.
     */
     ScheduleMessage( IncidenceBase *, int method, Status status );
     ~ScheduleMessage() {};
-    
+
     /**
       Return event associated with this message.
     */
@@ -102,13 +102,13 @@ class LIBKCAL_EXPORT Scheduler
     */
     enum Method { Publish,Request,Refresh,Cancel,Add,Reply,Counter,
                   Declinecounter,NoMethod };
-  
+
     /**
       Create scheduler for calendar specified as argument.
     */
     Scheduler( Calendar *calendar );
     virtual ~Scheduler();
-    
+
     /**
       iTIP publish action
     */
@@ -121,8 +121,8 @@ class LIBKCAL_EXPORT Scheduler
     virtual bool performTransaction( IncidenceBase *incidence,
                                      Method method ) = 0;
     /**
-      Perform iTIP transaction on incidence to specified recipient(s). The 
-      method is specified as the method argumanet and can be any valid iTIP 
+      Perform iTIP transaction on incidence to specified recipient(s). The
+      method is specified as the method argumanet and can be any valid iTIP
       method.
     */
     virtual bool performTransaction( IncidenceBase *incidence, Method method,
@@ -136,10 +136,12 @@ class LIBKCAL_EXPORT Scheduler
       Accept transaction. The incidence argument specifies the iCal compoennt
       on which the transaction acts. The status is the result of processing a
       iTIP message with the current calendar and specifies the action to be
-      taken for this incidence.
+      taken for this incidence. The attendee is the email address of the person
+      on who's behalf this transaction is to be performed.
     */
     bool acceptTransaction( IncidenceBase *, Method method,
-                            ScheduleMessage::Status status );
+                            ScheduleMessage::Status status,
+                            const TQString& attendee = TQString::null );
 
     /**
       Return a machine-readable name for a iTIP method.
@@ -151,7 +153,7 @@ class LIBKCAL_EXPORT Scheduler
     static TQString translatedMethodName( Method );
 
     virtual bool deleteTransaction( IncidenceBase *incidence );
-    
+
     /**
       Returns the directory where the free-busy information is stored.
     */
@@ -169,9 +171,12 @@ class LIBKCAL_EXPORT Scheduler
   protected:
     bool acceptPublish( IncidenceBase *, ScheduleMessage::Status status,
                         Method method );
-    bool acceptRequest( IncidenceBase *, ScheduleMessage::Status status );
+    bool acceptRequest( IncidenceBase *, ScheduleMessage::Status status,
+                        const TQString & attendee );
     bool acceptAdd( IncidenceBase *, ScheduleMessage::Status status );
-    bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status );
+    KDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status );
+    bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status,
+                       const TQString & attendee );
     bool acceptDeclineCounter( IncidenceBase *,
                                ScheduleMessage::Status status );
     bool acceptReply( IncidenceBase *, ScheduleMessage::Status status,