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

diff --git a/korganizer/kogroupware.h b/korganizer/kogroupware.h
index 0af6a3c42..f6695de07 100644
--- a/korganizer/kogroupware.h
+++ b/korganizer/kogroupware.h
@@ -37,13 +37,16 @@
 #ifndef KOGROUPWARE_H
 #define KOGROUPWARE_H
 
+#include "koglobals.h"
+
 #include <libkcal/calendarresources.h>
 #include <libkcal/icalformat.h>
 #include <libkcal/scheduler.h>
-#include <tqstring.h>
 
 #include <kio/job.h>
 
+#include <tqstring.h>
+
 using namespace KCal;
 
 namespace KCal {
@@ -72,9 +75,10 @@ class KOGroupware : public QObject
          Returns false if the user cancels the dialog, and true if the
          user presses Yes og or No.
     */
-    bool sendICalMessage( TQWidget* parent, KCal::Scheduler::Method method,
-                          Incidence* incidence, bool isDeleting = false,
-                          bool statusChanged = false );
+    bool sendICalMessage( TQWidget *parent, KCal::Scheduler::Method method,
+                          Incidence* incidence,
+                          KOGlobals::HowChanged action,
+                          bool attendeeStatusChanged );
 
     /**
       Send counter proposal message.
@@ -83,12 +87,14 @@ class KOGroupware : public QObject
     */
     void sendCounterProposal( KCal::Calendar* calendar, KCal::Event* oldEvent, KCal::Event *newEvent ) const;
 
-    // THIS IS THE ACTUAL KM/KO API
-    enum EventState { Accepted, ConditionallyAccepted, Declined, Request };
-
     // convert the TNEF attachment to a vCard or iCalendar part
     TQString msTNEFToVPart( const TQByteArray& tnef );
 
+    // DoNotNotify is a flag indicating that the user does not want
+    // updates sent back to the organizer.
+    void setDoNotNotify( bool notify ) { mDoNotNotify = notify; }
+    bool doNotNotify() { return mDoNotNotify; }
+
   private slots:
     /** Handle iCals given by KMail. */
     void incomingDirChanged( const TQString& path );
@@ -106,6 +112,7 @@ class KOGroupware : public QObject
     CalendarView *mView;
     KCal::CalendarResources *mCalendar;
     static FreeBusyManager *mFreeBusyManager;
+    bool mDoNotNotify;
 };
 
 #endif