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

diff --git a/korganizer/timelineitem.h b/korganizer/timelineitem.h
index 2ff3b2e0..a3406f11 100644
--- a/korganizer/timelineitem.h
+++ b/korganizer/timelineitem.h
@@ -42,7 +42,7 @@ class TimelineSubItem;
 class TimelineItem : public KDGanttViewTaskItem
 {
   public:
-    TimelineItem( const TQString &label, KDGanttView* parent );
+    TimelineItem( const TQString &label, KCal::Calendar *calendar, KDGanttView* parent );
 
     void insertIncidence( KCal::Incidence *incidence,
                           const TQDateTime &start = TQDateTime(),
@@ -52,13 +52,14 @@ class TimelineItem : public KDGanttViewTaskItem
     void moveItems( KCal::Incidence* incidence, int delta, int duration );
 
   private:
+    KCal::Calendar *mCalendar;
     TQMap<KCal::Incidence*, TQValueList<TimelineSubItem*> > mItemMap;
 };
 
 class TimelineSubItem : public KDGanttViewTaskItem
 {
   public:
-    TimelineSubItem( KCal::Incidence *incidence, TimelineItem *parent );
+    TimelineSubItem( KCal::Calendar *calendar, KCal::Incidence *incidence, TimelineItem *parent );
     ~TimelineSubItem();
 
     KCal::Incidence* incidence() const { return mIncidence; }