fixed gcc 4.0 warnings

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

diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog
index 89f6c91a58d530dd3237288a98a1bec15cdd1994..2f089c10172a11ce03736b6a8427491ee8a7d474 100644 (file)
--- a/sope-appserver/SoOFS/ChangeLog
+++ b/sope-appserver/SoOFS/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-06  Helge Hess  <helge.hess@opengroupware.org>
+
+       * OFSResourceManager.m, OFSFolderDataSource.m, OFSPropertyListObject.m:
+         fixed gcc 4.0 warnings (v4.5.18)
+
 2005-07-23  Sebastian Reitenbach  <reitenbach@rapideye.de>
 
        * GNUmakefile.preamble: added OpenBSD linking flags (v4.5.17)

diff --git a/sope-appserver/SoOFS/OFSFolderDataSource.m b/sope-appserver/SoOFS/OFSFolderDataSource.m
index 79494dbba68440fa50a125832e13f70fec8eb6fe..accb379a3a91af282c6f29dd91e12f0889ce492f 100644 (file)
--- a/sope-appserver/SoOFS/OFSFolderDataSource.m
+++ b/sope-appserver/SoOFS/OFSFolderDataSource.m
@@ -187,7 +187,7 @@
     [self clear];
     return nil;
   }
-  if ((object = [self->folder objectForKey:nextName]) == nil) {
+  if ((object = [(NSDictionary *)self->folder objectForKey:nextName]) == nil) {
     [self clear];
     return nil;
   }

diff --git a/sope-appserver/SoOFS/OFSPropertyListObject.m b/sope-appserver/SoOFS/OFSPropertyListObject.m
index 85a07e00ec7f52df85322b03276c30fb5ff7cb88..8de2960f93e69e56c634d141b75d399447349149 100644 (file)
--- a/sope-appserver/SoOFS/OFSPropertyListObject.m
+++ b/sope-appserver/SoOFS/OFSPropertyListObject.m
@@ -325,7 +325,7 @@ static int debugOn = 0;
   return self;
 }
 
-- (id)PUTAction:(id)_ctx {
+- (id)PUTAction:(WOContext *)_ctx {
   return [NSException exceptionWithHTTPStatus:405 /* method not allowed */
                      reason:@"HTTP PUT not yet allowed on plist objects"];
 }

diff --git a/sope-appserver/SoOFS/OFSResourceManager.m b/sope-appserver/SoOFS/OFSResourceManager.m
index a9f545ea345a8cb193e105c7bb6ea31172cb61c2..543c3c8a5c1c80b3ce426a74d57422fe6eefbcb3 100644 (file)
--- a/sope-appserver/SoOFS/OFSResourceManager.m
+++ b/sope-appserver/SoOFS/OFSResourceManager.m
@@ -73,7 +73,7 @@ static BOOL debugOn = NO;
 
 - (id)context {
   if (self->context == nil)
-    return [[WOApplication application] context];
+    return [(WOApplication *)[WOApplication application] context];
   return self->context;
 }
 

diff --git a/sope-appserver/SoOFS/Version b/sope-appserver/SoOFS/Version
index 3c3eedfd9be9674738563e52ca04e222c558e0b0..c5124e5be73d79dfb4c67752a53780a8cd7f4073 100644 (file)
--- a/sope-appserver/SoOFS/Version
+++ b/sope-appserver/SoOFS/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=17
+SUBMINOR_VERSION:=18

diff --git a/sope-appserver/SoOFS/sope.m b/sope-appserver/SoOFS/sope.m
index 7e699963dc47b1acc92edcf72ad4989e96f516db..30add8671f7335b66200367c111a28d8edaab4b6 100644 (file)
--- a/sope-appserver/SoOFS/sope.m
+++ b/sope-appserver/SoOFS/sope.m
@@ -160,7 +160,7 @@ static BOOL debugRootObject = NO;
 
 /* define the root SoObject */
 
-- (OFSFolder *)rootObjectInContext:(id)_ctx {
+- (id)rootObjectInContext:(id)_ctx {
   OFSFactoryContext *ctx;
   OFSFolder *root;