From bd14e56e30fc3288fea085742756d2ad5b6a8127 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 7 Jun 2007 16:33:09 +0000
Subject: [PATCH] Monotone-Parent: 11f90d05631a863d591c668b5d433e7735381723
 Monotone-Revision: 04987bf3460429ef8bd5a62e68e90a47404843df

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-07T16:33:09
Monotone-Branch: ca.inverse.sogo
---
 SOPE/NGCards/iCalFreeBusy.m       |  9 +++++----
 SOPE/NGCards/iCalTimeZonePeriod.m |  1 -
 SOPE/NGCards/iCalToDo.m           | 19 ++++++++++---------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/SOPE/NGCards/iCalFreeBusy.m b/SOPE/NGCards/iCalFreeBusy.m
index efae27e76..17fd8e41d 100644
--- a/SOPE/NGCards/iCalFreeBusy.m
+++ b/SOPE/NGCards/iCalFreeBusy.m
@@ -23,7 +23,6 @@
 #import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>
 
-#import "CardGroup+iCal.h"
 #import "iCalDateTime.h"
 #import "NSCalendarDate+NGCards.h"
 
@@ -46,14 +45,16 @@
 }
 
 /* accessors */
-- (void) setEndDate: (NSCalendarDate *)_date
+- (void) setEndDate: (NSCalendarDate *) newEndDate
 {
-  [self setDate: _date forDateTimeValue: @"dtend"];
+  [(iCalDateTime *) [self uniqueChildWithTag: @"dtend"]
+		    setDateTime: newEndDate];
 }
 
 - (NSCalendarDate *) endDate
 {
-  return [self dateForDateTimeValue: @"dtend"];
+  return [(iCalDateTime *) [self uniqueChildWithTag: @"dtend"]
+			   dateTime];
 }
 
 - (BOOL) hasEndDate
diff --git a/SOPE/NGCards/iCalTimeZonePeriod.m b/SOPE/NGCards/iCalTimeZonePeriod.m
index d157720b6..29bd9bb17 100644
--- a/SOPE/NGCards/iCalTimeZonePeriod.m
+++ b/SOPE/NGCards/iCalTimeZonePeriod.m
@@ -26,7 +26,6 @@
 
 #import "iCalDateTime.h"
 #import "iCalRecurrenceRule.h"
-#import "CardGroup+iCal.h"
 
 #import "iCalTimeZonePeriod.h"
 
diff --git a/SOPE/NGCards/iCalToDo.m b/SOPE/NGCards/iCalToDo.m
index e5e2c0a1f..0319f2d65 100644
--- a/SOPE/NGCards/iCalToDo.m
+++ b/SOPE/NGCards/iCalToDo.m
@@ -22,7 +22,6 @@
 #import <Foundation/NSString.h>
 
 #import "NSCalendarDate+NGCards.h"
-#import "CardGroup+iCal.h"
 
 #import "iCalDateTime.h"
 #import "iCalToDo.h"
@@ -57,27 +56,29 @@
   return [[self uniqueChildWithTag: @"percent-complete"] value: 0];
 }
 
-- (void) setDue: (NSCalendarDate *) _date
+- (void) setDue: (NSCalendarDate *) newDueDate
 {
-  [self setDate: _date
-        forDateTimeValue: @"due"];
+  [(iCalDateTime *) [self uniqueChildWithTag: @"due"]
+		    setDate: newDueDate];
 }
 
 - (NSCalendarDate *) due
 {
-  return [self dateForDateTimeValue: @"due"];
-//   return [[self uniqueChildWithTag: @"percent-complete"] asCalendarDate];
+  return [(iCalDateTime *) [self uniqueChildWithTag: @"due"]
+			   dateTime];
 }
 
-- (void) setCompleted: (NSCalendarDate *) _date
+- (void) setCompleted: (NSCalendarDate *) newCompletedDate
 {
+  [(iCalDateTime *) [self uniqueChildWithTag: @"completed"]
+		    setDate: newCompletedDate];
   [self setStatus: @"COMPLETED"];
-  [self setDate: _date forDateTimeValue: @"completed"];
 }
 
 - (NSCalendarDate *) completed
 {
-  return [self dateForDateTimeValue: @"completed"];
+  return [(iCalDateTime *) [self uniqueChildWithTag: @"completed"]
+			   dateTime];
 }
 
 /* ical typing */