From 95b62ff7504155ecf22f2c6bef62f487fd52768c Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 7 Jun 2007 16:26:10 +0000
Subject: [PATCH] Monotone-Parent: 06ef0619c58e045dce76e8be407e26af13e75aeb
 Monotone-Revision: b0985796e6d2dc85514a5c444e0715238d70da49

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-07T16:26:10
Monotone-Branch: ca.inverse.sogo
---
 SOPE/NGCards/ChangeLog          |  8 +++++++
 SOPE/NGCards/iCalEntityObject.h |  2 +-
 SOPE/NGCards/iCalEntityObject.m | 39 +++++++++++++++++++++------------
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index 4af484a68..5cde569da 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,5 +1,13 @@
 2007-06-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* iCalEntityObject.m ([iCalEntityObject -setCreated:newCreated]) 
+	([iCalEntityObject -created], [-setLastModified:_value]) 
+	([iCalEntityObject -lastModified]) 
+	([iCalEntityObject -setTimeStampAsDate:newTimeStamp]) 
+	([iCalEntityObject -timeStampAsDate], [-setStartDate:_value]) 
+	([iCalEntityObject -startDate]): no longer use the methods
+	provided by the removed module CardGroup+iCal.
+
 	* iCalDateTime.m ([iCalDateTime -setDate:dateTime]): take the date
 	passed as parameter as an all day date.
 	([iCalDateTime -isAllDay]): new method determining whether the
diff --git a/SOPE/NGCards/iCalEntityObject.h b/SOPE/NGCards/iCalEntityObject.h
index 662aff90c..e58dc1e57 100644
--- a/SOPE/NGCards/iCalEntityObject.h
+++ b/SOPE/NGCards/iCalEntityObject.h
@@ -75,7 +75,7 @@ typedef enum
 - (void) setTimeStampAsDate: (NSCalendarDate *)_date;
 - (NSCalendarDate *) timeStampAsDate;
 
-- (void) setStartDate: (NSCalendarDate *) _date;
+- (void) setStartDate: (NSCalendarDate *) newStartDate;
 - (NSCalendarDate *) startDate;
 - (BOOL) hasStartDate;
 
diff --git a/SOPE/NGCards/iCalEntityObject.m b/SOPE/NGCards/iCalEntityObject.m
index fc75f8d45..39f2afce2 100644
--- a/SOPE/NGCards/iCalEntityObject.m
+++ b/SOPE/NGCards/iCalEntityObject.m
@@ -19,14 +19,17 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
+#import <Foundation/NSValue.h>
+
 #import "NSCalendarDate+NGCards.h"
-#import "CardGroup+iCal.h"
 
 #import "iCalAlarm.h"
 #import "iCalDateTime.h"
 #import "iCalEntityObject.h"
 #import "iCalPerson.h"
-#import "common.h"
 
 @interface iCalEntityObject (PrivateAPI)
 - (NSArray *)_filteredAttendeesThinkingOfPersons:(BOOL)_persons;
@@ -206,44 +209,52 @@
   [self setSequence: [NSNumber numberWithInt: seq]];
 }
 
-- (void) setCreated: (NSCalendarDate *) _value
+- (void) setCreated: (NSCalendarDate *) newCreated
 {
-  [self setDate: _value forDateTimeValue: @"created"];
+  [(iCalDateTime *) [self uniqueChildWithTag: @"created"]
+		    setDateTime: newCreated];
 }
 
 - (NSCalendarDate *) created
 {
-  return [self dateForDateTimeValue: @"created"];
+  return [(iCalDateTime *) [self uniqueChildWithTag: @"created"]
+			   dateTime];
 }
 
-- (void) setLastModified: (NSCalendarDate *) _value
+- (void) setLastModified: (NSCalendarDate *) newLastModified
 {
-  [self setDate: _value forDateTimeValue: @"last-modified"];
+  [(iCalDateTime *) [self uniqueChildWithTag: @"last-modified"]
+		    setDateTime: newLastModified];
 }
 
 - (NSCalendarDate *) lastModified
 {
-  return [self dateForDateTimeValue: @"last-modified"];
+  return [(iCalDateTime *) [self uniqueChildWithTag: @"last-modified"]
+			   dateTime];
 }
 
-- (void) setTimeStampAsDate: (NSCalendarDate *) _value
+- (void) setTimeStampAsDate: (NSCalendarDate *) newTimeStamp
 {
-  [self setDate: _value forDateTimeValue: @"dtstamp"];
+  [(iCalDateTime *) [self uniqueChildWithTag: @"dtstamp"]
+		    setDateTime: newTimeStamp];
 }
 
 - (NSCalendarDate *) timeStampAsDate
 {
-  return [self dateForDateTimeValue: @"dtstamp"];
+  return [(iCalDateTime *) [self uniqueChildWithTag: @"dtstamp"]
+			   dateTime];
 }
 
-- (void) setStartDate: (NSCalendarDate *) _value
+- (void) setStartDate: (NSCalendarDate *) newStartDate
 {
-  [self setDate: _value forDateTimeValue: @"dtstart"];
+  [(iCalDateTime *) [self uniqueChildWithTag: @"dtstart"]
+		    setDateTime: newStartDate];
 }
 
 - (NSCalendarDate *) startDate
 {
-  return [self dateForDateTimeValue: @"dtstart"];
+  return [(iCalDateTime *) [self uniqueChildWithTag: @"dtstart"]
+			   dateTime];
 }
 
 - (BOOL) hasStartDate