From 063a8b6ce0878710cb35073454fef1b4467c6937 Mon Sep 17 00:00:00 2001
From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Mon, 25 Apr 2005 19:56:55 +0000
Subject: [PATCH] fixed gcc 4.0 warnings

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@776 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---
 sope-ical/samples/ChangeLog             |  6 ++++++
 sope-ical/samples/GNUmakefile           |  3 ++-
 sope-ical/samples/ical3.m               | 18 +++++++++++-------
 sope-ical/versitSaxDriver/ChangeLog     |  4 ++++
 sope-ical/versitSaxDriver/VSSaxDriver.m | 14 +++++++-------
 sope-ical/versitSaxDriver/Version       |  2 +-
 6 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/sope-ical/samples/ChangeLog b/sope-ical/samples/ChangeLog
index 5281722d..68e427a9 100644
--- 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 4f7b1b09..b7aed7c3 100644
--- 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 0a44fed2..6c480b44 100644
--- 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 7f47480a..939a5452 100644
--- 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 169b6499..ee219cc5 100644
--- 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 6f0aa782..cda34ac9 100644
--- a/sope-ical/versitSaxDriver/Version
+++ b/sope-ical/versitSaxDriver/Version
@@ -1,3 +1,3 @@
 # Version file
 
-SUBMINOR_VERSION:=11
+SUBMINOR_VERSION:=12
-- 
2.39.2