fixed gcc 4.0 warnings

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@953 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/samples/WOxExtTest/CalendarField.m b/sope-appserver/samples/WOxExtTest/CalendarField.m
index 018c4131878d407934690748bc417c02e9eb892c..08a537f405e7eed64477804e94af178cf669dc68 100644 (file)
--- a/sope-appserver/samples/WOxExtTest/CalendarField.m
+++ b/sope-appserver/samples/WOxExtTest/CalendarField.m
@@ -19,15 +19,17 @@
   02111-1307, USA.
 */
 
-#import <NGObjWeb/NGObjWeb.h>
+#include <NGObjWeb/NGObjWeb.h>
 
 @interface CalendarField : WOComponent
 @end
 
+#include "common.h"
+
 @implementation CalendarField
 
 - (id)init {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nil) {
     [self takeValue:@"12"   forKey:@"hour"];
     [self takeValue:@"30"   forKey:@"minute"];
     [self takeValue:@"50"   forKey:@"second"];
@@ -40,4 +42,5 @@
   }
   return self;
 }
-@end
+
+@end /* CalendarField */

diff --git a/sope-appserver/samples/WOxExtTest/ChangeLog b/sope-appserver/samples/WOxExtTest/ChangeLog
index 2d5a7838ddab48d93800afcc12357a70c443cbc4..d7b84abcc7b62c63e920c323b3dc6bed09a14e14 100644 (file)
--- a/sope-appserver/samples/WOxExtTest/ChangeLog
+++ b/sope-appserver/samples/WOxExtTest/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-01  Helge Hess  <helge.hess@skyrix.com>
+
+       * fixed gcc 4.0 warnings
+
 2004-09-28  Helge Hess  <helge.hess@opengroupware.org>
 
        * Resources/TreeView.plist: fixed a missing semicolon (breaks on

diff --git a/sope-appserver/samples/WOxExtTest/DateField.m b/sope-appserver/samples/WOxExtTest/DateField.m
index 743f1b5a385786d3a1b7e54b8836551071a32640..6a5569b1b282d9779dcbff8c9c9dc611a40ef2c3 100644 (file)
--- a/sope-appserver/samples/WOxExtTest/DateField.m
+++ b/sope-appserver/samples/WOxExtTest/DateField.m
@@ -19,17 +19,19 @@
   02111-1307, USA.
 */
 
-#import <NGObjWeb/NGObjWeb.h>
+#include <NGObjWeb/NGObjWeb.h>
 
 @interface DateField : WOComponent
 {
 }
 @end
 
+#include "common.h"
+
 @implementation DateField
 
 - (id)init {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nil) {
     [self takeValue:@"2000" forKey:@"year"];
     [self takeValue:@"10"   forKey:@"month"];
     [self takeValue:@"20"   forKey:@"day"];

diff --git a/sope-appserver/samples/WOxExtTest/MonthOverview.m b/sope-appserver/samples/WOxExtTest/MonthOverview.m
index 3f0397d69ca56baa16502de88f4130a122468d94..c6428e3332aa2acd6b654069c90e3015486d9a3b 100644 (file)
--- a/sope-appserver/samples/WOxExtTest/MonthOverview.m
+++ b/sope-appserver/samples/WOxExtTest/MonthOverview.m
@@ -36,25 +36,19 @@
 static inline void setDateWithKey(id obj, NSString *key) {
   NSString *str;
 
-  str = [obj objectForKey:key];
+  str = [(NSDictionary *)obj objectForKey:key];
 
-  if (str) {
+  if ([str isNotNull]) {
     NSCalendarDate *date;
 
     date = [NSCalendarDate dateWithString:str
                            calendarFormat:@"%Y-%m-%d %H:%M:%S %Z"];
-    [obj setObject:date forKey:key];
+    [(NSMutableDictionary *)obj setObject:date forKey:key];
   }
 }
 
-- (id)init {
-  if ((self = [super init])) {
-  }
-  return self;
-}
-
 - (void)dealloc {
-  RELEASE(self->list);
+  [self->list release];
   [super dealloc];
 }
 

diff --git a/sope-appserver/samples/WOxExtTest/RichString.m b/sope-appserver/samples/WOxExtTest/RichString.m
index d5c5d2f89ef762750f622eb4e263ba488aebd423..d31b8c35f45eb36ddf4b989dc4c509b3388c6571 100644 (file)
--- a/sope-appserver/samples/WOxExtTest/RichString.m
+++ b/sope-appserver/samples/WOxExtTest/RichString.m
@@ -19,19 +19,22 @@
   02111-1307, USA.
 */
 
-#import <NGObjWeb/NGObjWeb.h>
+#include <NGObjWeb/NGObjWeb.h>
 
 @interface RichString : WOComponent
 {
 }
 @end
 
+#include "common.h"
+
 @implementation RichString
 
 - (id)init {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nil) {
     [self takeValue:@"richString richString richString" forKey:@"value"];
   }
   return self;
 }
-@end
+
+@end /* RichString */

diff --git a/sope-appserver/samples/WOxExtTest/TableView.m b/sope-appserver/samples/WOxExtTest/TableView.m
index 84dc2008bfcb701eaede85fced5a4add00331393..bb1b816b2f69177459b341b7fd515402b57be0a2 100644 (file)
--- a/sope-appserver/samples/WOxExtTest/TableView.m
+++ b/sope-appserver/samples/WOxExtTest/TableView.m
@@ -72,9 +72,8 @@
 }
 
 - (BOOL)isGroupCity {
-  id obj1;
-  id obj2;
-
+  NSDictionary *obj1, *obj2;
+  
   obj1 = [self valueForKey:@"item"];
   obj2 = [self valueForKey:@"previousItem"];
 
@@ -83,8 +82,7 @@
 }
 
 - (BOOL)isGroupZip {
-  id obj1;
-  id obj2;
+  NSDictionary *obj1, *obj2;
 
   obj1 = [self valueForKey:@"item"];
   obj2 = [self valueForKey:@"previousItem"];

diff --git a/sope-appserver/samples/WOxExtTest/TimeField.m b/sope-appserver/samples/WOxExtTest/TimeField.m
index d4124a007a35bd20485425d70715d7e96898135a..6d267f9dd1d9687c95cfe53b0dcd5eefa9f008f2 100644 (file)
--- a/sope-appserver/samples/WOxExtTest/TimeField.m
+++ b/sope-appserver/samples/WOxExtTest/TimeField.m
@@ -19,16 +19,20 @@
   02111-1307, USA.
 */
 
-#import <NGObjWeb/NGObjWeb.h>
+#include <NGObjWeb/NGObjWeb.h>
 
-@interface TimeField: WOComponent
+@interface TimeField : WOComponent
 {
 }
+
 @end
 
+#include "common.h"
+
 @implementation TimeField
+
 - (id)init {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nil) {
     [self takeValue:@"12" forKey:@"hour"];
     [self takeValue:@"30" forKey:@"minute"];
     [self takeValue:@"40" forKey:@"second"];
@@ -36,4 +40,5 @@
   }
   return self;
 }
-@end
+
+@end /* TimeField */

diff --git a/sope-appserver/samples/WOxExtTest/WeekColumnView.m b/sope-appserver/samples/WOxExtTest/WeekColumnView.m
index 19bbb8dafcd79b0c27d2e1af23810821865cc99d..92859966dffd306793a49642f121bb2272cf4b97 100644 (file)
--- a/sope-appserver/samples/WOxExtTest/WeekColumnView.m
+++ b/sope-appserver/samples/WOxExtTest/WeekColumnView.m
@@ -36,14 +36,14 @@
 static inline void setDateWithKey(id obj, NSString *key) {
   NSString *str;
 
-  str = [obj objectForKey:key];
+  str = [(NSDictionary *)obj objectForKey:key];
 
-  if (str) {
+  if ([str isNotNull]) {
     NSCalendarDate *date;
 
     date = [NSCalendarDate dateWithString:str
                            calendarFormat:@"%Y-%m-%d %H:%M:%S %Z"];
-    [obj setObject:date forKey:key];
+    [(NSMutableDictionary *)obj setObject:date forKey:key];
   }
 }
 

diff --git a/sope-appserver/samples/WOxExtTest/WeekOverview.m b/sope-appserver/samples/WOxExtTest/WeekOverview.m
index 5dd704fac5514e092bc762400d351cad24d045ed..1bd2ac413df04351756456858c3a45f0dd6c3fac 100644 (file)
--- a/sope-appserver/samples/WOxExtTest/WeekOverview.m
+++ b/sope-appserver/samples/WOxExtTest/WeekOverview.m
@@ -36,28 +36,24 @@
 static inline void setDateWithKey(id obj, NSString *key) {
   NSString *str;
 
-  str = [obj objectForKey:key];
-
-  if (str) {
+  str = [(NSDictionary *)obj objectForKey:key];
+  
+  if ([str isNotNull]) {
     NSCalendarDate *date;
-
+    
     date = [NSCalendarDate dateWithString:str
                            calendarFormat:@"%Y-%m-%d %H:%M:%S %Z"];
-    [obj setObject:date forKey:key];
+    [(NSMutableDictionary *)obj setObject:date forKey:key];
   }
 }
 
-- (id)init {
-  if ((self = [super init])) {
-  }
-  return self;
-}
-
 - (void)dealloc {
-  RELEASE(self->list);
+  [self->list release];
   [super dealloc];
 }
 
+/* accessors */
+
 - (NSArray *)abList {
   return [NSArray arrayWithObjects:@"a", @"b", nil];
 }