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

diff --git a/korganizer/incidencechanger.h b/korganizer/incidencechanger.h
index 1423b488..afa55064 100644
--- a/korganizer/incidencechanger.h
+++ b/korganizer/incidencechanger.h
@@ -26,33 +26,53 @@
 
 #include "korganizer/incidencechangerbase.h"
 
+namespace KCal {
+  class ResourceCalendar;
+}
+
 class IncidenceChanger : public KOrg::IncidenceChangerBase
 {
-Q_OBJECT
-public:
-  IncidenceChanger( Calendar*cal, TQObject *parent ) : IncidenceChangerBase( cal, parent ) {}
-  ~IncidenceChanger() {}
-
-  bool beginChange( Incidence * incidence );
-  bool sendGroupwareMessage( Incidence *incidence, KCal::Scheduler::Method method, bool deleting = false );
-  bool endChange( Incidence *incidence );
-
-  bool addIncidence( Incidence *incidence, TQWidget *parent = 0 );
-  bool changeIncidence( Incidence *oldinc, Incidence *newinc, int action = -1 );
-  bool deleteIncidence( Incidence *incidence );
-
-  bool cutIncidence( Incidence *incidence );
-  static bool incidencesEqual( Incidence *inc1, Incidence *inc2 );
-  static bool assignIncidence( Incidence *inc1, Incidence *inc2 );
-public slots:
-  void cancelAttendees( Incidence *incidence );
-
-protected:
-  bool myAttendeeStatusChanged( Incidence *oldInc, Incidence *newInc );
-
-private:
-  class ComparisonVisitor;
-  class AssignmentVisitor;
+  Q_OBJECT
+  public:
+    IncidenceChanger( Calendar *cal, TQObject *parent )
+      : IncidenceChangerBase( cal, parent ) {}
+    ~IncidenceChanger() {}
+
+    bool beginChange( Incidence *incidence,
+                      ResourceCalendar *res, const TQString &subRes );
+
+    bool sendGroupwareMessage( Incidence *incidence,
+                               KCal::Scheduler::Method method,
+                               KOGlobals::HowChanged action,
+                               TQWidget *parent );
+
+    bool endChange( Incidence *incidence,
+                    ResourceCalendar *res, const TQString &subRes );
+
+    bool addIncidence( Incidence *incidence,
+                       ResourceCalendar *res, const TQString &subRes,
+                       TQWidget *parent );
+
+    bool changeIncidence( Incidence *oldinc, Incidence *newinc,
+                          KOGlobals::WhatChanged, TQWidget *parent );
+
+    bool deleteIncidence( Incidence *incidence, TQWidget *parent );
+
+    bool cutIncidences( const Incidence::List &incidences, TQWidget *parent );
+    bool cutIncidence( Incidence *incidence, TQWidget *parent );
+
+    static bool incidencesEqual( Incidence *inc1, Incidence *inc2 );
+    static bool assignIncidence( Incidence *inc1, Incidence *inc2 );
+
+  public slots:
+    void cancelAttendees( Incidence *incidence );
+
+  protected:
+    bool myAttendeeStatusChanged( Incidence *oldInc, Incidence *newInc );
+
+  private:
+    class ComparisonVisitor;
+    class AssignmentVisitor;
 };
 
 #endif