From 68243df490a98bd75238c958874397d1d42b56bf Mon Sep 17 00:00:00 2001
From: wolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 6 Aug 2007 17:59:46 +0000
Subject: [PATCH] git-svn-id:
 http://svn.opengroupware.org/SOGo/inverse/trunk@1134
 d1b88da0-ebda-0310-925b-ed51d893ca5b

---
 SoObjects/Mailer/GNUmakefile      |  1 -
 UI/Common/UIxAppNavView.m         | 26 ++++++++++++--------------
 UI/Common/UIxPrintPageFrame.m     | 24 ++++++++++++++----------
 UI/SOGoUI/SOGoAptFormatter.m      |  7 +++++--
 UI/SOGoUI/SOGoJSStringFormatter.m |  3 +--
 UI/SOGoUI/WOContext+UIx.m         |  6 ++++--
 6 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile
index 39319f4f..fbe4346e 100644
--- 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 8c14e154..28e903de 100644
--- 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 d1aaf0e4..48bb2da7 100644
--- 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 0568cc2e..4824f4b4 100644
--- 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 9b566d01..25ea1697 100644
--- 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 3ebf7a1f..36c2f9f4 100644
--- 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)
 
-- 
2.39.5