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

diff --git a/libkcal/exceptions.h b/libkcal/exceptions.h
index 1ae90d516..8bdf7fa0f 100644
--- a/libkcal/exceptions.h
+++ b/libkcal/exceptions.h
@@ -47,9 +47,9 @@ class Exception
 
     /**
       Return descriptive message of exception.
-    */    
+    */
     virtual TQString message();
-    
+
   protected:
     TQString mMessage;
 
@@ -64,18 +64,28 @@ class Exception
 class ErrorFormat : public Exception
 {
   public:
-    enum ErrorCodeFormat { LoadError, SaveError,
-                           ParseErrorIcal, ParseErrorKcal,
-                           NoCalendar,
-                           CalVersion1,CalVersion2,
-                           CalVersionUnknown,
-                           Restriction };
-  
+    /**
+      The different types of Calendar format errors.
+    */
+    enum ErrorCodeFormat {
+      LoadError,         /**< Load error */
+      SaveError,         /**< Save error */
+      ParseErrorIcal,    /**< Parse error in libical */
+      ParseErrorKcal,    /**< Parse error in libkcal */
+      NoCalendar,        /**< No calendar component found */
+      CalVersion1,       /**< vCalendar v1.0 detected */
+      CalVersion2,       /**< iCalendar v2.0 detected */
+      CalVersionUnknown, /**< Unknown calendar format detected */
+      Restriction,       /**< Restriction violation */
+      NoWritableFound,   /**< No writable resource is available */
+      UserCancel         /**< User canceled the operation */
+    };
+
     /**
       Create format error exception.
     */
     ErrorFormat( ErrorCodeFormat code, const TQString &message = TQString::null );
-    
+
     /**
       Return format error message.
     */
@@ -84,7 +94,7 @@ class ErrorFormat : public Exception
       Return format error code.
     */
     ErrorCodeFormat errorCode();
-    
+
   private:
     ErrorCodeFormat mCode;