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

diff --git a/kresources/kolab/kcal/incidence.h b/kresources/kolab/kcal/incidence.h
index 32b112aa..582d34c3 100644
--- a/kresources/kolab/kcal/incidence.h
+++ b/kresources/kolab/kcal/incidence.h
@@ -41,6 +41,7 @@ class TQDomElement;
 namespace KCal {
   class Incidence;
   class Recurrence;
+  class Alarm;
   class Attachment;
   class ResourceKolab;
 }
@@ -115,9 +116,6 @@ public:
   void setInternalUID( const TQString& iuid );
   TQString internalUID() const;
 
-  virtual void setRevision( int );
-  virtual int revision() const;
-
   // Load the attributes of this class
   virtual bool loadAttribute( TQDomElement& );
 
@@ -136,6 +134,9 @@ protected:
   void saveAttendees( TQDomElement& element ) const;
   void saveAttachments( TQDomElement& element ) const;
 
+  void loadAlarms( const TQDomElement& element );
+  void saveAlarms( TQDomElement& element ) const;
+
   void loadRecurrence( const TQDomElement& element );
   void saveRecurrence( TQDomElement& element ) const;
   void saveCustomAttributes( TQDomElement& element ) const;
@@ -154,9 +155,9 @@ protected:
   bool mHasAlarm;
   Recurrence mRecurrence;
   TQValueList<Attendee> mAttendees;
+  TQValueList<KCal::Alarm*> mAlarms;
   TQValueList<KCal::Attachment*> mAttachments;
   TQString mInternalUID;
-  int mRevision;
 
   struct Custom {
     TQCString key;