fixed gcc 4.0 warnings

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

diff --git a/sope-ical/samples/ChangeLog b/sope-ical/samples/ChangeLog
index 5281722d9e6f52b8b3cb0dc32a337e04165c2047..68e427a9b724b3d6042ce7c8a6ecc8b09d0feb68 100644 (file)
--- a/sope-ical/samples/ChangeLog
+++ b/sope-ical/samples/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-25  Helge Hess  <helge.hess@opengroupware.org>
+
+       * properly include config.make
+
+       * fixed some gcc 4.0 warnings
+
 2004-09-26  Helge Hess  <helge.hess@opengroupware.org>
 
        * GNUmakefile.preamble: fixed makefiles for SOPE inline compilation

diff --git a/sope-ical/samples/GNUmakefile b/sope-ical/samples/GNUmakefile
index 4f7b1b099af0807aceba2591cddcc684ff0a5e67..b7aed7c3630117a53bbe6165007d941cc98fbbb2 100644 (file)
--- a/sope-ical/samples/GNUmakefile
+++ b/sope-ical/samples/GNUmakefile
@@ -1,5 +1,6 @@
-# $Id: GNUmakefile 9 2004-08-20 18:40:42Z helge $
+# GNUstep makefile
 
+-include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
 TOOL_NAME = ical2 ical3

diff --git a/sope-ical/samples/ical3.m b/sope-ical/samples/ical3.m
index 0a44fed22249c4213b4520a76cd4baab6fecfa9a..6c480b44dd9f3ea1fd60a7a94bcfacf34cb85b1f 100644 (file)
--- a/sope-ical/samples/ical3.m
+++ b/sope-ical/samples/ical3.m
@@ -52,13 +52,16 @@
 
     self->entityName = [[ud stringForKey:@"entity"] copy];
     
-    if ((tmp = [ud objectForKey:@"qualifier"]))
-      self->qualifier = [[EOQualifier alloc] initWithPropertyList:tmp];
+    if ((tmp = [ud objectForKey:@"qualifier"]) != nil) {
+      self->qualifier = [[EOQualifier alloc] initWithPropertyList:tmp 
+                                            owner:nil];
+    }
 
-    if ((tmp = [ud objectForKey:@"sort"])) {
-      if ((tmp = [[EOSortOrdering alloc] initWithPropertyList:tmp])) {
-       self->sortOrderings = [[NSArray alloc] initWithObjects:tmp,nil];
-       [tmp release];
+    if ((tmp = [ud objectForKey:@"sort"]) != nil) {
+      tmp = [[EOSortOrdering alloc] initWithPropertyList:tmp owner:nil];
+      if (tmp != nil) {
+       self->sortOrderings = [[NSArray alloc] initWithObjects:&tmp count:1];
+       [tmp release]; tmp = nil;
       }
     }
   }
@@ -109,7 +112,8 @@
       
       /* setup datasource */
       
-      ds = [[[iCalDataSource alloc] initWithPath:arg] autorelease];
+      ds = [iCalDataSource alloc]; // keep gcc happy
+      ds = [[ds initWithPath:arg] autorelease];
       [ds setFetchSpecification:fspec];
 
       /* perform fetch */

diff --git a/sope-ical/versitSaxDriver/ChangeLog b/sope-ical/versitSaxDriver/ChangeLog
index 7f47480a5ffcad4e4b6623c0e1f88d82e93c06ef..939a5452b61a5a47091d87c52cee00a39223096e 100644 (file)
--- a/sope-ical/versitSaxDriver/ChangeLog
+++ b/sope-ical/versitSaxDriver/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-25  Helge Hess  <helge.hess@opengroupware.org>
+
+       * VSSaxDriver.m: fixed a gcc 4.0 warning (v4.5.12)
+
 2004-12-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * versitSaxDriver.xcode: minor changes and updated

diff --git a/sope-ical/versitSaxDriver/VSSaxDriver.m b/sope-ical/versitSaxDriver/VSSaxDriver.m
index 169b6499d0d718117da8a1ce13f6163c0bb1bebf..ee219cc5bf35a91b7c11d0631bae30fdea74d31c 100644 (file)
--- a/sope-ical/versitSaxDriver/VSSaxDriver.m
+++ b/sope-ical/versitSaxDriver/VSSaxDriver.m
@@ -219,19 +219,19 @@ static VSStringFormatter *stringFormatter = nil;
 
 - (NSString *)_mapAttrName:(NSString *)_attrName forTag:(NSString *)_tagName {
   NSString *mappedName;
-
-  mappedName = [[self->attributeMapping objectForKey:_tagName]
+  
+  mappedName = [(NSDictionary *)[self->attributeMapping objectForKey:_tagName]
                                         objectForKey:_attrName];
-  if (!mappedName) {
-    mappedName = [[self->attributeMapping objectForKey:
+  if (mappedName == nil) {
+    mappedName = [(NSDictionary *)[self->attributeMapping objectForKey:
                                           [self _mapTagName:_tagName]]
                                           objectForKey:_attrName];
   }
-  if (!mappedName) {
-    mappedName = [[self->attributeMapping objectForKey:@""]
+  if (mappedName == nil) {
+    mappedName = [(NSDictionary *)[self->attributeMapping objectForKey:@""]
                                           objectForKey:_attrName];
   }
-  if (!mappedName)
+  if (mappedName == nil)
     mappedName = _attrName;
   
   return mappedName;

diff --git a/sope-ical/versitSaxDriver/Version b/sope-ical/versitSaxDriver/Version
index 6f0aa7829c88bd09724d4e1ece6c718b2532e219..cda34ac9d72a5b695708435677454b874f6e337d 100644 (file)
--- a/sope-ical/versitSaxDriver/Version
+++ b/sope-ical/versitSaxDriver/Version
@@ -1,3 +1,3 @@
 # Version file
 
-SUBMINOR_VERSION:=11
+SUBMINOR_VERSION:=12