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

diff --git a/UI/MailerUI/UIxEnvelopeAddressFormatter.m b/UI/MailerUI/UIxEnvelopeAddressFormatter.m
index b12ae8170f6f20e3ff8ad5f2349fc82f19272797..a5a2a20b715a3c622b952e611f71ef357d5d762d 100644 (file)
--- a/UI/MailerUI/UIxEnvelopeAddressFormatter.m
+++ b/UI/MailerUI/UIxEnvelopeAddressFormatter.m
@@ -19,9 +19,14 @@
   02111-1307, USA.
 */
 
-#include "UIxMailFormatter.h"
-#include <NGImap4/NGImap4EnvelopeAddress.h>
-#include "common.h"
+#import <Foundation/NSArray.h>
+
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSObject+Values.h>
+#import <NGImap4/NGImap4EnvelopeAddress.h>
+
+#import "UIxMailFormatter.h"
 
 @implementation UIxEnvelopeAddressFormatter
 

diff --git a/UI/MailerUI/UIxFilterList.m b/UI/MailerUI/UIxFilterList.m
index 2b9dfce9b76e18c6dfa59c240fdfa50a0c2576b1..453d9ac4154a65383d298b51571edd193719d772 100644 (file)
--- a/UI/MailerUI/UIxFilterList.m
+++ b/UI/MailerUI/UIxFilterList.m
@@ -19,7 +19,11 @@
   02111-1307, USA.
 */
 
-#include <SOGoUI/UIxComponent.h>
+#import <Foundation/NSCalendarDate.h>
+#import <NGObjWeb/SoObject.h>
+#import <SoObjects/Mailer/SOGoMailFolder.h>
+#import <SoObjects/Mailer/SOGoMailObject.h>
+#import <SOGoUI/UIxComponent.h>
 
 /*
   UIxFilterList
@@ -36,10 +40,6 @@
 
 @end
 
-#include "common.h"
-#include <SoObjects/Mailer/SOGoMailFolder.h>
-#include <SoObjects/Mailer/SOGoMailObject.h>
-
 @implementation UIxFilterList
 
 - (void)dealloc {

diff --git a/UI/MailerUI/UIxMailEditorAction.m b/UI/MailerUI/UIxMailEditorAction.m
index 563bdabe7c00d795542764a15b75f6a032e2e8ae..e61b788ecd2174dfbce74dfbcf0dac0a4b32f5af 100644 (file)
--- a/UI/MailerUI/UIxMailEditorAction.m
+++ b/UI/MailerUI/UIxMailEditorAction.m
@@ -19,15 +19,22 @@
   02111-1307, USA.
 */
 
-#import "UIxMailEditorAction.h"
+#import <Foundation/NSDictionary.h>
+
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
+#import <NGObjWeb/NSException+HTTP.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSException+misc.h>
 
+#import <SoObjects/SOGo/NSString+Utilities.h>
 #import <SoObjects/Mailer/SOGoDraftsFolder.h>
 #import <SoObjects/Mailer/SOGoDraftObject.h>
 #import <SoObjects/Mailer/SOGoMailAccount.h>
 #import <SoObjects/Mailer/SOGoMailObject.h>
-#import "common.h"
 
-#import <SOGo/NSString+Utilities.h>
+#import "UIxMailEditorAction.h"
 
 @implementation UIxMailEditorAction
 

diff --git a/UI/MailerUI/UIxMailMoveToPopUp.m b/UI/MailerUI/UIxMailMoveToPopUp.m
index 19179c5489c5ab6e9c53a638273b97d67b663f20..3a19ee86ecb6a59e787cad9271296883b4ad29b5 100644 (file)
--- a/UI/MailerUI/UIxMailMoveToPopUp.m
+++ b/UI/MailerUI/UIxMailMoveToPopUp.m
@@ -19,7 +19,7 @@
  02111-1307, USA.
  */
 
-#include <NGObjWeb/WOComponent.h>
+#import <NGObjWeb/WOComponent.h>
 
 @class NSString, NSMutableArray, NSDictionary;
 
@@ -40,8 +40,6 @@
 
 @end
 
-#include "common.h"
-
 @implementation UIxMailMoveToPopUp
 
 - (void)dealloc {

diff --git a/UI/MailerUI/UIxMailReplyAction.m b/UI/MailerUI/UIxMailReplyAction.m
index 5d278097d9988f1b7624d0318e5961d9c8713f21..ac3e13b8e6b981fb0d384a1c2946fabd115cb962 100644 (file)
--- a/UI/MailerUI/UIxMailReplyAction.m
+++ b/UI/MailerUI/UIxMailReplyAction.m
@@ -19,16 +19,19 @@
   02111-1307, USA.
 */
 
-#import "UIxMailEditorAction.h"
-
-@interface UIxMailReplyAction : UIxMailEditorAction
-@end
-
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSString+misc.h>
 #import <SoObjects/Mailer/SOGoMailObject.h>
 #import <SoObjects/Mailer/SOGoDraftObject.h>
 #import <NGImap4/NGImap4EnvelopeAddress.h>
 #import <NGImap4/NGImap4Envelope.h>
-#import "common.h"
+
+#import "UIxMailEditorAction.h"
+
+@interface UIxMailReplyAction : UIxMailEditorAction
+@end
 
 @implementation UIxMailReplyAction
 

diff --git a/UI/MailerUI/UIxMailToSelection.m b/UI/MailerUI/UIxMailToSelection.m
index d8c17cbbb65c130acfe11c8de5827034454bca25..1345c80dd7d7afce06793f9c2168962948eaee4b 100644 (file)
--- a/UI/MailerUI/UIxMailToSelection.m
+++ b/UI/MailerUI/UIxMailToSelection.m
@@ -19,7 +19,12 @@
  02111-1307, USA.
 */
 
-#include <SOGoUI/UIxComponent.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGMail/NGMailAddress.h>
+#import <NGMail/NGMailAddressParser.h>
+
+#import <SOGoUI/UIxComponent.h>
 
 /*
   UIxMailToSelection
@@ -66,9 +71,6 @@
 
 @end
 
-#include "common.h"
-#include <NGMail/NGMail.h>
-
 @implementation UIxMailToSelection
 
 static NSArray *headers = nil;