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

diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile
index 39319f4f08a54e25ab15d153ddfd63f38f2935fe..fbe4346ed1b4cabc05f00b0859a4126d0f00d77e 100644 (file)
--- a/SoObjects/Mailer/GNUmakefile
+++ b/SoObjects/Mailer/GNUmakefile
@@ -18,7 +18,6 @@ Mailer_OBJC_FILES += \
        SOGoMailFolder.m                \
        SOGoSharedInboxFolder.m         \
        SOGoMailObject.m                \
-       SOGoMailFolderDataSource.m      \
        SOGoTrashFolder.m               \
        \
        SOGoMailBodyPart.m              \

diff --git a/UI/Common/UIxAppNavView.m b/UI/Common/UIxAppNavView.m
index 8c14e154f6ebecea8bdd762feceb91066cc23546..28e903dea0d1bf1755516110826e9fb8a47b0b92 100644 (file)
--- a/UI/Common/UIxAppNavView.m
+++ b/UI/Common/UIxAppNavView.m
@@ -20,43 +20,41 @@
 */
 // $Id$
 
-#include <SOGoUI/UIxComponent.h>
+#import <NGObjWeb/SoObject+SoDAV.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+
+#import <SOGoUI/UIxComponent.h>
 
 @interface UIxAppNavView : UIxComponent
 {
-    id element;
-    id lastElement;
+  id element;
+  id lastElement;
 }
 
 @end
 
-#include <NGObjWeb/NGObjWeb.h>
-#include <NGObjWeb/SoObject+SoDAV.h>
-#include <NGObjWeb/WOContext+SoObjects.h>
-#include "common.h"
-
 @implementation UIxAppNavView
 
 - (void)dealloc {
-  [self->element     release];
-  [self->lastElement release];
+  [element     release];
+  [lastElement release];
   [super dealloc];
 }
 
 /* accessors */
 
 - (void)setElement:(id)_element {
-  ASSIGN(self->element, _element);
+  ASSIGN(element, _element);
 }
 - (id)element {
-  return self->element;
+  return element;
 }
 
 - (void)setLastElement:(id)_element {
-  ASSIGN(self->lastElement, _element);
+  ASSIGN(lastElement, _element);
 }
 - (id)lastElement {
-  return self->lastElement;
+  return lastElement;
 }
 
 /* navigation */

diff --git a/UI/Common/UIxPrintPageFrame.m b/UI/Common/UIxPrintPageFrame.m
index d1aaf0e40e373f8f34af2e34779ce864abb5da8e..48bb2da7b2436cbd47173331c12a3069a67bf68a 100644 (file)
--- a/UI/Common/UIxPrintPageFrame.m
+++ b/UI/Common/UIxPrintPageFrame.m
@@ -19,31 +19,35 @@
   02111-1307, USA.
 */
 
-#include <NGObjWeb/SoComponent.h>
+#import <NGObjWeb/SoComponent.h>
+
+@class NSString;
 
 @interface UIxPrintPageFrame : SoComponent
 {
-    NSString *title;
+  NSString *title;
 }
 
 @end
 
-#include "common.h"
-
 @implementation UIxPrintPageFrame
 
-- (void)dealloc {
-  [self->title release];
+- (void) dealloc
+{
+  [title release];
   [super dealloc];
 }
 
 /* accessors */
 
-- (void)setTitle:(NSString *)_value {
-  ASSIGNCOPY(self->title, _value);
+- (void)setTitle: (NSString *) _value
+{
+  ASSIGNCOPY (title, _value);
 }
-- (NSString *)title {
-  return self->title;
+
+- (NSString *) title
+{
+  return title;
 }
 
 @end /* UIxPrintPageFrame */

diff --git a/UI/SOGoUI/SOGoAptFormatter.m b/UI/SOGoUI/SOGoAptFormatter.m
index 0568cc2e8864109df84f3fc8f228195fcecf3d79..4824f4b4a43984443a6ab5c31350bef3f1832214 100644 (file)
--- a/UI/SOGoUI/SOGoAptFormatter.m
+++ b/UI/SOGoUI/SOGoAptFormatter.m
@@ -19,8 +19,11 @@
   02111-1307, USA.
 */
 
-#include "SOGoAptFormatter.h"
-#include "common.h"
+#import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSNull+misc.h>
+
+#import "SOGoAptFormatter.h"
 
 @interface SOGoAptFormatter(PrivateAPI)
 - (NSString *)titleForApt:(id)_apt :(NSCalendarDate *)_refDate;

diff --git a/UI/SOGoUI/SOGoJSStringFormatter.m b/UI/SOGoUI/SOGoJSStringFormatter.m
index 9b566d01b38004686fc649bb9641d83bf0976b49..25ea16976b3cffe6b53de5abfd19c61aace3f2db 100644 (file)
--- a/UI/SOGoUI/SOGoJSStringFormatter.m
+++ b/UI/SOGoUI/SOGoJSStringFormatter.m
@@ -21,8 +21,7 @@
 // $Id$
 
 
-#include "SOGoJSStringFormatter.h"
-#include "common.h"
+#import "SOGoJSStringFormatter.h"
 
 @implementation SOGoJSStringFormatter
 

diff --git a/UI/SOGoUI/WOContext+UIx.m b/UI/SOGoUI/WOContext+UIx.m
index 3ebf7a1f57333e521bc4930298be466eb21fafa8..36c2f9f43e27aa7ca2914baa2d6cb3bf62861992 100644 (file)
--- a/UI/SOGoUI/WOContext+UIx.m
+++ b/UI/SOGoUI/WOContext+UIx.m
@@ -19,8 +19,10 @@
   02111-1307, USA.
 */
 
-#include "WOContext+UIx.h"
-#include "common.h"
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSValue.h>
+
+#import "WOContext+UIx.h"
 
 @implementation WOContext (UIx)