minor code cleanups

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

diff --git a/sope-core/EOControl/ChangeLog b/sope-core/EOControl/ChangeLog
index e911485fe8f57bd90b0204f527702044726d83ff..fc4fffab613c91591dbcc4749648d79adcfb4db1 100644 (file)
--- 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 a7823ee8983d7ff61cce9b3744240f5ee8d1933b..a5988bf81879cc8a302091d1126253600a34fc9a 100644 (file)
--- 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 9c2df247a496f1acd4f3a8921372e447845bb7ef..704a8fa27d1346e21ef88404845e691f6c157dca 100644 (file)
--- 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 6344ef3027a376b868bfa4422d95b23c0f03e24a..da44ef5cde37f837d771667e66073e2fb553ef78 100644 (file)
--- 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 7c20334073e256885ede79907e95f4dc60ac1215..2c1f8c4fa4f748751249fb8717feeebcc2ab3f9d 100644 (file)
--- 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 1dae5cc0f60c25f3dfed60b063cdc75717845057..760e70548b3b610446dfd7c4c07f574e3ee26a66 100644 (file)
--- 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 4c0618b61bff12413ec9b8633faa04b93bb2c5ad..bc7a0732529bda9c72616fd5f14b41620389ac72 100644 (file)
--- 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