From 892bd693d7ee901bc1c7947e0785ff0787fc112a Mon Sep 17 00:00:00 2001
From: Euan Thoms <euan@potensol.com>
Date: Wed, 4 Nov 2015 03:59:40 +0800
Subject: [PATCH] Stage 3 of clang compiler warning patches.

Conflicts:

	UI/PreferencesUI/UIxJSONPreferences.m
---
 SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m | 1 +
 SoObjects/Mailer/NSDictionary+Mail.m                     | 1 +
 SoObjects/Mailer/SOGoMailBaseObject.m                    | 2 ++
 SoObjects/SOGo/SOGoCache.h                               | 1 +
 UI/Common/WODirectAction+SOGo.m                          | 3 +++
 UI/Contacts/UIxContactFolderActions.m                    | 4 ++++
 UI/MailPartViewers/UIxMailPartICalActions.m              | 1 +
 UI/MainUI/SOGoMicrosoftActiveSyncActions.m               | 3 +++
 UI/PreferencesUI/UIxJSONPreferences.m                    | 5 +++++
 9 files changed, 21 insertions(+)

diff --git a/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m b/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
index c9f66a6b1..f5540c466 100644
--- a/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
+++ b/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
@@ -36,6 +36,7 @@
 #import <NGExtensions/NGCalendarDateRange.h>
 
 #import "iCalRepeatableEntityObject+SOGo.h"
+#import "iCalCalendar+SOGo.h"
 
 @implementation iCalRepeatableEntityObject (SOGoExtensions)
 
diff --git a/SoObjects/Mailer/NSDictionary+Mail.m b/SoObjects/Mailer/NSDictionary+Mail.m
index 74311f292..177ad38ac 100644
--- a/SoObjects/Mailer/NSDictionary+Mail.m
+++ b/SoObjects/Mailer/NSDictionary+Mail.m
@@ -20,6 +20,7 @@
 
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
+#import <NGExtensions/NSString+misc.h>
 
 #import "NSDictionary+Mail.h"
 
diff --git a/SoObjects/Mailer/SOGoMailBaseObject.m b/SoObjects/Mailer/SOGoMailBaseObject.m
index 863491e2e..4948abe7e 100644
--- a/SoObjects/Mailer/SOGoMailBaseObject.m
+++ b/SoObjects/Mailer/SOGoMailBaseObject.m
@@ -32,9 +32,11 @@
 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSURL+misc.h>
 #import <NGImap4/NGImap4Connection.h>
+#import <NGImap4/NGImap4Client.h>
 
 #import <SOGo/SOGoCache.h>
 #import <SOGo/SOGoUser.h>
+#import <SOGo/WORequest+SOGo.h>
 
 #import "SOGoMailAccount.h"
 #import "SOGoMailManager.h"
diff --git a/SoObjects/SOGo/SOGoCache.h b/SoObjects/SOGo/SOGoCache.h
index 69ef6f942..12e665ea7 100644
--- a/SoObjects/SOGo/SOGoCache.h
+++ b/SoObjects/SOGo/SOGoCache.h
@@ -21,6 +21,7 @@
 #ifndef SOGOCACHE_H
 #define SOGOCACHE_H
 
+#import <Foundation/Foundation.h>
 #import <Foundation/NSObject.h>
 
 #include <libmemcached/memcached.h>
diff --git a/UI/Common/WODirectAction+SOGo.m b/UI/Common/WODirectAction+SOGo.m
index 805acbe8c..fada54f17 100644
--- a/UI/Common/WODirectAction+SOGo.m
+++ b/UI/Common/WODirectAction+SOGo.m
@@ -22,6 +22,7 @@
 
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSBundle.h>
+#import <Foundation/NSKeyValueCoding.h>
 
 #import <NGObjWeb/SoObjects.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
@@ -33,6 +34,8 @@
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/SOGo/SOGoUserDefaults.h>
 
+#import <NGExtensions/NSObject+Logs.h>
+
 #import "WODirectAction+SOGo.h"
 
 @implementation WODirectAction (SOGoExtension)
diff --git a/UI/Contacts/UIxContactFolderActions.m b/UI/Contacts/UIxContactFolderActions.m
index 974e7d5d0..6a9fb29fd 100644
--- a/UI/Contacts/UIxContactFolderActions.m
+++ b/UI/Contacts/UIxContactFolderActions.m
@@ -28,10 +28,14 @@
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOResponse.h>
+#define COMPILING_NGOBJWEB 1 /* we want httpRequest for parsing multi-part
+                                form data */
 #import <NGObjWeb/WORequest.h>
+#undef COMPILING_NGOBJWEB
 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NGBase64Coding.h>
+#import <NGMime/NGMimeMultipartBody.h>
 
 #import <Contacts/SOGoContactObject.h>
 #import <Contacts/SOGoContactFolder.h>
diff --git a/UI/MailPartViewers/UIxMailPartICalActions.m b/UI/MailPartViewers/UIxMailPartICalActions.m
index 567412818..9f233515c 100644
--- a/UI/MailPartViewers/UIxMailPartICalActions.m
+++ b/UI/MailPartViewers/UIxMailPartICalActions.m
@@ -46,6 +46,7 @@
 #import <Mailer/SOGoMailObject.h>
 #import <SOGo/SOGoParentFolder.h>
 #import <SOGo/SOGoUser.h>
+#import <SOGo/NSString+Utilities.h>
 #import <Mailer/SOGoMailBodyPart.h>
 
 #import "UIxMailPartICalActions.h"
diff --git a/UI/MainUI/SOGoMicrosoftActiveSyncActions.m b/UI/MainUI/SOGoMicrosoftActiveSyncActions.m
index c487d5cce..1cfb8bc2f 100644
--- a/UI/MainUI/SOGoMicrosoftActiveSyncActions.m
+++ b/UI/MainUI/SOGoMicrosoftActiveSyncActions.m
@@ -30,6 +30,9 @@
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 
+#import <Common/WODirectAction+SOGo.h>
+#import <ActiveSync/SOGoActiveSyncDispatcher.h>
+
 @interface SOGoMicrosoftActiveSyncActions : WODirectAction
 @end
 
diff --git a/UI/PreferencesUI/UIxJSONPreferences.m b/UI/PreferencesUI/UIxJSONPreferences.m
index 11bd05b36..33a97f708 100644
--- a/UI/PreferencesUI/UIxJSONPreferences.m
+++ b/UI/PreferencesUI/UIxJSONPreferences.m
@@ -29,6 +29,11 @@
 #import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoUserProfile.h>
+#import <SOGo/WOResourceManager+SOGo.h>
+#import <Mailer/SOGoMailLabel.h>
+
+#import <SOGoUI/UIxComponent.h>
+#import <UI/Common/WODirectAction+SOGo.h>
 
 #import "UIxJSONPreferences.h"