* EOControl/EOFetchSpecification.h/m

(allVariablesRequiredFromBindings): Rename to
        requiresAllQualifierBindingVariables.
        (-setRequiresAllQualifierBindingVariables:)
        (-requiresAllQualifierBindingVariables): Implement.
        (-setAllVariablesRequiredFromBindings:)
        (-allVariablesRequiredFromBindings): Deprecate.
        Update various setter methods to make them promotion safe.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20657 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -92,6 +92,15 @@
 
 	([NSObject-dealloc]): Added hack to automagically deregister
 	objects fromm the editing context and association mappings.
+
+	* EOControl/EOFetchSpecification.h/m 
+	(allVariablesRequiredFromBindings): Rename to
+	requiresAllQualifierBindingVariables.
+	(-setRequiresAllQualifierBindingVariables:)
+	(-requiresAllQualifierBindingVariables): Implement.
+	(-setAllVariablesRequiredFromBindings:)
+	(-allVariablesRequiredFromBindings): Deprecate.
+	Update various setter methods to make them promotion safe.
 	
 2005-02-02  Matt Rice  <ratmice@yahoo.com>
 

EOControl/EOFetchSpecification.h

@@ -60,7 +60,7 @@
     unsigned locksObjects:1;
     unsigned refreshesRefetchedObjects:1;
     unsigned promptsAfterFetchLimit:1;
-    unsigned allVariablesRequiredFromBindings:1;
+    unsigned requiresAllQualifierBindingVariables:1;
     unsigned reserved:26;
   }_flags;
 }
@@ -127,8 +127,8 @@
 - (void)setPromptsAfterFetchLimit: (BOOL)promptsAfterFetchLimit;
 - (BOOL)promptsAfterFetchLimit;
 
-- (void)setAllVariablesRequiredFromBindings: (BOOL)allVariablesRequired;
-- (BOOL)allVariablesRequiredFromBindings;
+- (void)setRequiresAllQualifierBindingVariables: (BOOL)flag;
+- (BOOL)requiresAllQualifierBindingVariables;
 
 - (void)setPrefetchingRelationshipKeyPaths: (NSArray *)prefetchingRelationshipKeys;
 - (NSArray *)prefetchingRelationshipKeyPaths;
@@ -146,9 +146,6 @@
 - (NSArray *)rawRowKeyPaths;
 - (void)setRawRowKeyPaths: (NSArray *)rawRowKeyPaths;
 
-- (BOOL)requiresAllQualifierBindingVariables;
-- (void)setRequiresAllQualifierBindingVariables: (BOOL)flag;
-
 @end
 
 GDL2CONTROL_EXPORT NSString *EOPrefetchingRelationshipHintKey;

EOControl/EOFetchSpecification.m

@@ -283,7 +283,7 @@ setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables
         [unarchiver decodeBoolForKey: @"refreshesRefetchedObjects"];
       _flags.promptsAfterFetchLimit = 
         [unarchiver decodeBoolForKey: @"promptsAfterFetchLimit"];
-      _flags.allVariablesRequiredFromBindings = 
+      _flags.requiresAllQualifierBindingVariables = 
         [unarchiver decodeBoolForKey: @"requiresAllQualifierBindingVariables"];
     }
 
@@ -306,21 +306,21 @@ setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables
             forKey:@"prefetchingRelationshipKeyPaths"];
   [archiver encodeInt:_fetchLimit
             forKey:@"fetchLimit"];
-  [archiver encodeBool:_flags.usesDistinct
+  [archiver encodeBool:_flags.usesDistinct ? YES : NO
             forKey:@"usesDistinct"];
-  [archiver encodeBool:_flags.isDeep
+  [archiver encodeBool:_flags.isDeep ? YES : NO
             forKey:@"isDeep"];
-  [archiver encodeBool:_flags.locksObjects
+  [archiver encodeBool:_flags.locksObjects ? YES : NO
             forKey:@"locksObjects"];
-  [archiver encodeBool:_flags.refreshesRefetchedObjects
+  [archiver encodeBool:_flags.refreshesRefetchedObjects ? YES : NO
             forKey:@"refreshesRefetchedObjects"];
-  [archiver encodeBool:_flags.promptsAfterFetchLimit
+  [archiver encodeBool:_flags.promptsAfterFetchLimit ? YES : NO
             forKey:@"promptsAfterFetchLimit"];
-  [archiver encodeBool:_flags.refreshesRefetchedObjects
+  [archiver encodeBool:_flags.refreshesRefetchedObjects ? YES : NO
             forKey:@"refreshesRefetchedObjects"];
-  [archiver encodeBool:_flags.promptsAfterFetchLimit
+  [archiver encodeBool:_flags.promptsAfterFetchLimit ? YES : NO
             forKey:@"promptsAfterFetchLimit"];
-  [archiver encodeBool:_flags.allVariablesRequiredFromBindings
+  [archiver encodeBool:_flags.requiresAllQualifierBindingVariables ? YES : NO
             forKey:@"requiresAllQualifierBindingVariables"];
 }
 
@@ -354,7 +354,7 @@ setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables
   [desc appendString: [NSString stringWithFormat: @"promptsAfterFetchLimit = %s;\n", 
 				_flags.promptsAfterFetchLimit ? "YES" : "NO"]];
   [desc appendString: [NSString stringWithFormat: @"requiresAllQualifierBindingVariables = %s;\n", 
-				_flags.allVariablesRequiredFromBindings ? "YES" : "NO"]];
+				_flags.requiresAllQualifierBindingVariables ? "YES" : "NO"]];
   [desc appendString: @"}"];
 
   return desc;
@@ -392,10 +392,10 @@ setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables
   return _qualifier;
 }
 
-- (void)setUsesDistinct: (BOOL)usesDistinct
+- (void)setUsesDistinct: (BOOL)flag
 {
   [self willChange];
-  _flags.usesDistinct = usesDistinct;
+  _flags.usesDistinct = flag ? YES : NO;
 }
 
 - (BOOL)usesDistinct
@@ -406,7 +406,7 @@ setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables
 - (void)setIsDeep: (BOOL)isDeep
 {
   [self willChange];
-  _flags.isDeep = isDeep;
+  _flags.isDeep = isDeep ? YES : NO;
 }
 
 - (BOOL)isDeep
@@ -417,7 +417,7 @@ setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables
 - (void)setLocksObjects: (BOOL)locksObjects
 {
   [self willChange];  
-  _flags.locksObjects = locksObjects;
+  _flags.locksObjects = locksObjects ? YES : NO;
 }
 
 - (BOOL)locksObjects
@@ -428,7 +428,7 @@ setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables
 - (void)setRefreshesRefetchedObjects: (BOOL)refreshesRefetchedObjects
 {
   [self willChange];  
-  _flags.refreshesRefetchedObjects = refreshesRefetchedObjects;
+  _flags.refreshesRefetchedObjects = refreshesRefetchedObjects ? YES : NO;
 }
 
 - (BOOL)refreshesRefetchedObjects
@@ -450,7 +450,7 @@ setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables
 - (void)setPromptsAfterFetchLimit: (BOOL)promptsAfterFetchLimit
 {
   [self willChange];  
-  _flags.promptsAfterFetchLimit = promptsAfterFetchLimit;
+  _flags.promptsAfterFetchLimit = promptsAfterFetchLimit ? YES : NO;
 }
 
 - (BOOL)promptsAfterFetchLimit
@@ -458,14 +458,14 @@ setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables
   return _flags.promptsAfterFetchLimit;
 }
 
-- (void)setAllVariablesRequiredFromBindings: (BOOL)allVariablesRequired
+- (void)setRequiresAllQualifierBindingVariables: (BOOL)flag
 {
-  _flags.allVariablesRequiredFromBindings = allVariablesRequired;
+  _flags.requiresAllQualifierBindingVariables = flag ? YES : NO;
 }
 
-- (BOOL)allVariablesRequiredFromBindings
+- (BOOL)requiresAllQualifierBindingVariables
 {
-  return _flags.allVariablesRequiredFromBindings;
+  return _flags.requiresAllQualifierBindingVariables;
 }
 
 - (void)setPrefetchingRelationshipKeyPaths: (NSArray *)prefetchingRelationshipKeys
@@ -574,16 +574,20 @@ setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables
   ASSIGN(_rawAttributeKeys, rawRowKeyPaths);
 }
 
-- (BOOL)requiresAllQualifierBindingVariables
+@end
+
+@implementation EOFetchSpecification (deprecated)
+- (BOOL)allVariablesRequiredFromBindings
 {
-  NSDebugMLLog(@"gsdb", @"self=%p", self);
-  return _flags.allVariablesRequiredFromBindings;
+  NSLog(@"DEPRECATED: Use requiresAllQualifierBindingVariables");
+  return [self requiresAllQualifierBindingVariables];
 }
 
-- (void)setRequiresAllQualifierBindingVariables: (BOOL)flag
+- (void)setAllVariablesRequiredFromBindings: (BOOL)flag
 {
-  [self willChange];  
-  [self notImplemented: _cmd];
+  NSLog(@"DEPRECATED: Use setRequiresAllQualifierBindingVariables:");
+  [self setRequiresAllQualifierBindingVariables: flag];
 }
 
 @end
+