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

diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 4d0b335781160de4f70f40ab53c93ec51f1ce5be..7e0c0e6dcd70d04008aed0222d7ae7031b945ea4 100644 (file)
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -19,11 +19,28 @@
   02111-1307, USA.
 */
 
-#import <GDLContentStore/GCSFolder.h>
-#import <NGCards/NGCards.h>
-#import <NGObjWeb/WOContext.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSValue.h>
+
+#import <NGObjWeb/NSException+HTTP.h>
+#import <NGObjWeb/SoObject+SoDAV.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WOMessage.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
+#import <NGExtensions/NGLoggerManager.h>
+#import <NGExtensions/NSString+misc.h>
+#import <GDLContentStore/GCSFolder.h>
+#import <DOM/DOMProtocols.h>
+#import <EOControl/EOQualifier.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalPerson.h>
+#import <NGCards/iCalRecurrenceCalculator.h>
+#import <NGCards/NSString+NGCards.h>
 #import <NGExtensions/NGCalendarDateRange.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
 #import <SaxObjC/SaxObjC.h>
 #import <SaxObjC/XMLNamespaces.h>
 
@@ -34,8 +51,6 @@
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoUser.h>
 
-#import "common.h"
-
 #import "SOGoAppointmentObject.h"
 #import "SOGoTaskObject.h"
 

diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 1b7a673ea5f35e2d9d6879fb8bd27b7f2fbe5547..9b1b334fe93cb47e1c818fae707284ac9ddb2b04 100644 (file)
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -19,8 +19,9 @@
   02111-1307, USA.
 */
 
-#import "SOGoAppointmentObject.h"
-
+#import <NGObjWeb/NSException+HTTP.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalEvent.h>
 #import <NGCards/iCalEventChanges.h>
@@ -30,9 +31,8 @@
 #import <SoObjects/SOGo/SOGoObject.h>
 #import <SoObjects/SOGo/SOGoPermissions.h>
 
-#import "common.h"
-
 #import "NSArray+Appointments.h"
+#import "SOGoAppointmentObject.h"
 
 @implementation SOGoAppointmentObject
 

diff --git a/SoObjects/Appointments/SOGoAptMailNotification.m b/SoObjects/Appointments/SOGoAptMailNotification.m
index 98a9d74b8438a2da3bcb4d6921061bc76426af94..788669afda54b7f090fd99dc111c4dd799de6c84 100644 (file)
--- a/SoObjects/Appointments/SOGoAptMailNotification.m
+++ b/SoObjects/Appointments/SOGoAptMailNotification.m
@@ -19,10 +19,16 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSCharacterSet.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSTimeZone.h>
+
+#import <NGObjWeb/WOActionResults.h>
+#import <NGObjWeb/WOMessage.h>
+#import <NGExtensions/NSObject+Logs.h>
 #import <NGCards/iCalEntityObject.h>
 
 #import "SOGoAptMailNotification.h"
-#import "common.h"
 
 @interface SOGoAptMailNotification (PrivateAPI)
 - (BOOL)isSubject;

diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 5f987aa5bde27b969a581f7baa4c74e9ae820b21..c77601288d95bd4ab0cdd342c47cdec71bc67bfe 100644 (file)
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -22,6 +22,10 @@
 
 #import <Foundation/NSString.h>
 
+#import <NGObjWeb/NSException+HTTP.h>
+#import <NGObjWeb/SoSecurityManager.h>
+#import <NGObjWeb/WOApplication.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalPerson.h>
 #import <NGCards/iCalRepeatableEntityObject.h>
@@ -34,8 +38,6 @@
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/Appointments/SOGoAppointmentFolder.h>
 
-#import "common.h"
-
 #import "SOGoAptMailNotification.h"
 #import "iCalEntityObject+SOGo.h"
 #import "SOGoCalendarComponent.h"

diff --git a/SoObjects/Appointments/SOGoFreeBusyObject.m b/SoObjects/Appointments/SOGoFreeBusyObject.m
index b892914c345a3a05e9e4bf156229dc03d9f984c3..d8559111a895feb2f18c293c4e333b571a9c2bb5 100644 (file)
--- a/SoObjects/Appointments/SOGoFreeBusyObject.m
+++ b/SoObjects/Appointments/SOGoFreeBusyObject.m
@@ -19,13 +19,20 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSValue.h>
+
+#import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGObjWeb/WOResponse.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalFreeBusy.h>
 #import <NGCards/iCalPerson.h>
 
-#import "common.h"
-
 #import <SOGo/LDAPUserManager.h>
+#import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoPermissions.h>
 
 #import "SOGoFreeBusyObject.h"

diff --git a/SoObjects/Appointments/SOGoGroupAppointmentFolder.m b/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
index 80985e7f70ee7698cbf3db57e55f75c0d529857b..ad33f26d6a11f038bf667b7a5c4a7a8ba906241e 100644 (file)
--- a/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
@@ -19,11 +19,19 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSException.h>
+
+#import <NGObjWeb/SoSecurityManager.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
 #import <NGCards/iCalEntityObject.h>
+
 #import <SOGo/SOGoGroupFolder.h>
+#import <SOGo/SOGoPermissions.h>
 
-#include "SOGoGroupAppointmentFolder.h"
-#include "common.h"
+#import "SOGoGroupAppointmentFolder.h"
 
 @implementation SOGoGroupAppointmentFolder
 

diff --git a/SoObjects/Appointments/SOGoTaskObject.m b/SoObjects/Appointments/SOGoTaskObject.m
index cc15067f52d10ab2119914b68c31b5463f3c8955..5fc7b15aa947b6e2fb28a81e9e1682616b5acbd6 100644 (file)
--- a/SoObjects/Appointments/SOGoTaskObject.m
+++ b/SoObjects/Appointments/SOGoTaskObject.m
@@ -30,7 +30,6 @@
 #import <NGMail/NGMail.h>
 #import <NGMail/NGSendMail.h>
 #import "SOGoAptMailNotification.h"
-#import "common.h"
 
 #import "NSArray+Appointments.h"
 

diff --git a/SoObjects/Appointments/common.h b/SoObjects/Appointments/common.h
deleted file mode 100644 (file)
index c3c5c3a..0000000
--- a/SoObjects/Appointments/common.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Copyright (C) 2002-2005 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-
-#import <Foundation/Foundation.h>
-
-#if NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
-#  include <NGExtensions/NGObjectMacros.h>
-#  include <NGExtensions/NSString+Ext.h>
-#endif
-
-#include <NGExtensions/NGExtensions.h>
-#include <NGObjWeb/NGObjWeb.h>
-#include <NGObjWeb/SoObjects.h>
-
-#warning importing common.h is baaad