git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1119 d1b88da0-ebda-0310...

diff --git a/SOPE/NGCards/IcalElements.m b/SOPE/NGCards/IcalElements.m
index f66952b69c97990f3cb4cc6dc1f2e6fb2256d16f..1ff018f3a177c38f6713fbbbd7f24606cc0041c0 100644 (file)
--- a/SOPE/NGCards/IcalElements.m
+++ b/SOPE/NGCards/IcalElements.m
@@ -19,7 +19,14 @@
   02111-1307, USA.
 */
 
-#include <NGObjWeb/WODynamicElement.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSString.h>
+
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WODynamicElement.h>
+#import <NGObjWeb/WOResponse.h>
 
 @interface IcalComponent : WODynamicElement
 {

diff --git a/SOPE/NGCards/IcalResponse.m b/SOPE/NGCards/IcalResponse.m
index 1e90c2b2ce380e13e56dccb86ea42a87921f337f..843fe43e1bbca3c8c8ab0efe48f106c9960a651b 100644 (file)
--- a/SOPE/NGCards/IcalResponse.m
+++ b/SOPE/NGCards/IcalResponse.m
@@ -19,8 +19,7 @@
   02111-1307, USA.
 */
 
-#include "IcalResponse.h"
-#import <Foundation/Foundation.h>
+#import "IcalResponse.h"
 
 @implementation IcalResponse
 

diff --git a/SOPE/NGCards/NGCardsSaxHandler.m b/SOPE/NGCards/NGCardsSaxHandler.m
index d961c9564bab4437e30a000ff17dace7b92f9b7e..e91cb36c9d4fa187f7baae5926d128c68cfc78fd 100644 (file)
--- a/SOPE/NGCards/NGCardsSaxHandler.m
+++ b/SOPE/NGCards/NGCardsSaxHandler.m
@@ -21,6 +21,7 @@
 
 #import <string.h>
 #import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
 
 #import "NGCardsSaxHandler.h"
 
@@ -44,10 +45,9 @@
 - (void) dealloc
 {
   if (content)
-    free(content);
+    free (content);
   [cards release];
-  if (currentGroup)
-    [currentGroup release];
+  [currentGroup release];
   [super dealloc];
 }
 
@@ -64,7 +64,7 @@
 {
   if (content)
     {
-      free(content);
+      free (content);
       content = NULL;
     }
 
@@ -227,7 +227,7 @@
 - (void) startCollectingContent
 {
   if (content) {
-    free(content);
+    free (content);
     content = NULL;
   }
   vcs.collectContent = 1;

diff --git a/SOPE/NGCards/iCalRepeatableEntityObject.m b/SOPE/NGCards/iCalRepeatableEntityObject.m
index 2b36288c6ba7f229dac279ca7bf5eaca09e7edde..90d1183bf90e052bda2d883bbd5ac9680d7c893a 100644 (file)
--- a/SOPE/NGCards/iCalRepeatableEntityObject.m
+++ b/SOPE/NGCards/iCalRepeatableEntityObject.m
@@ -19,10 +19,16 @@
   02111-1307, USA.
 */
 
-#include "iCalRepeatableEntityObject.h"
-#include <NGExtensions/NGCalendarDateRange.h>
-#include "iCalRecurrenceRule.h"
-#include "iCalRecurrenceCalculator.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSString.h>
+
+#import <NGExtensions/NGCalendarDateRange.h>
+
+#import "iCalRecurrenceRule.h"
+#import "iCalRecurrenceCalculator.h"
+#import "iCalRepeatableEntityObject.h"
 
 @implementation iCalRepeatableEntityObject