From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 1 Sep 2010 00:37:02 +0000
Subject: * 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
---
 kresources/caldav/resource.h | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'kresources/caldav/resource.h')

diff --git a/kresources/caldav/resource.h b/kresources/caldav/resource.h
index bb69807be..033a19ce4 100644
--- a/kresources/caldav/resource.h
+++ b/kresources/caldav/resource.h
@@ -86,11 +86,13 @@ protected:
     struct LoadingTask {
         TQString url;
         TQString tasksUrl;
+        TQString journalsUrl;
     };
 
     struct WritingTask {
         TQString url;
         TQString tasksUrl;
+        TQString journalsUrl;
 
         TQString added;
         TQString changed;
@@ -99,6 +101,10 @@ protected:
         TQString tasksAdded;
         TQString tasksChanged;
         TQString tasksDeleted;
+
+        TQString journalsAdded;
+        TQString journalsChanged;
+        TQString journalsDeleted;
     };
 
 
@@ -129,8 +135,9 @@ protected:
      * Initiates calendar loading process.
      * @param url URL to load calendar data from.
      * @param tasksUrl URL to load task data from.
+     * @param journalsUrl URL to load journal data from.
      */
-    void startLoading(const TQString& url, const TQString& tasksUrl);
+    void startLoading(const TQString& url, const TQString& tasksUrl, const TQString& journalsUrl);
 
     /**
      * Checks if the data is correct and can be parsed.
@@ -148,18 +155,26 @@ protected:
 
     /**
      * Parses the data and adds tasks to the calendar.
-     * Unlike @ref parseData, this function does NOT clear the cache.
      * @param data calendar data.
      * @return true on success, false on fail.
      */
     bool parseTasksData(const TQString& data);
 
+    /**
+     * Parses the data and adds journals to the calendar.
+     * @param data calendar data.
+     * @return true on success, false on fail.
+     */
+    bool parseJournalsData(const TQString& data);
+
     /**
      * Initiates calendar writing process.
-     * @param url URL to save calendar data to.
+     * @param url URL to save event data to.
+     * @param tasksUrl URL to save task data to.
+     * @param journalsUrl URL to save journal data to.
      * @return true if write was queued successfully, false if not
      */
-    bool startWriting(const TQString& url, const TQString& tasksUrl);
+    bool startWriting(const TQString& url, const TQString& tasksUrl, const TQString& journalsUrl);
 
     /**
      * Returns a list of incidences as a valid iCalendar string.
-- 
cgit v1.2.1