From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Sat, 6 Aug 2005 18:25:25 +0000 (+0000)
Subject: fixed gcc 4.0 warnings
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc3f71278691c098462318fff1563f6be30d09f4;p=sope

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 89f6c91a..2f089c10 100644
--- 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 79494dbb..accb379a 100644
--- 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 85a07e00..8de2960f 100644
--- 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 a9f545ea..543c3c8a 100644
--- 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 3c3eedfd..c5124e5b 100644
--- 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 7e699963..30add867 100644
--- 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;