* EOAccess/EOSQLExpression.h (deleteStatementWithQualifier:entity:)

* EOAccess/EOSQLExpressionPriv.h (_aliasForRelationshipPath:)
	(_flattenRelPath:entity:, _aliasForRelatedAttribute:relationshipPath:)
	* EOAccess/EOSQLExpression.m (insertStatementForRow:entity:)
	(updateStatementForRow:qualifier:entity:)
	(deleteStatementWithQualifier:entity:)
	(selectStatementForAttributes🔒fetchSpecification:entity:)
	(_aliasForRelationshipPath:)
	* EOAccess/EORelationship.h (intermediateEntity)
	(_foreignKeyForSourceRow:)
	* EOAccess/EORelationship.m (_foreignKeyForSourceRow:, _leftSideKeyMap)
	* EOAccess/EODatabaseContext.h (databaseOperationForObject:)
	(databaseOperationForGlobalID:, recordDatabaseOperation:)
	(_openChannelWithLoginPanel:)
	* EOAccess/EODatabaseContextPriv.h (primaryKeyForObject:)
	(_currentCommittedSnapshotForObject:)
	* EOAccess/EOEntityPriv.h (_keyMapForRelationshipPath:)
	(_keyMapForIdenticalKeyRelationshipPath:, _mapAttribute:)
	(_relationshipPathIsToMany: valueForSQLExpression:)
	(_parsePropertyName:, classPropertyAttributeNames)
	(classPropertyToManyRelationshipNames)
	(classPropertyToOneRelationshipNames, dbSnapshotKeys)
	* EOAccess/EOUtilities.m (rawRowsForEntityNamed:qualifierFormat:)
	(rawRowsMatchingValue:forKey:entityNamed:)
	(rawRowsMatchingValues:entityNamed:, rawRowsWithSQL:modelNamed:)
	(rawRowsWithStoredProcedureNamed:arguments:)
	(executeStoredProcedureNamed:arguments:, databaseContextForModelNamed:)
	(primaryKeyForObject:)
	(destinationKeyForSourceObject:relationshipNamed:)
	* EOAccess/EOEntity.m
	(_mapAttribute:toDestinationAttributeInLastComponentOfRelationshipPath:)
	* EOAccess/EOAdaptor.h (adaptorWithModel:,adaptorWithName:)
	* EOAccess/EOModel.h (_classDescriptionNeeded:,_entityForClass:)
	(_addEntityWithPropertyList:)
	* EOAdaptors/Postgres95/Postgres95Channel.h
	(_evaluateExpression:withAttributes:)
	* EOControl/EOMutableKnownKeyDictionary.h/m (arrayMappingForKeys:)
	(subsetMappingForSourceDictionaryInitializer:sourceKeys:destinationKeys:)
	(subsetMappingForSourceDictionaryInitializer:)
	(setObject:forKey:, removeObjectForKey:, indexForKey:, objectForKey:)
	* EOControl/EOEditingContext.m (handleErrors:,setSharedEditingContext:)
	(faultForRawRow:entityNamed:)
	* GDL2Palette/KeyWrapper.h (setKey:, _key):
	* EOModeler/EOModelerEditor.h (selectionWithinViewedObject)
	* EOModeler/EOModelerEditor.m (initWithDocument:)
	(initWithParentEditor:)
	Correct method signatures.  Add necessary forward @class declations.

	* EOInterface/EOMasterDetailAssociation.m (establishConnection):
	* DBModeler/ModelerTableEmbedibleEditor.m
	(addDefaultTableColumnsForTableView:displayGroup:)
	* DBModeler/DefaultColumnProvider.m (setupTitleForColumn:named:)
	Cast types to avoid compiler warnings.

	* EOControl/EOCheapArray.m (dealloc): Supress compiler warning.
	* EOAdaptors/Postgres95/LoginPanel/Postgres95LoginPanel.m (dealloc)
	* EOModeler/EOModelerEditor.m (dealloc):
	* DBModeler/ModelerAttributeEditor.m (dealloc): Add missing call
	to super.
	* DBModeler/Preferences.m (sharedPreferences): Fix implementation for
	new compiler semantics.
	* EOControl/EOMultiReaderLock.m (init): Correct NSConditionLock
	initialization.


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

ChangeLog

@@ -3,6 +3,70 @@
 	* Version: Update to 0.10.0
 	* GNUmakefile: Set package name for release targets.
 
+	* EOAccess/EOSQLExpression.h (deleteStatementWithQualifier:entity:)
+	* EOAccess/EOSQLExpressionPriv.h (_aliasForRelationshipPath:)
+	(_flattenRelPath:entity:, _aliasForRelatedAttribute:relationshipPath:)
+	* EOAccess/EOSQLExpression.m (insertStatementForRow:entity:)
+	(updateStatementForRow:qualifier:entity:)
+	(deleteStatementWithQualifier:entity:)
+	(selectStatementForAttributes:lock:fetchSpecification:entity:)
+	(_aliasForRelationshipPath:)
+	* EOAccess/EORelationship.h (intermediateEntity)
+	(_foreignKeyForSourceRow:)
+	* EOAccess/EORelationship.m (_foreignKeyForSourceRow:, _leftSideKeyMap)
+	* EOAccess/EODatabaseContext.h (databaseOperationForObject:)
+	(databaseOperationForGlobalID:, recordDatabaseOperation:)
+	(_openChannelWithLoginPanel:)
+	* EOAccess/EODatabaseContextPriv.h (primaryKeyForObject:)
+	(_currentCommittedSnapshotForObject:)
+	* EOAccess/EOEntityPriv.h (_keyMapForRelationshipPath:)
+	(_keyMapForIdenticalKeyRelationshipPath:, _mapAttribute:)
+	(_relationshipPathIsToMany: valueForSQLExpression:)
+	(_parsePropertyName:, classPropertyAttributeNames)
+	(classPropertyToManyRelationshipNames)
+	(classPropertyToOneRelationshipNames, dbSnapshotKeys)
+	* EOAccess/EOUtilities.m (rawRowsForEntityNamed:qualifierFormat:)
+	(rawRowsMatchingValue:forKey:entityNamed:)
+	(rawRowsMatchingValues:entityNamed:, rawRowsWithSQL:modelNamed:)
+	(rawRowsWithStoredProcedureNamed:arguments:)
+	(executeStoredProcedureNamed:arguments:, databaseContextForModelNamed:)
+	(primaryKeyForObject:)
+	(destinationKeyForSourceObject:relationshipNamed:)
+	* EOAccess/EOEntity.m
+	(_mapAttribute:toDestinationAttributeInLastComponentOfRelationshipPath:)
+	* EOAccess/EOAdaptor.h (adaptorWithModel:,adaptorWithName:)
+	* EOAccess/EOModel.h (_classDescriptionNeeded:,_entityForClass:)
+	(_addEntityWithPropertyList:)
+	* EOAdaptors/Postgres95/Postgres95Channel.h
+	(_evaluateExpression:withAttributes:)
+	* EOControl/EOMutableKnownKeyDictionary.h/m (arrayMappingForKeys:)
+	(subsetMappingForSourceDictionaryInitializer:sourceKeys:destinationKeys:)
+	(subsetMappingForSourceDictionaryInitializer:)
+	(setObject:forKey:, removeObjectForKey:, indexForKey:, objectForKey:)
+	* EOControl/EOEditingContext.m (handleErrors:,setSharedEditingContext:)
+	(faultForRawRow:entityNamed:)
+	* GDL2Palette/KeyWrapper.h (setKey:, _key):
+	* EOModeler/EOModelerEditor.h (selectionWithinViewedObject)
+	* EOModeler/EOModelerEditor.m (initWithDocument:)
+	(initWithParentEditor:)
+	Correct method signatures.  Add necessary forward @class declations.
+
+	* EOInterface/EOMasterDetailAssociation.m (establishConnection):
+	* DBModeler/ModelerTableEmbedibleEditor.m
+	(addDefaultTableColumnsForTableView:displayGroup:)
+	* DBModeler/DefaultColumnProvider.m (setupTitleForColumn:named:)
+	Cast types to avoid compiler warnings.
+
+	* EOControl/EOCheapArray.m (dealloc): Supress compiler warning.
+	* EOAdaptors/Postgres95/LoginPanel/Postgres95LoginPanel.m (dealloc)
+	* EOModeler/EOModelerEditor.m (dealloc):
+	* DBModeler/ModelerAttributeEditor.m (dealloc): Add missing call
+	to super.
+	* DBModeler/Preferences.m (sharedPreferences): Fix implementation for
+	new compiler semantics.
+	* EOControl/EOMultiReaderLock.m (init): Correct NSConditionLock
+	initialization.
+	
 2006-09-07  Matt Rice  <ratmice@yahoo.com>
 
 	* DBModeler/Resources/DBModeler.tiff: New file.

DBModeler/DefaultColumnProvider.m

@@ -163,7 +163,7 @@ void registerColumnsForClass(struct column_info columns[], int count, Class aCla
 
 - (void) setupTitleForColumn:(NSTableColumn *)tc named:(NSString *)name
 {
-  NSTableHeaderCell *headerCell = [tc headerCell];
+  NSTableHeaderCell *headerCell = (id)[tc headerCell];
   if ([name isEqual:@"Primary key"])
     {
       NSImage *img = [NSImage imageNamed:@"Key_Header"];

DBModeler/ModelerAttributeEditor.m

@@ -165,6 +165,7 @@
   RELEASE(_mainView);
   RELEASE(_relationships_dg);
   RELEASE(_attributes_dg);
+  [super dealloc];
 }
 
 - (NSView *)mainView

DBModeler/ModelerTableEmbedibleEditor.m

@@ -78,7 +78,7 @@
   for (i = 0, c = [columnNames count]; i < c; i++)
     {
       NSString *columnName = [columnNames objectAtIndex:i];
-      NSPopUpButton *cv = [tv cornerView];
+      NSPopUpButton *cv = (id)[tv cornerView];
       NSMenuItem <NSMenuItem>*item;
       id <EOMColumnProvider>provider;
       NSTableColumn *tc = [[NSTableColumn alloc] initWithIdentifier:nil];

DBModeler/Preferences.m

@@ -68,7 +68,11 @@ static NSString *_switches[][2] =
 @implementation DBModelerPrefs : NSObject
 + (DBModelerPrefs *) sharedPreferences
 {
-  return _sharedPrefs ? _sharedPrefs : _sharedPrefs = [self new];
+  if (_sharedPrefs == nil)
+    {
+      _sharedPrefs = [self new];
+    }
+  return _sharedPrefs;
 }
 
 - (id) init

EOAccess/EOAdaptor.h

@@ -75,8 +75,8 @@ GDL2ACCESS_EXPORT NSString *EOGeneralAdaptorException;
 }
 
 /* Creating an EOAdaptor */
-+ (EOAdaptor *)adaptorWithModel: (EOModel *)model;
++ (id)adaptorWithModel: (EOModel *)model;
-+ (EOAdaptor *)adaptorWithName: (NSString *)name;
++ (id)adaptorWithName: (NSString *)name;
 
 + (void)setExpressionClassName: (NSString *)sqlExpressionClassName
               adaptorClassName: (NSString *)adaptorClassName;

EOAccess/EODatabaseContext.h

@@ -249,9 +249,9 @@ It's invoked after prepareForSaveWithCoordinator:editingContext: and before owns
 				  sourceObject: (id)sourceObject
 			     destinationObject: (id)destinationObject;
 
-- (id)databaseOperationForObject: (id)param0;
+- (EODatabaseOperation*)databaseOperationForObject: (id)object;
-- (id)databaseOperationForGlobalID: (id)param0;
+- (EODatabaseOperation*)databaseOperationForGlobalID: (EOGlobalID *)gid;
-- (void)recordDatabaseOperation: (id)param0;
+- (void)recordDatabaseOperation: (EODatabaseOperation*)databaseOpe;
 - (void)recordDeleteForObject: (id)param0;
 - (void)recordInsertForObject: (id)param0;
 
@@ -343,7 +343,7 @@ Only searches locally (in the transaction scope), not in the EODatabase. **/
 - (void)_commitTransaction;
 - (void)_beginTransaction;
 - (EODatabaseChannel *)_obtainOpenChannel;
-- (BOOL)_openChannelWithLoginPanel: (id)param0;
+- (BOOL)_openChannelWithLoginPanel: (EODatabaseChannel *)databaseChannel;
 - (void)_forceDisconnect;
 - (void)initializeObject: (id)object
                      row: (NSDictionary *)row

EOAccess/EODatabaseContextPriv.h

@@ -60,10 +60,10 @@
 
 - (void)_verifyNoChangesToReadonlyEntity: (EODatabaseOperation *)dbOpe;
 - (EOGlobalID *)_globalIDForObject: (id)object;
-- (id)_primaryKeyForObject: (id)object;
+- (NSDictionary *)_primaryKeyForObject: (id)object;
 - (NSDictionary *)_primaryKeyForObject: (id)object
 			raiseException: (BOOL)raiseException;
-- (id)_currentCommittedSnapshotForObject: (id)object;
+- (NSDictionary *)_currentCommittedSnapshotForObject: (id)object;
 - (id)_addDatabaseContextStateToException: (id)param0;
 - (id)_databaseContextState;
 - (void)_cleanUpAfterSave;

EOAccess/EOEntity.m

@@ -3765,8 +3765,8 @@ returns nil if there's no key in the instanceDictionaryInitializer
   return keyMap;
 }
 
-- (EOAttribute*) _mapAttribute: (EOAttribute*)attribute
+- (EOAttribute *)_mapAttribute: (EOAttribute *)attribute
-toDestinationAttributeInLastComponentOfRelationshipPath: (NSString*)path
+toDestinationAttributeInLastComponentOfRelationshipPath: (NSString *)path
 {
   NSArray *components = nil;
   EORelationship *rel = nil;

EOAccess/EOEntityPriv.h

@@ -32,6 +32,7 @@
 
 @class EORelationship;
 @class EOExpressionArray;
+@class EOSQLExpression;
 
 
 @interface EOEntity (EOEntityPrivate)
@@ -97,18 +98,18 @@
 
 @interface EOEntity (EOEntityRelationshipPrivate)
 - (EORelationship *)_inverseRelationshipPathForPath: (NSString *)path;
-- (id)_keyMapForRelationshipPath: (NSString *)path;
+- (NSDictionary *)_keyMapForRelationshipPath: (NSString *)path;
-- (id)_keyMapForIdenticalKeyRelationshipPath: (id)param0;
+- (NSDictionary*)_keyMapForIdenticalKeyRelationshipPath: (NSString *)path;
-- (id)_mapAttribute: (id)param0
+- (EOAttribute*)_mapAttribute: (EOAttribute*)attribute
 toDestinationAttributeInLastComponentOfRelationshipPath: (NSString *)path;
-- (BOOL)_relationshipPathIsToMany: (id)param0;
+- (BOOL)_relationshipPathIsToMany: (NSString *)relPath;
 - (BOOL)_relationshipPathHasIdenticalKeys: (id)param0;
 @end
 
 
 @interface EOEntity (EOEntitySQLExpression)
-- (id)valueForSQLExpression: (id)param0;
+- (NSString *)valueForSQLExpression: (EOSQLExpression *)sqlExpression;
-+ (id)valueForSQLExpression: (id)param0;
++ (NSString *)valueForSQLExpression: (EOSQLExpression *)sqlExpression;
 @end
 
 @interface EOEntity (EOEntityPrivateXX)
@@ -116,20 +117,20 @@ toDestinationAttributeInLastComponentOfRelationshipPath: (NSString *)path;
 				isFormat: (BOOL)isFormat
 			       arguments: (char *)param2;
 - (EOExpressionArray *)_parseRelationshipPath: (NSString *)path;
-- (id)_parsePropertyName: (id)param0;
+- (id)_parsePropertyName: (NSString *)propertyName;
 //- (id)_newStringWithBuffer: (unsigned short *)param0
 //                    length: (unsigned int *)param1;
 @end
 
 @interface EOEntity (MethodSet11)
 - (NSException *)validateObjectForDelete: (id)object;
-- (id)classPropertyAttributeNames;
+- (NSArray *)classPropertyAttributeNames;
-- (id)classPropertyToManyRelationshipNames;
+- (NSArray *)classPropertyToManyRelationshipNames;
-- (id)classPropertyToOneRelationshipNames;
+- (NSArray *)classPropertyToOneRelationshipNames;
 - (id)qualifierForDBSnapshot: (id)param0;
 - (void)_addAttributesToFetchForRelationshipPath: (NSString *)path
 					    atts: (NSMutableDictionary *)atts;
-- (id)dbSnapshotKeys;
+- (NSArray *)dbSnapshotKeys;
 - (NSArray *)flattenedAttributes;
 @end
 

EOAccess/EOModel.h

@@ -41,6 +41,7 @@
 
 @class NSArray;
 @class NSDictionary;
+@class NSNotification;
 
 @class EOEntity;
 @class EOAttribute;
@@ -137,16 +138,16 @@
 
 - (void)_resetPrototypeCache;
 - (BOOL)isPrototypesEntity: (id)param0;
-- (void)_classDescriptionNeeded: (id)param0;
+- (void)_classDescriptionNeeded: (NSNotification *)notification;
 - (id)_instantiatedEntities;
 - (void)_setPath: (NSString *)path;
-- (id)_entityForClass: (Class)param0;
+- (EOEntity *)_entityForClass: (Class)param0;
 - (id)_childrenForEntityNamed: (id)param0;
 - (void)_registerChild: (id)param0
              forParent: (id)param1;
 - (void)_setInheritanceLinks: (id)param0;
 - (void)_removeEntity: (id)param0;
-- (id)_addEntityWithPropertyList: (NSDictionary *)propertyList;
+- (EOEntity *)_addEntityWithPropertyList: (NSDictionary *)propertyList;
 - (void)_addFakeEntityWithPropertyList: (NSDictionary *)propertyList;
 - (id)_addEntity: (EOEntity *)entity;
 - (void)_setEntity: (id)entity

EOAccess/EORelationship.h

@@ -45,6 +45,7 @@
 @class EOEntity;
 @class EOAttribute;
 @class EOExpressionArray;
+@class EOMutableKnownKeyDictionary;
 @class EOMKKDSubsetMapping;
 @class EOQualifier;
 
@@ -205,7 +206,7 @@ typedef enum {
 - (NSArray *)_intermediateAttributes;
 - (EORelationship *)lastRelationship;
 - (EORelationship *)firstRelationship;
-- (id)intermediateEntity;
+- (EOEntity*) intermediateEntity;
 - (BOOL)isMultiHop;
 - (void)_setSourceToDestinationKeyMap: (id)param0;
 - (id)qualifierForDBSnapshot: (id)param0;
@@ -221,7 +222,7 @@ typedef enum {
 - (id)qualifierOmittingAuxiliaryQualifierWithSourceRow: (id)param0;
 - (id)auxiliaryQualifier;
 - (void)setAuxiliaryQualifier: (id)param0;
-- (id)_foreignKeyForSourceRow: (NSDictionary *)row;
+- (EOMutableKnownKeyDictionary *)_foreignKeyForSourceRow: (NSDictionary *)row;
 - (EOMKKDSubsetMapping *)_sourceRowToForeignKeyMapping;
 - (NSArray *)_sourceAttributeNames;
 - (EOJoin *)joinForAttribute: (EOAttribute *)attribute;

EOAccess/EORelationship.m

@@ -2168,9 +2168,9 @@ dst entity primaryKeyAttributeNames
 }
 
 /** Return dictionary of key/value for destination object of source row/object **/
-- (NSDictionary*) _foreignKeyForSourceRow: (NSDictionary*)row
+- (EOMutableKnownKeyDictionary *) _foreignKeyForSourceRow: (NSDictionary*)row
 {
-  NSDictionary *foreignKey = nil;
+  EOMutableKnownKeyDictionary *foreignKey = nil;
   EOMKKDSubsetMapping *sourceRowToForeignKeyMapping = nil;
 
   EOFLOGObjectFnStart();
@@ -2380,7 +2380,7 @@ dst entity primaryKeyAttributeNames
   return keyMap;
 }
 
-- (id) _leftSideKeyMap
+- (NSDictionary *) _leftSideKeyMap
 {
   NSDictionary *keyMap = nil;
 

EOAccess/EOSQLExpression.h

@@ -94,7 +94,7 @@ GDL2ACCESS_EXPORT NSString *EOBindVariableColumnKey;
 /* The endity parameter is typed to 'id' for signature compatibility
    with EOF.  Note that only EOEntity * objects should be passed.  */
 + (EOSQLExpression *)deleteStatementWithQualifier: (EOQualifier *)qualifier
-					   entity: (id)entity;
+					   entity: (EOEntity *)entity;
 
 + (EOSQLExpression *)selectStatementForAttributes: (NSArray *)attributes
 					     lock: (BOOL)yn

EOAccess/EOSQLExpression.m

@@ -162,7 +162,7 @@ NSString *EOBindVariableColumnKey = @"EOBindVariableColumnKey";
   return exp;
 }
 
-+ insertStatementForRow: (NSDictionary *)row
++ (EOSQLExpression *)insertStatementForRow: (NSDictionary *)row
 				    entity: (EOEntity *)entity
 {
   EOSQLExpression *sqlExpression;
@@ -182,7 +182,7 @@ NSString *EOBindVariableColumnKey = @"EOBindVariableColumnKey";
   return sqlExpression;
 }
 
-+ updateStatementForRow: (NSDictionary *)row
++ (EOSQLExpression *)updateStatementForRow: (NSDictionary *)row
 				 qualifier: (EOQualifier *)qualifier
 				    entity: (EOEntity *)entity
 {
@@ -215,7 +215,7 @@ NSString *EOBindVariableColumnKey = @"EOBindVariableColumnKey";
   return sqlExpression;
 }
 
-+ deleteStatementWithQualifier: (EOQualifier *)qualifier
++ (EOSQLExpression *)deleteStatementWithQualifier: (EOQualifier *)qualifier
 					   entity: (EOEntity *)entity
 {
   EOSQLExpression *sqlExpression;
@@ -237,7 +237,7 @@ NSString *EOBindVariableColumnKey = @"EOBindVariableColumnKey";
   return sqlExpression;
 }
 
-+ selectStatementForAttributes: (NSArray *)attributes
++ (EOSQLExpression *)selectStatementForAttributes: (NSArray *)attributes
 					     lock: (BOOL)flag
 			       fetchSpecification: (EOFetchSpecification *)fetchSpecification
 					   entity: (EOEntity *)entity
@@ -2288,7 +2288,7 @@ else if([anAttribute isDerived] == YES)
 This add a new alias if there not already one
 This also add alias for all relationships used by relationshipPath (so joinExpression can build join expressions for really all used relationships)
 All relationshipPaths in _aliasesByRelationshipPath are direct paths **/
-- (NSString*) _aliasForRelationshipPath:(NSString*)relationshipPath//toLanguage
+- (NSString*) _aliasForRelationshipPath:(NSString*)relationshipPath
 {
   //OK ?
   NSString *flattenRelPath;

EOAccess/EOSQLExpressionPriv.h

@@ -37,13 +37,13 @@
 @interface EOSQLExpression (EOSQLExpressionPrivate)
 
 - (EOEntity *)_rootEntityForExpression;
-- (id)_aliasForRelationshipPath: (id)param0;
+- (NSString*) _aliasForRelationshipPath:(NSString*)relationshipPath;
-- (id)_flattenRelPath: (id)param0
+- (NSString*) _flattenRelPath: (NSString*)relationshipPath
-	       entity: (id)param1;
+                       entity: (EOEntity*)entity;
 - (NSString *)_sqlStringForJoinSemantic: (EOJoinSemantic)joinSemantic
 			  matchSemantic: (int)param1;
-- (id)_aliasForRelatedAttribute: (id)param0
+- (NSString*) _aliasForRelatedAttribute: (EOAttribute*)attribute
-	       relationshipPath: (id)param1;
+                       relationshipPath: (NSString*)relationshipPath;
 - (id)_entityForRelationshipPath: (id)param0
 			  origin: (id)param1;
 

EOAccess/EOUtilities.m

@@ -557,7 +557,7 @@ NSString *NSObjectNotAvailableException = @"NSObjectNotAvailableException";
   return object;
 }
 
-- (id)rawRowsForEntityNamed: (NSString *)entityName
+- (NSArray *)rawRowsForEntityNamed: (NSString *)entityName
 		   qualifierFormat: (NSString *)format,...
 {
   EOQualifier *qualifier;
@@ -583,7 +583,7 @@ NSString *NSObjectNotAvailableException = @"NSObjectNotAvailableException";
   return results;
 }
 
-- (id)rawRowsMatchingValue: (id)value
+- (NSArray *)rawRowsMatchingValue: (id)value
 			   forKey: (NSString *)key
 		      entityNamed: (NSString *)entityName
 {
@@ -603,7 +603,7 @@ NSString *NSObjectNotAvailableException = @"NSObjectNotAvailableException";
   return results;
 }
 
-- (id)rawRowsMatchingValues: (NSDictionary *)values
+- (NSArray *)rawRowsMatchingValues: (NSDictionary *)values
 		       entityNamed: (NSString *)entityName
 {
   EOQualifier *qualifier;
@@ -624,7 +624,7 @@ NSString *NSObjectNotAvailableException = @"NSObjectNotAvailableException";
   return results;
 }
 
-- (id)rawRowsWithSQL: (NSString *)sqlString
+- (NSArray *)rawRowsWithSQL: (NSString *)sqlString
 		 modelNamed: (NSString *)name
 {
   EODatabaseContext *databaseContext;
@@ -666,7 +666,7 @@ NSString *NSObjectNotAvailableException = @"NSObjectNotAvailableException";
   return results;
 }
 
-- (id)rawRowsWithStoredProcedureNamed: (NSString *)name
+- (NSArray *)rawRowsWithStoredProcedureNamed: (NSString *)name
 				   arguments: (NSDictionary *)args
 {
   EODatabaseContext *databaseContext;
@@ -710,7 +710,7 @@ NSString *NSObjectNotAvailableException = @"NSObjectNotAvailableException";
   return results;
 }
 
-- (id)executeStoredProcedureNamed: (NSString *)name
+- (NSDictionary *)executeStoredProcedureNamed: (NSString *)name
 				    arguments: (NSDictionary *)args
 {
   EODatabaseContext *databaseContext;
@@ -758,7 +758,7 @@ NSString *NSObjectNotAvailableException = @"NSObjectNotAvailableException";
                entityNamed: entityName];
 }
 
-- (id)databaseContextForModelNamed: (NSString*)name
+- (EODatabaseContext *)databaseContextForModelNamed: (NSString *)name;
 {
   EOModelGroup *modelGroup;
   EOModel *model;
@@ -816,7 +816,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
   return object;
 }
 
-- (id)primaryKeyForObject: (id)object
+- (NSDictionary *)primaryKeyForObject: (id)object;
 {
   EOKeyGlobalID *gid;
   EOEntity *entity;
@@ -834,7 +834,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
   return newDict;
 }
 
-- (id)destinationKeyForSourceObject: (id)object
+- (NSDictionary *)destinationKeyForSourceObject: (id)object
 			      relationshipNamed: (NSString*)name
 {
   EODatabaseContext *databaseContext;

EOAdaptors/Postgres95/LoginPanel/Postgres95LoginPanel.m

@@ -87,6 +87,7 @@ vfmaxf (int n, float aFloat, ...)
 {
   DESTROY(_databases);
   DESTROY(_win);
+  [super dealloc];
 }
 
 - (NSString *) logoPath

EOAdaptors/Postgres95/Postgres95Channel.h

@@ -1,4 +1,4 @@
-/* 
+/* -*-objc-*-
    Postgres95Channel.h
 
    Copyright (C) 2000,2002,2003,2004,2005 Free Software Foundation, Inc.
@@ -80,8 +80,7 @@
 - (void)_describeDatabaseTypes;
 
 - (BOOL)_evaluateExpression: (EOSQLExpression *)expression
-	     withAttributes: attrs;
+	     withAttributes: (NSArray*)attributes;
-
 @end
 
 @interface NSObject (Postgres95ChannelDelegate)

EOControl/EOCheapArray.m

@@ -138,6 +138,8 @@ RCS_ID("$Id$")
     }
 
   NSDeallocateObject(self);
+  /* Suppress compiler warning.  */
+  if (0) [super dealloc];
 
 #ifdef DEBUG
   NSDebugFLog(@"Stop Dealloc EOCheapCopyArray %p. %@",
@@ -273,6 +275,8 @@ RCS_ID("$Id$")
 
   DESTROY(_immutableCopy);
   NSDeallocateObject(self);
+  /* Suppress compiler warning.  */
+  if (0) [super dealloc];
 
 #ifdef DEBUG
   NSDebugFLog(@"Stop Dealloc EOCheapCopyMutableArray %p. %@",

EOControl/EOEditingContext.m

@@ -2084,7 +2084,7 @@ _mergeValueForKey(id obj, id value,
   return ok;
 }
 
-- (BOOL) handleErrors: (id)p
+- (BOOL) handleErrors: (NSArray *)p
 {
   NSEmitTODO();
   [self notImplemented: _cmd]; //TODO
@@ -3184,7 +3184,7 @@ _mergeValueForKey(id obj, id value,
 {
   return _sharedContext;
 }
-- (void)setSharedEditingContext:(EOEditingContext *)sharedEditingContext
+- (void)setSharedEditingContext:(EOSharedEditingContext *)sharedEditingContext
 {
   NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
   NSArray *sharedGIDs;
@@ -3213,7 +3213,7 @@ _mergeValueForKey(id obj, id value,
       [NSException raise: NSInvalidArgumentException
 		   format: @"Attempt to set illegal object as EOSharedEditingContext"];
     }
-  sharedGIDs = NSAllMapTableKeys(sharedEditingContext->_globalIDsByObject);
+  sharedGIDs = NSAllMapTableKeys(((EOEditingContext *)sharedEditingContext)->_globalIDsByObject);
   localGIDs = NSAllMapTableKeys(_globalIDsByObject);
   if ([sharedGIDs count] && [localGIDs count])
     {
@@ -3391,7 +3391,6 @@ modified state of the object.**/
 
   classDesc = (id)[EOClassDescription classDescriptionForEntityName:
 					entityName];
-#warning (stephane@sente.ch) ERROR: trying to use EOEntity/EOEntityDescription
   globalID = [[classDesc entity] globalIDForRow: row];
   object = EOEditingContext_objectForGlobalIDWithImpPtr(self,NULL,globalID);
 
@@ -3422,7 +3421,7 @@ modified state of the object.**/
   return object;
 }
 
-- (id)faultForRawRow: (id)row entityNamed: (NSString *)entityName
+- (id)faultForRawRow: (NSDictionary *)row entityNamed: (NSString *)entityName
 {
   id object;
 
@@ -4050,6 +4049,7 @@ static BOOL usesContextRelativeEncoding = NO;
       NSHashRemove(assocDeallocHT,self);
     }
 
+  /* We cannot if (0) [super dealloc]; as NSObject does not have superclass. */
   NSDeallocateObject (self);
 }
 

EOControl/EOMultiReaderLock.m

@@ -66,7 +66,7 @@
 {
   if ((self = [super init]))
     {
-      _mutex = [NSConditionLock initWithCondition: LCK_CND_UNLOCKD];
+      _mutex = [[NSConditionLock alloc] initWithCondition: LCK_CND_UNLOCKD];
       _readerThreads = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks,
 					NSIntMapValueCallBacks, 32);
     }

EOControl/EOMutableKnownKeyDictionary.h

@@ -43,7 +43,8 @@
 @class NSMutableDictionary;
 
 @class EOMutableKnownKeyDictionary;
-
+@class EOMKKDArrayMapping;
+@class EOMKKDSubsetMapping;
 
 @interface EOMKKDInitializer : GCObject
 {
@@ -66,11 +67,11 @@
 - (id)objectForIndex: (unsigned int)index
 	  dictionary: (NSDictionary *)dictionary;
 - (unsigned int)indexForKey: (id)key;
-- (id)arrayMappingForKeys: (id)keys;
+- (EOMKKDArrayMapping *)arrayMappingForKeys: (NSArray *)keys;
-- (id)subsetMappingForSourceDictionaryInitializer: (EOMKKDInitializer *)init
+- (EOMKKDSubsetMapping *)subsetMappingForSourceDictionaryInitializer: (EOMKKDInitializer *)init
 							  sourceKeys: (NSArray *)sourceKeys
 						     destinationKeys: (NSArray *)destinationKeys;
-- (id)subsetMappingForSourceDictionaryInitializer: (id)param0;
+- (EOMKKDSubsetMapping *)subsetMappingForSourceDictionaryInitializer: (EOMKKDInitializer *)param0;
 - (id *)keys;
 - (BOOL)hasKey: (id)key;
 
@@ -159,8 +160,8 @@
 - (unsigned int)count;
 - (id)objectForKey: (id)key;
 - (void)setObject: (id)object
-	   forKey: (NSString *)key;
+	   forKey: (id)key;
-- (void)removeObjectForKey: (NSString *)key;
+- (void)removeObjectForKey: (id)key;
 - (BOOL)containsObjectsNotIdenticalTo: (id)object;
 - (void)addEntriesFromDictionary: (NSDictionary *)dictionary;
 - (NSEnumerator *)keyEnumerator;

EOControl/EOMutableKnownKeyDictionary.m

@@ -235,7 +235,7 @@ RCS_ID("$Id$")
   return [dictionary objectForKey: key];
 }
 
-- (unsigned int) indexForKey: (NSString*)key
+- (unsigned int) indexForKey: (id)key
 {
   void *index = NSMapGet(_keyToIndex, (const void *)key);
 
@@ -835,7 +835,7 @@ RCS_ID("$Id$")
   return [_MKKDInitializer count];
 }
 
-- (id) objectForKey: (NSString*)key
+- (id) objectForKey: (id)key
 {
   id object = nil;
   unsigned int index;
@@ -866,7 +866,7 @@ RCS_ID("$Id$")
 }
 
 - (void) setObject: (id)object
-            forKey: (NSString*)key
+            forKey: (id)key
 {
   unsigned int index;
 
@@ -891,7 +891,7 @@ RCS_ID("$Id$")
     }
 }
 
-- (void) removeObjectForKey: (NSString*)key
+- (void) removeObjectForKey: (id)key
 {
   unsigned int index;
 

EOInterface/EOMasterDetailAssociation.m

@@ -83,7 +83,7 @@
   [super establishConnection];
   if (parent)
     {
-      EODetailDataSource *ds = [_object dataSource];
+      EODetailDataSource *ds = (id)[_object dataSource];
       subclassFlags |= ParentAspectMask;
       [ds setMasterClassDescription:[[parent dataSource]
 	      				classDescriptionForObjects]];

EOModeler/EOModelerEditor.h

@@ -45,7 +45,7 @@
 - (id) initWithDocument:(EOModelerDocument *)document;
 - (EOModelerDocument *)document;
 - (void) setSelectionWithinViewedObject:(NSArray *)selectionWithin;
-- (id) selectionWithinViewedObject; 
+- (NSArray *) selectionWithinViewedObject; 
 - (void) setSelectionPath:(NSArray *)selectionPath;
 - (NSArray *)selectionPath;
 - (void) setViewedObjectPath:(NSArray *)viewedObjectPath;

EOModeler/EOModelerEditor.m

@@ -46,7 +46,7 @@
   [super dealloc];
 }
 
-- (EOModelerEditor *)initWithDocument:(EOModelerDocument *)document
+- (id)initWithDocument:(EOModelerDocument *)document
 {
   if ((self = [super init]))
     {
@@ -359,8 +359,9 @@
 - (void) dealloc
 {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
+  [super dealloc];
 }
-- (EOModelerEmbedibleEditor *) initWithParentEditor:(EOModelerCompoundEditor *)parentEditor
+- (id) initWithParentEditor:(EOModelerCompoundEditor *)parentEditor
 {
   if ((self = [super initWithDocument: [parentEditor document]]))
   {

GDL2Palette/KeyWrapper.h

@@ -35,7 +35,7 @@ typedef enum KeyType
 
 @interface KeyWrapper: NSObject
 {
-  id _key;
+  NSString *_key;
   KeyType _type;
 }
 + (id) wrapperWithKey:(NSString *)key type:(KeyType)type;

GDL2Palette/KeyWrapper.m

@@ -63,7 +63,7 @@
   return [_key isEqual:[obj key]]; 
 }
 
-- (void) setKey:(id)key;
+- (void) setKey:(NSString *)key;
 {
   ASSIGN(_key, key);
 }