fixed gnustep-base warnings

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

diff --git a/sope-xml/XmlRpc/ChangeLog b/sope-xml/XmlRpc/ChangeLog
index 1b510e9e49eb838d4d56dee4cfb0d722050babe1..b5077264f56075e0f760f2b21fd3a6ac8fe44b46 100644 (file)
--- a/sope-xml/XmlRpc/ChangeLog
+++ b/sope-xml/XmlRpc/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-12  Helge Hess  <helge.hess@opengroupware.org>
+
+       * XmlRpcSaxHandler.m, XmlRpcDecoder.m: fixed a few gnustep-base
+         compilation warnings (v4.7.31)
+
 2006-09-20  Helge Hess  <helge.hess@opengroupware.org>
 
        * GNUmakefile.preamble: filter out -O% flags for files using exception

diff --git a/sope-xml/XmlRpc/Version b/sope-xml/XmlRpc/Version
index 82f4b9528977be7f9275c242fbc49355a05ae2f8..8f66614778ccc96f5823f2128f5829458426abe6 100644 (file)
--- a/sope-xml/XmlRpc/Version
+++ b/sope-xml/XmlRpc/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=30
+SUBMINOR_VERSION:=31

diff --git a/sope-xml/XmlRpc/XmlRpcDecoder.m b/sope-xml/XmlRpc/XmlRpcDecoder.m
index 4965f4f4236531b00532e438807171ad943196d6..eb19825667d99d7c35a54448ad302e9a7e3930d0 100644 (file)
--- a/sope-xml/XmlRpc/XmlRpcDecoder.m
+++ b/sope-xml/XmlRpc/XmlRpcDecoder.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2007 SKYRIX Software AG
+  Copyright (C) 2007      Helge Hess
 
   This file is part of SOPE.
 
@@ -206,7 +207,7 @@ static BOOL  doDebug         = NO;
 - (id)_decodeValueOfClass:(Class)_class {
   id obj;
   
-  obj = [[self->valueStack lastObject] value];
+  obj = [(XmlRpcValue *)[self->valueStack lastObject] value];
 
   if ([obj isKindOfClass:_class])
     return obj;
@@ -401,7 +402,7 @@ static BOOL  doDebug         = NO;
     className = [value className];
 
     if ([className length] == 0) {
-      object = [value value];
+      object = [(XmlRpcValue *)value value];
     }
     else if ((objClass = NSClassFromString(className)) != Nil) {
       object = [objClass decodeObjectWithXmlRpcCoder:self];
@@ -409,7 +410,7 @@ static BOOL  doDebug         = NO;
     else {
       NSLog(@"%s: class (%@) specified by value (%@) wasn't found.",
             __PRETTY_FUNCTION__, className, value);
-      object = [value value];
+      object = [(XmlRpcValue *)value value];
     }
 
     if (object) [self->unarchivedObjects addObject:object];
@@ -427,7 +428,7 @@ static BOOL  doDebug         = NO;
   NSEnumerator        *keyEnum;
   NSString            *key;
   
-  dict  = (NSDictionary *)[[self->valueStack lastObject] value];
+  dict  = (NSDictionary *)[(XmlRpcValue *)[self->valueStack lastObject] value];
   
   if (!([dict respondsToSelector:@selector(keyEnumerator)] &&
         [dict respondsToSelector:@selector(objectForKey:)]))
@@ -456,7 +457,7 @@ static BOOL  doDebug         = NO;
   NSEnumerator   *valEnum;
   XmlRpcValue    *val      = nil;
   
-  array = (NSArray *)[[self->valueStack lastObject] value];
+  array = (NSArray *)[(XmlRpcValue *)[self->valueStack lastObject] value];
   if (![array respondsToSelector:@selector(objectEnumerator)])
     return nil;
 
@@ -526,7 +527,7 @@ static BOOL  doDebug         = NO;
   XmlRpcValue  *newValue;
   NSDictionary *obj;
   
-  obj = (NSDictionary *)[[self->valueStack lastObject] value];
+  obj = (NSDictionary *)[(XmlRpcValue *)[self->valueStack lastObject] value];
   NSAssert(_key != nil, @"_key is not allowed to be nil");
   
   if (![obj isKindOfClass:DictionaryClass]) {

diff --git a/sope-xml/XmlRpc/XmlRpcSaxHandler.m b/sope-xml/XmlRpc/XmlRpcSaxHandler.m
index c67712fa6ea6d8776bfd1c41ac88cacef41d5331..1245b9b6c4878474646379b16e5d332116b353b0 100644 (file)
--- a/sope-xml/XmlRpc/XmlRpcSaxHandler.m
+++ b/sope-xml/XmlRpc/XmlRpcSaxHandler.m
@@ -99,7 +99,7 @@ static BOOL  doDebug         = NO;
 /* *** */
 
 - (void)_addValueToParas:(id)_value {
-  id topValue = [[self->valueStack lastObject] value];
+  id topValue = [(XmlRpcValue *)[self->valueStack lastObject] value];
 
   if ([topValue isKindOfClass:ArrayClass])
     [topValue addObject:_value];
@@ -330,7 +330,8 @@ static BOOL  doDebug         = NO;
 }
 
 - (void)start_member:(id<SaxAttributes>)_attrs {
-  if (![[[self->valueStack lastObject] value] isKindOfClass:DictionaryClass]) {
+  if (![[(XmlRpcValue *)[self->valueStack lastObject] value] 
+        isKindOfClass:DictionaryClass]) {
     self->invalidCall = YES;
   }
   else {
@@ -345,7 +346,7 @@ static BOOL  doDebug         = NO;
 - (void)end_member {
   id tmp; // TODO: can't we type the var?
 
-  tmp = [[self->valueStack lastObject] value];
+  tmp = [(XmlRpcValue *)[self->valueStack lastObject] value];
 
   if ([self->memberNameStack count] != [self->memberValueStack count]) {
     NSLog(@"Warning(%s): memberNameStack.count != memberValueStack.count"