Monotone-Parent: 61d11066e0e001f91446e76044b712194a177089

Monotone-Revision: 4e643e3e8f08c6cdd2abe4483bdb2cdb7dc15066

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-07T16:17:51
Monotone-Branch: ca.inverse.sogo

SOPE/NGCards/IcalElements.m

@@ -38,7 +38,6 @@
 }
 @end
 
-#include "common.h"
 
 static inline NSDictionary *ExtractParameters(NSDictionary *_set) {
   /* extracts ? parameters */

SOPE/NGCards/NGCardsSaxHandler.m

@@ -19,9 +19,10 @@
   02111-1307, USA.
 */
 
-#import "NGCardsSaxHandler.h"
-#import "common.h"
 #import <string.h>
+#import <Foundation/NSArray.h>
+
+#import "NGCardsSaxHandler.h"
 
 #import "CardGroup.h"
 

SOPE/NGCards/NSCalendarDate+ICal.m

@@ -19,9 +19,13 @@
   02111-1307, USA.
 */
 
-#include "NSCalendarDate+ICal.h"
-#include "iCalDateHolder.h"
-#include "common.h"
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+
+#import <NGExtensions/NSCalendarDate+misc.h>
+
+#import "NSCalendarDate+ICal.h"
+#import "iCalDateHolder.h"
 
 static NSTimeZone *gmt = nil;
 static inline void _setupGMT(void) {

SOPE/NGCards/iCalAlarm.m

@@ -19,12 +19,13 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSString.h>
+
 #import "iCalAttachment.h"
 #import "iCalRecurrenceRule.h"
 #import "iCalTrigger.h"
 
 #import "iCalAlarm.h"
-#import "common.h"
 
 @implementation iCalAlarm
 

SOPE/NGCards/iCalAttachment.m

@@ -19,8 +19,8 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSString.h>
 #import "iCalAttachment.h"
-#import "common.h"
 
 @implementation iCalAttachment
 

SOPE/NGCards/iCalDailyRecurrenceCalculator.m

@@ -19,15 +19,19 @@
   02111-1307, USA.
 */
 
-#include "iCalRecurrenceCalculator.h"
+#import <Foundation/NSDate.h>
+#import <Foundation/NSArray.h>
+
+#import <NGExtensions/NSCalendarDate+misc.h>
+
+#import "iCalRecurrenceCalculator.h"
 
 @interface iCalDailyRecurrenceCalculator : iCalRecurrenceCalculator
 @end
 
-#include <NGExtensions/NGCalendarDateRange.h>
-#include "iCalRecurrenceRule.h"
-#include "NSCalendarDate+ICal.h"
-#include "common.h"
+#import <NGExtensions/NGCalendarDateRange.h>
+#import "iCalRecurrenceRule.h"
+#import "NSCalendarDate+ICal.h"
 
 @interface iCalRecurrenceCalculator(PrivateAPI)
 - (NSCalendarDate *)lastInstanceStartDate;

SOPE/NGCards/iCalDataSource.m

@@ -19,11 +19,25 @@
   02111-1307, USA.
 */
 
-#include "iCalDataSource.h"
-#include "iCalObject.h"
-#include "iCalCalendar.h"
-#include <SaxObjC/SaxObjC.h>
-#include "common.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSURL.h>
+
+#import <EOControl/EOClassDescription.h>
+#import <EOControl/EOFetchSpecification.h>
+#import <EOControl/EOQualifier.h>
+#import <EOControl/EOSortOrdering.h>
+#import <NGExtensions/EODataSource+NGExtensions.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <SaxObjC/SaxObjectDecoder.h>
+#import <SaxObjC/SaxXMLReaderFactory.h>
+
+#import "iCalObject.h"
+#import "iCalCalendar.h"
+
+#import "iCalDataSource.h"
 
 @interface NSObject(suppressCapitalizedKeyWarning)
 + (void)suppressCapitalizedKeyWarning;

SOPE/NGCards/iCalDateHolder.m

@@ -19,9 +19,17 @@
   02111-1307, USA.
 */
 
-#include "iCalDateHolder.h"
-#include "iCalObject.h"
-#include "common.h"
+#import <Foundation/NSDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+#import <Foundation/NSUserDefaults.h>
+
+#import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+
+#import "iCalDateHolder.h"
+#import "iCalObject.h"
 
 @interface NSTimeZone(iCalTimeZone)
 

SOPE/NGCards/iCalEventChanges.m

@@ -19,11 +19,11 @@
  02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
 
-#include "iCalEventChanges.h"
-#include "iCalEvent.h"
-#include "iCalPerson.h"
-#include "common.h"
+#import "iCalEventChanges.h"
+#import "iCalEvent.h"
+#import "iCalPerson.h"
 
 @interface iCalEventChanges (PrivateAPI)
 - (void)_trackAttendeeChanges:(iCalEvent *)_from :(iCalEvent *)_to;

SOPE/NGCards/iCalJournal.m

@@ -19,8 +19,9 @@
   02111-1307, USA.
 */
 
-#include "iCalJournal.h"
-#include "common.h"
+#import <Foundation/NSString.h>
+
+#import "iCalJournal.h"
 
 @implementation iCalJournal
 

SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m

@@ -19,16 +19,17 @@
   02111-1307, USA.
 */
 
-#include "iCalRecurrenceCalculator.h"
+#import <NGExtensions/NSCalendarDate+misc.h>
+
+#import "iCalRecurrenceCalculator.h"
 
 @interface iCalMonthlyRecurrenceCalculator : iCalRecurrenceCalculator
 @end
 
-#include <NGExtensions/NGCalendarDateRange.h>
-#include "iCalRecurrenceRule.h"
-#include "NSCalendarDate+ICal.h"
-#include "common.h"
-#include <string.h>
+#import <NGExtensions/NGCalendarDateRange.h>
+#import "iCalRecurrenceRule.h"
+#import "NSCalendarDate+ICal.h"
+#import <string.h>
 
 @interface iCalRecurrenceCalculator(PrivateAPI)
 - (NSCalendarDate *)lastInstanceStartDate;

SOPE/NGCards/iCalObject.m

@@ -19,8 +19,9 @@
   02111-1307, USA.
 */
 
-#include "iCalObject.h"
-#include "common.h"
+#import <Foundation/NSString.h>
+
+#import "iCalObject.h"
 
 @implementation iCalObject
 

SOPE/NGCards/iCalPerson.m

@@ -19,8 +19,9 @@
   02111-1307, USA.
 */
 
-#include "iCalPerson.h"
-#include "common.h"
+#import <Foundation/NSString.h>
+
+#import "iCalPerson.h"
 
 @implementation iCalPerson
 

SOPE/NGCards/iCalRecurrenceCalculator.m

@@ -19,11 +19,16 @@
   02111-1307, USA.
 */
 
-#include "iCalRecurrenceCalculator.h"
-#include <NGExtensions/NGCalendarDateRange.h>
-#include "iCalRecurrenceRule.h"
-#include "NSCalendarDate+ICal.h"
-#include "common.h"
+#import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGExtensions/NGCalendarDateRange.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+
+#import "iCalRecurrenceRule.h"
+#import "NSCalendarDate+ICal.h"
+
+
+#import "iCalRecurrenceCalculator.h"
 
 /* class cluster */
 

SOPE/NGCards/iCalRepeatableEntityObject.m

@@ -23,7 +23,6 @@
 #include <NGExtensions/NGCalendarDateRange.h>
 #include "iCalRecurrenceRule.h"
 #include "iCalRecurrenceCalculator.h"
-#include "common.h"
 
 @implementation iCalRepeatableEntityObject
 

SOPE/NGCards/iCalTrigger.m

@@ -19,8 +19,9 @@
   02111-1307, USA.
 */
 
-#include "iCalTrigger.h"
-#include "common.h"
+#import <Foundation/NSString.h>
+
+#import "iCalTrigger.h"
 
 @implementation iCalTrigger
 

SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m

@@ -19,15 +19,16 @@
   02111-1307, USA.
 */
 
-#include "iCalRecurrenceCalculator.h"
+#import <NGExtensions/NSCalendarDate+misc.h>
+
+#import "iCalRecurrenceCalculator.h"
 
 @interface iCalWeeklyRecurrenceCalculator : iCalRecurrenceCalculator
 @end
 
-#include <NGExtensions/NGCalendarDateRange.h>
-#include "iCalRecurrenceRule.h"
-#include "NSCalendarDate+ICal.h"
-#include "common.h"
+#import <NGExtensions/NGCalendarDateRange.h>
+#import "iCalRecurrenceRule.h"
+#import "NSCalendarDate+ICal.h"
 
 @interface iCalRecurrenceCalculator (PrivateAPI)
 

SOPE/NGCards/iCalYearlyRecurrenceCalculator.m

@@ -19,15 +19,16 @@
   02111-1307, USA.
 */
 
-#include "iCalRecurrenceCalculator.h"
+#import <NGExtensions/NSCalendarDate+misc.h>
+
+#import "iCalRecurrenceCalculator.h"
 
 @interface iCalYearlyRecurrenceCalculator : iCalRecurrenceCalculator
 @end
 
-#include <NGExtensions/NGCalendarDateRange.h>
-#include "iCalRecurrenceRule.h"
-#include "NSCalendarDate+ICal.h"
-#include "common.h"
+#import <NGExtensions/NGCalendarDateRange.h>
+#import "iCalRecurrenceRule.h"
+#import "NSCalendarDate+ICal.h"
 
 @interface iCalRecurrenceCalculator(PrivateAPI)
 - (NSCalendarDate *)lastInstanceStartDate;