fixed some Xcode warnings

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

diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog
index a80b11d577392b40ebde4e25381167fdcd822db8..3a4a479b91dfd342aac09a89d241d81f1498590e 100644 (file)
--- a/sope-appserver/SoOFS/ChangeLog
+++ b/sope-appserver/SoOFS/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-04  Helge Heß  <helge.hess@opengroupware.org>
+
+       * common.h: streamline NeXT/APPLE/COCOA Foundation library define into
+         just COCOA_Foundation_LIBRARY (fixes a warning) (v4.5.14)
+
 2005-01-04  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * OFSWebMethodRenderer.m, OFSWebMethod.m, common.h: removed warnings

diff --git a/sope-appserver/SoOFS/common.h b/sope-appserver/SoOFS/common.h
index cf06fdf45f5e41ecb55c2b1808ad9ac02e6392dc..14f499cba62a7120ffd103286c7ec5c443ffeaae 100644 (file)
--- a/sope-appserver/SoOFS/common.h
+++ b/sope-appserver/SoOFS/common.h
@@ -24,7 +24,10 @@
 
 #import <Foundation/Foundation.h>
 
-#if NeXT_Foundation_LIBRARY || APPLE_FOUNDATION_LIBRARY
+#if NeXT_Foundation_LIBRARY || APPLE_FOUNDATION_LIBRARY || \
+    COCOA_Foundation_LIBRARY
+#define COCOA_Foundation_LIBRARY 1
+
 #  include <NGExtensions/NGObjectMacros.h>
 #  include <NGExtensions/NSString+Ext.h>
 #endif

diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog
index f006f0dd3e92c5d96de0cf821f4f232130bb74bd..8c7bd601d9f4e927a6a46b93cbf681ae7f647def 100644 (file)
--- a/sope-gdl1/GDLAccess/ChangeLog
+++ b/sope-gdl1/GDLAccess/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-04  Helge Hess  <helge.hess@opengroupware.org>
+
+       * EOAttribute.m, EOFaultHandler.m, EODatabaseFaultResolver.m: added 
+         casts to avoid compile warnings with Xcode (v4.5.44)
+
 2004-12-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v4.5.43

diff --git a/sope-gdl1/GDLAccess/EOAttribute.m b/sope-gdl1/GDLAccess/EOAttribute.m
index 5f857a8151efe870aec1455cd9f466d61d0c0cab..09b4945343a205a1c3dad9736d79740e7ac132b4 100644 (file)
--- a/sope-gdl1/GDLAccess/EOAttribute.m
+++ b/sope-gdl1/GDLAccess/EOAttribute.m
@@ -23,7 +23,6 @@
    If not, write to the Free Software Foundation,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
-
 // $Id: EOAttribute.m 1 2004-08-20 10:38:46Z znek $
 
 #import "common.h"
@@ -630,7 +629,7 @@ static inline void _addToPropList(NSMutableDictionary *propertyList,
     if (NSDataClass   == nil) NSDataClass   = [NSData   class];
     if (NSStringClass == nil) NSStringClass = [NSString class];
     
-    if ([[*_value class] isKindOfClass:NSDataClass]) {
+    if ([(NSObject *)[*_value class] isKindOfClass:NSDataClass]) {
       unsigned len;
       
       len = [*_value length];
@@ -652,7 +651,7 @@ static inline void _addToPropList(NSMutableDictionary *propertyList,
         return e;
       }
     }
-    else if ([[*_value class] isKindOfClass:NSStringClass]) {
+    else if ([(NSObject *)[*_value class] isKindOfClass:NSStringClass]) {
       unsigned len;
       
       len = [*_value cStringLength];

diff --git a/sope-gdl1/GDLAccess/EODatabaseFaultResolver.m b/sope-gdl1/GDLAccess/EODatabaseFaultResolver.m
index e0e194047f74d8e7dccf485d7b0e3ad6d15708cd..dbd6fd166104e1330ebe712416a8e06400d5928a 100644 (file)
--- a/sope-gdl1/GDLAccess/EODatabaseFaultResolver.m
+++ b/sope-gdl1/GDLAccess/EODatabaseFaultResolver.m
@@ -92,7 +92,7 @@
     self->qualifier  = RETAIN(aQualifier);
     self->fetchOrder = RETAIN(aFetchOrder);
 
-    NSAssert([self->targetClass isKindOfClass:[NSArray class]],
+    NSAssert([(NSObject *)self->targetClass isKindOfClass:[NSArray class]],
              @"target class of an array fault is not an array class");
   }
   return self;
@@ -120,7 +120,7 @@
   unsigned int oldRetainCount;
   BOOL         inTransaction;
 
-  NSAssert([self->targetClass isKindOfClass:[NSArray class]],
+  NSAssert([(NSObject *)self->targetClass isKindOfClass:[NSArray class]],
            @"target class of an array fault is not an array class");
   
   oldRetainCount = [_fault retainCount];

diff --git a/sope-gdl1/GDLAccess/EOFaultHandler.m b/sope-gdl1/GDLAccess/EOFaultHandler.m
index a52a9c6e93df743712aff22194dff52277a7b8df..4085cbc6d311c39ec491b21f6418000282450f57 100644 (file)
--- a/sope-gdl1/GDLAccess/EOFaultHandler.m
+++ b/sope-gdl1/GDLAccess/EOFaultHandler.m
@@ -92,7 +92,7 @@
   return (class_get_instance_method(class, _selector) != NULL) ? YES : NO;
 #else
 #  warning TODO: use NeXT/Apple runtime function
-  return [class methodForSelector:_selector] ? YES : NO;
+  return [(NSObject *)class methodForSelector:_selector] ? YES : NO;
 #endif
 }
 

diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version
index e36353c1a044250e0d10bff877f255562900d2a9..6053c6f7a2b02babe820f9a14b93d8c915f7ee4f 100644 (file)
--- a/sope-gdl1/GDLAccess/Version
+++ b/sope-gdl1/GDLAccess/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=43
+SUBMINOR_VERSION:=44

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index 8f6174e4c0dcd2a0108a153f29f3398dbff8b16b..058be256d0c24b788fad02af1e2803a7894cb1bc 100644 (file)
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-04  Helge Hess  <helge.hess@opengroupware.org>
+
+       * NGImap4: fixed a small warning with Xcode (v4.5.205)
+       
 2004-12-09  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGMime: fixed an issue with future date headers and libFoundation

diff --git a/sope-mime/NGImap4/ChangeLog b/sope-mime/NGImap4/ChangeLog
index 4be5fd0396c34adb860f53bc97bc2040acdba34b..11cf5b7984e824351d3866860f5e5b8190d5777b 100644 (file)
--- a/sope-mime/NGImap4/ChangeLog
+++ b/sope-mime/NGImap4/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-04  Helge Hess  <helge.hess@opengroupware.org>
+
+       * NGSieveClient.m: fixed a warning when compiling with Xcode
+
 2004-12-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * NGImap4.xcode: minor fixes and updated

diff --git a/sope-mime/NGImap4/NGSieveClient.m b/sope-mime/NGImap4/NGSieveClient.m
index fc3275e199e7740e8f4717dae9fbee33c4f2d66b..b37496046912b9fcb403e4b825858e3611bc75ef 100644 (file)
--- a/sope-mime/NGImap4/NGSieveClient.m
+++ b/sope-mime/NGImap4/NGSieveClient.m
@@ -224,7 +224,7 @@ static BOOL     debugImap4         = NO;
     return nil;
   }
   
-  self->io     = [[NGBufferedStream alloc] initWithSource:self->socket];
+  self->io     = [[NGBufferedStream alloc] initWithSource:(id)self->socket];
   self->parser = [[NGImap4ResponseParser alloc] initWithStream:self->socket];
 
   /* receive greeting from server without tag-id */

diff --git a/sope-mime/Version b/sope-mime/Version
index cef3b420af657e395ce6c78a280c0063b0f15855..7c6993739c655e462e164cd24d99d194caa8c680 100644 (file)
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,6 +2,6 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=5
-SUBMINOR_VERSION:=204
+SUBMINOR_VERSION:=205
 
 # v4.2.149 requires libNGStreams v4.2.34