From b1e99046a3b2d43f15438fa84eb64d249eed1e54 Mon Sep 17 00:00:00 2001
From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Sun, 5 Dec 2004 16:57:28 +0000
Subject: [PATCH] minor code cleanups

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@428 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---
 sope-core/EOControl/ChangeLog                      |  4 ++++
 sope-core/EOControl/EOKeyGlobalID.m                |  7 ++++---
 sope-core/EOControl/Version                        |  2 +-
 sope-core/NGExtensions/ChangeLog                   |  5 +++++
 .../NGExtensions/EOExt.subproj/EOCacheDataSource.m | 14 ++++++--------
 .../EOExt.subproj/EOFilterDataSource.m             |  1 -
 sope-core/NGExtensions/Version                     |  2 +-
 7 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/sope-core/EOControl/ChangeLog b/sope-core/EOControl/ChangeLog
index e911485f..fc4fffab 100644
--- a/sope-core/EOControl/ChangeLog
+++ b/sope-core/EOControl/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-05  Helge Hess  <helge.hess@opengroupware.org>
+
+	* EOKeyGlobalID.m: minor code cleanup (v4.5.49)
+
 2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
 
 	* added hack to install the project in FHS locations - the library,
diff --git a/sope-core/EOControl/EOKeyGlobalID.m b/sope-core/EOControl/EOKeyGlobalID.m
index a7823ee8..a5988bf8 100644
--- a/sope-core/EOControl/EOKeyGlobalID.m
+++ b/sope-core/EOControl/EOKeyGlobalID.m
@@ -31,7 +31,8 @@
 {
   EOKeyGlobalID *kid;
 
-  NSAssert1(_count > 0, @"missing key-values (count is 0, entity is %@", _name);
+  NSAssert1(_count > 0, 
+	    @"missing key-values (count is 0, entity is %@", _name);
   
   if ((kid = (id)NSAllocateObject(self, sizeof(id) * _count, _zone))) {
     unsigned int i;
@@ -43,8 +44,8 @@
 
     return [kid autorelease];
   }
-  else
-    return nil;
+  
+  return nil;
 }
 
 - (void)dealloc {
diff --git a/sope-core/EOControl/Version b/sope-core/EOControl/Version
index 9c2df247..704a8fa2 100644
--- a/sope-core/EOControl/Version
+++ b/sope-core/EOControl/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=48
+SUBMINOR_VERSION:=49
diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog
index 6344ef30..da44ef5c 100644
--- a/sope-core/NGExtensions/ChangeLog
+++ b/sope-core/NGExtensions/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-05  Helge Hess  <helge.hess@opengroupware.org>
+
+	* EOFilterDataSource.m, EOCacheDataSource.m: minor code cleanups
+	  (v4.5.139)
+
 2004-11-24  Helge Hess  <helge.hess@opengroupware.org>
 
 	* FdExt.subproj/NSObject+Logs.m: fixed debug logging to be compatible
diff --git a/sope-core/NGExtensions/EOExt.subproj/EOCacheDataSource.m b/sope-core/NGExtensions/EOExt.subproj/EOCacheDataSource.m
index 7c203340..2c1f8c4f 100644
--- a/sope-core/NGExtensions/EOExt.subproj/EOCacheDataSource.m
+++ b/sope-core/NGExtensions/EOExt.subproj/EOCacheDataSource.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 //#define PROFILE 1
 
@@ -118,13 +117,14 @@
   return self->cache;
 }
 
+- (void)setFetchSpecification:(EOFetchSpecification *)_fetchSpec {
+  [self->source setFetchSpecification:_fetchSpec];
+}
 - (EOFetchSpecification *)fetchSpecification {
   return [self->source fetchSpecification];
 }
 
-- (void)setFetchSpecification:(EOFetchSpecification *)_fetchSpec {
-  [self->source setFetchSpecification:_fetchSpec];
-}
+/* operations */
 
 - (void)insertObject:(id)_obj {
   [self _clearCache];
@@ -164,9 +164,7 @@
   return fmt;
 }
 
-@end /* EOCacheDataSource */
-
-@implementation EOCacheDataSource(Private)
+/* private methods */
 
 - (void)_registerForSource:(id)_source {
   static NSNotificationCenter *nc = nil;
@@ -212,4 +210,4 @@
   }
 }
 
-@end /* EOCacheDataSource(Private) */
+@end /* EOCacheDataSource */
diff --git a/sope-core/NGExtensions/EOExt.subproj/EOFilterDataSource.m b/sope-core/NGExtensions/EOExt.subproj/EOFilterDataSource.m
index 1dae5cc0..760e7054 100644
--- a/sope-core/NGExtensions/EOExt.subproj/EOFilterDataSource.m
+++ b/sope-core/NGExtensions/EOExt.subproj/EOFilterDataSource.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "EOFilterDataSource.h"
 #include "EODataSource+NGExtensions.h"
diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version
index 4c0618b6..bc7a0732 100644
--- a/sope-core/NGExtensions/Version
+++ b/sope-core/NGExtensions/Version
@@ -1,6 +1,6 @@
 # version
 
-SUBMINOR_VERSION:=138
+SUBMINOR_VERSION:=139
 
 # v4.3.115 requires libFoundation v1.0.59
 # v4.2.72  requires libEOControl  v4.2.39
-- 
2.39.5