From e6689b0cc8ac39c822cbada038f0b0c0a1df5493 Mon Sep 17 00:00:00 2001 From: ayers Date: Sat, 17 Apr 2004 11:30:47 +0000 Subject: [PATCH] * */*.h: Format declarations consistently. Add -*-objc-* shabang line. Replace remaining extern declarations with GDL2*_EXPORT. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@19134 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 + EOAccess/EOAccessFault.h | 26 ++-- EOAccess/EOAccessFaultPriv.h | 2 +- EOAccess/EOAdaptor.h | 16 +-- EOAccess/EOAdaptorChannel.h | 42 +++---- EOAccess/EOAdaptorContext.h | 28 ++--- EOAccess/EOAdaptorPriv.h | 8 +- EOAccess/EOAttribute.h | 10 +- EOAccess/EOAttributePriv.h | 14 +-- EOAccess/EODatabase.h | 14 +-- EOAccess/EODatabaseChannel.h | 10 +- EOAccess/EODatabaseChannelPriv.h | 16 +-- EOAccess/EODatabaseContext.h | 131 ++++++++++--------- EOAccess/EODatabaseContextPriv.h | 50 ++++---- EOAccess/EODatabaseDataSource.h | 12 +- EOAccess/EODatabaseOperation.h | 14 +-- EOAccess/EODatabaseOperationPriv.h | 2 +- EOAccess/EODefines.h | 2 +- EOAccess/EODeprecated.h | 2 +- EOAccess/EOEntity.h | 160 ++++++++++++------------ EOAccess/EOEntityPriv.h | 34 ++--- EOAccess/EOExpressionArray.h | 26 ++-- EOAccess/EOJoin.h | 10 +- EOAccess/EOModel.h | 18 +-- EOAccess/EOModelGroup.h | 13 +- EOAccess/EOPropertyListEncoding.h | 4 +- EOAccess/EORelationship.h | 70 +++++------ EOAccess/EOSQLExpression.h | 23 ++-- EOAccess/EOSQLExpressionPriv.h | 18 +-- EOAccess/EOSQLQualifier.h | 11 +- EOAccess/EOStoredProcedure.h | 14 +-- EOAccess/EOUtilities.h | 106 ++++++++-------- EOControl/EOArrayDataSource.h | 8 +- EOControl/EOCheapArray.h | 68 +++++----- EOControl/EOClassDescription.h | 54 ++++---- EOControl/EODataSource.h | 13 +- EOControl/EODebug.h | 5 +- EOControl/EODefines.h | 2 +- EOControl/EODeprecated.h | 20 +-- EOControl/EODetailDataSource.h | 18 +-- EOControl/EOEditingContext.h | 96 +++++++------- EOControl/EOFault.h | 25 ++-- EOControl/EOFetchSpecification.h | 35 +++--- EOControl/EOGenericRecord.h | 27 ++-- EOControl/EOGlobalID.h | 13 +- EOControl/EOKeyGlobalID.h | 12 +- EOControl/EOKeyValueArchiver.h | 32 +++-- EOControl/EOKeyValueCoding.h | 16 +-- EOControl/EOKeyValueCodingBase.h | 2 +- EOControl/EOMutableKnownKeyDictionary.h | 136 ++++++++++---------- EOControl/EONSAddOns.h | 62 ++++----- EOControl/EONull.h | 2 +- EOControl/EOObjectStore.h | 10 +- EOControl/EOObjectStoreCoordinator.h | 31 ++--- EOControl/EOObserver.h | 19 +-- EOControl/EOQualifier.h | 54 ++++---- EOControl/EOSortOrdering.h | 6 +- EOControl/EOUndoManager.h | 14 +-- EOModeler/EOModelExtensions.h | 4 +- Tools/EOAttribute+GSDoc.h | 2 +- Tools/EOEntity+GSDoc.h | 2 +- Tools/EOJoin+GSDoc.h | 2 +- Tools/EOModel+GSDoc.h | 2 +- Tools/EORelationship+GSDoc.h | 2 +- Tools/NSArray+GSDoc.h | 2 +- Tools/NSDictionary+GSDoc.h | 2 +- 66 files changed, 847 insertions(+), 863 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4be734..d9e0ea0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-04-17 David Ayers + + * */*.h: Format declarations consistently. Add -*-objc-* + shabang line. Replace remaining extern declarations with + GDL2*_EXPORT. + 2004-04-16 David Ayers * EOAccess/EOModel.m ([EOModel writeToFile:]) Set path (and diff --git a/EOAccess/EOAccessFault.h b/EOAccess/EOAccessFault.h index 0b9e424..aee5ad7 100644 --- a/EOAccess/EOAccessFault.h +++ b/EOAccess/EOAccessFault.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOAccessFault.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -39,7 +39,7 @@ @class NSString; -@interface EOAccessGenericFaultHandler:EOFaultHandler +@interface EOAccessGenericFaultHandler : EOFaultHandler { unsigned int _generation; EOAccessGenericFaultHandler *_next; @@ -55,7 +55,7 @@ @end -@interface EOAccessFaultHandler:EOAccessGenericFaultHandler +@interface EOAccessFaultHandler : EOAccessGenericFaultHandler { EOKeyGlobalID *gid; EODatabaseContext *databaseContext; @@ -66,9 +66,9 @@ databaseContext: (EODatabaseContext *)dbcontext editingContext: (EOEditingContext *)ec; -- initWithGlobalID: (EOKeyGlobalID *)globalID - databaseContext: (EODatabaseContext *)dbcontext - editingContext: (EOEditingContext *)ec; +- (id)initWithGlobalID: (EOKeyGlobalID *)globalID + databaseContext: (EODatabaseContext *)dbcontext + editingContext: (EOEditingContext *)ec; - (EOKeyGlobalID *)globalID; - (EODatabaseContext *)databaseContext; @@ -77,7 +77,7 @@ @end -@interface EOAccessArrayFaultHandler:EOAccessGenericFaultHandler +@interface EOAccessArrayFaultHandler : EOAccessGenericFaultHandler { EOKeyGlobalID *sgid; NSString *relationshipName; @@ -91,10 +91,10 @@ databaseContext: (EODatabaseContext *)dbcontext editingContext: (EOEditingContext *)ec; -- initWithSourceGlobalID: (EOKeyGlobalID *)sourceGID - relationshipName: (NSString *)relationshipName - databaseContext: (EODatabaseContext *)dbcontext - editingContext: (EOEditingContext *)ec; +- (id)initWithSourceGlobalID: (EOKeyGlobalID *)sourceGID + relationshipName: (NSString *)relationshipName + databaseContext: (EODatabaseContext *)dbcontext + editingContext: (EOEditingContext *)ec; - (EOKeyGlobalID *)sourceGlobalID; - (NSString *)relationshipName; @@ -106,8 +106,8 @@ @interface NSObject (EOAccessFaultUnableToFaultToOne) -- (void)unableToFaultObject:(id)object - databaseContext:(EODatabaseContext *)context; +- (void)unableToFaultObject: (id)object + databaseContext: (EODatabaseContext *)context; @end diff --git a/EOAccess/EOAccessFaultPriv.h b/EOAccess/EOAccessFaultPriv.h index 4c194f6..702b0b4 100644 --- a/EOAccess/EOAccessFaultPriv.h +++ b/EOAccess/EOAccessFaultPriv.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOAccessFaultPriv.h Copyright (C) 2000 Free Software Foundation, Inc. diff --git a/EOAccess/EOAdaptor.h b/EOAccess/EOAdaptor.h index 2f2577f..81ac23c 100644 --- a/EOAccess/EOAdaptor.h +++ b/EOAccess/EOAdaptor.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOAdaptor.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -85,7 +85,7 @@ GDL2ACCESS_EXPORT NSString *EOGeneralAdaptorException; + (NSArray *)availableAdaptorNames; - (NSArray *)prototypeAttributes; -- initWithName:(NSString *)name; +- (id)initWithName: (NSString *)name; /* Getting an adaptor's name */ - (NSString *)name; @@ -95,8 +95,8 @@ GDL2ACCESS_EXPORT NSString *EOGeneralAdaptorException; - (NSArray *)contexts; /* Setting the model */ -- (void)setModel: (EOModel*)aModel;//Not in EOFD -- (EOModel*)model;//Not in EOFD +- (void)setModel: (EOModel *)model;//Not in EOFD +- (EOModel *)model;//Not in EOFD /* Checking connection status */ - (BOOL)hasOpenChannels; @@ -110,7 +110,7 @@ GDL2ACCESS_EXPORT NSString *EOGeneralAdaptorException; - (BOOL)isDroppedConnectionException: (NSException *)exception; /* Setting connection information */ -- (void)setConnectionDictionary: (NSDictionary*)aDictionary; +- (void)setConnectionDictionary: (NSDictionary *)dictionary; - (NSDictionary *)connectionDictionary; - (void)assertConnectionDictionaryIsValid; @@ -131,10 +131,10 @@ GDL2ACCESS_EXPORT NSString *EOGeneralAdaptorException; /* Setting the delegate */ - (id)delegate; -- (void)setDelegate: delegate; +- (void)setDelegate: (id)delegate; -- (BOOL) isValidQualifierType: (NSString *)attribute - model: (EOModel *)model; +- (BOOL)isValidQualifierType: (NSString *)attribute + model: (EOModel *)model; @end /* EOAdaptor */ diff --git a/EOAccess/EOAdaptorChannel.h b/EOAccess/EOAdaptorChannel.h index 3ec0c8c..96b5cb7 100644 --- a/EOAccess/EOAdaptorChannel.h +++ b/EOAccess/EOAdaptorChannel.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOAdaptorChannel.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -91,7 +91,7 @@ + (EOAdaptorChannel *)adaptorChannelWithAdaptorContext: (EOAdaptorContext *)adaptorContext; /* Initializing an adaptor context */ -- initWithAdaptorContext: (EOAdaptorContext *)adaptorContext; +- (id)initWithAdaptorContext: (EOAdaptorContext *)adaptorContext; /* Getting the adaptor context */ - (EOAdaptorContext *)adaptorContext; @@ -117,7 +117,7 @@ inRowDescribedByQualifier: (EOQualifier *)qualifier /* Fetching rows */ - (void)selectAttributes: (NSArray *)attributes fetchSpecification: (EOFetchSpecification *)fetchSpecification - lock: (BOOL)aLockFlag + lock: (BOOL)lockFlag entity: (EOEntity *)entity; - (void)lockRowComparingAttributes: (NSArray *)atts @@ -150,11 +150,11 @@ inRowDescribedByQualifier: (EOQualifier *)qualifier - (void)addStoredProceduresNamed: (NSArray *)storedProcedureNames toModel: (EOModel *)model; -- (void)setDebugEnabled:(BOOL)yn; +- (void)setDebugEnabled: (BOOL)yn; - (BOOL)isDebugEnabled; - (id)delegate; -- (void)setDelegate:(id)delegate; +- (void)setDelegate: (id)delegate; - (NSMutableDictionary *)dictionaryWithObjects: (id *)objects forAttributes: (NSArray *)attributes @@ -182,50 +182,50 @@ inRowDescribedByQualifier: (EOQualifier *)qualifier @interface NSObject (EOAdaptorChannelDelegation) -- (NSArray *)adaptorChannel: channel +- (NSArray *)adaptorChannel: (id)channel willPerformOperations: (NSArray *)operations; -- (NSException *)adaptorChannel: channel +- (NSException *)adaptorChannel: (id)channel didPerformOperations: (NSArray *)operations exception: (NSException *)exception; -- (BOOL)adaptorChannel: channel +- (BOOL)adaptorChannel: (id)channel shouldSelectAttributes: (NSArray *)attributes fetchSpecification: (EOFetchSpecification *)fetchSpecification lock: (BOOL)flag entity: (EOEntity *)entity; -- (void)adaptorChannel: channel +- (void)adaptorChannel: (id)channel didSelectAttributes: (NSArray *)attributes fetchSpecification: (EOFetchSpecification *)fetchSpecification lock: (BOOL) flag entity: (EOEntity *)entity; -- (void)adaptorChannelWillFetchRow: channel; +- (void)adaptorChannelWillFetchRow: (id)channel; -- (void)adaptorChannel: channel didFetchRow: (NSMutableDictionary *)row; +- (void)adaptorChannel: (id)channel didFetchRow: (NSMutableDictionary *)row; -- (void)adaptorChannelDidChangeResultSet: channel; +- (void)adaptorChannelDidChangeResultSet: (id)channel; -- (void)adaptorChannelDidFinishFetching: channel; +- (void)adaptorChannelDidFinishFetching: (id)channel; -- (BOOL)adaptorChannel: channel - shouldEvaluateExpression: (EOSQLExpression *)expression; +- (BOOL)adaptorChannel: (id)channel +shouldEvaluateExpression: (EOSQLExpression *)expression; -- (void)adaptorChannel: channel - didEvaluateExpression: (EOSQLExpression *)expression; +- (void)adaptorChannel: (id)channel + didEvaluateExpression: (EOSQLExpression *)expression; -- (NSDictionary *)adaptorChannel: channel +- (NSDictionary *)adaptorChannel: (id)channel shouldExecuteStoredProcedure: (EOStoredProcedure *)procedure withValues: (NSDictionary *)values; -- (void)adaptorChannel: channel +- (void)adaptorChannel: (id)channel didExecuteStoredProcedure: (EOStoredProcedure *)procedure withValues: (NSDictionary *)values; -- (NSDictionary *)adaptorChannelShouldConstructStoredProcedureReturnValues: channel; +- (NSDictionary *)adaptorChannelShouldConstructStoredProcedureReturnValues: (id)channel; -- (NSDictionary *)adaptorChannel: channel +- (NSDictionary *)adaptorChannel: (id)channel shouldReturnValuesForStoredProcedure: (NSDictionary *)returnValues; @end /* NSObject(EOAdaptorChannelDelegation) */ diff --git a/EOAccess/EOAdaptorContext.h b/EOAccess/EOAdaptorContext.h index 2061d81..0758af8 100644 --- a/EOAccess/EOAdaptorContext.h +++ b/EOAccess/EOAdaptorContext.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOAdaptorContext.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -77,17 +77,17 @@ typedef enum { + (EOAdaptorContext *)adaptorContextWithAdaptor: (EOAdaptor *)adaptor; -- initWithAdaptor: (EOAdaptor *)adaptor; +- (id)initWithAdaptor: (EOAdaptor *)adaptor; -- (EOAdaptor*)adaptor; +- (EOAdaptor *)adaptor; - (EOAdaptorChannel *)createAdaptorChannel; // override - (BOOL)hasOpenChannels; - (BOOL)hasBusyChannels; -- delegate; -- (void)setDelegate:aDelegate; +- (id)delegate; +- (void)setDelegate: (id)delegate; - (void)handleDroppedConnection; @@ -119,21 +119,21 @@ typedef enum { @interface EOAdaptorContext(Private) -- (void)_channelDidInit: aChannel; -- (void)_channelWillDealloc: aChannel; +- (void)_channelDidInit: (id)channel; +- (void)_channelWillDealloc: (id)channel; @end @interface NSObject (EOAdaptorContextDelegation) -- (BOOL)adaptorContextShouldConnect: context; -- (BOOL)adaptorContextShouldBegin: context; -- (void)adaptorContextDidBegin: context; -- (BOOL)adaptorContextShouldCommit: context; -- (void)adaptorContextDidCommit: context; -- (BOOL)adaptorContextShouldRollback: context; -- (void)adaptorContextDidRollback: context; +- (BOOL)adaptorContextShouldConnect: (id)context; +- (BOOL)adaptorContextShouldBegin: (id)context; +- (void)adaptorContextDidBegin: (id)context; +- (BOOL)adaptorContextShouldCommit: (id)context; +- (void)adaptorContextDidCommit: (id)context; +- (BOOL)adaptorContextShouldRollback: (id)context; +- (void)adaptorContextDidRollback: (id)context; @end /* NSObject(EOAdaptorContextDelegate) */ diff --git a/EOAccess/EOAdaptorPriv.h b/EOAccess/EOAdaptorPriv.h index 86e72ce..6269a17 100644 --- a/EOAccess/EOAdaptorPriv.h +++ b/EOAccess/EOAdaptorPriv.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOAdaptorPriv.h Copyright (C) 2002 Free Software Foundation, Inc. @@ -30,9 +30,9 @@ @interface EOAdaptor(EOAdaptorPrivate) -- (void) _requestConcreteImplementationForSelector: (SEL)param0; -- (void) _unregisterAdaptorContext: (EOAdaptorContext*)adaptorContext; -- (void) _registerAdaptorContext: (EOAdaptorContext*)adaptorContext; +- (void)_requestConcreteImplementationForSelector: (SEL)param0; +- (void)_unregisterAdaptorContext: (EOAdaptorContext *)adaptorContext; +- (void)_registerAdaptorContext: (EOAdaptorContext *)adaptorContext; @end diff --git a/EOAccess/EOAttribute.h b/EOAccess/EOAttribute.h index 723dc38..1390bf6 100644 --- a/EOAccess/EOAttribute.h +++ b/EOAccess/EOAttribute.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOAttribute.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -115,8 +115,8 @@ typedef enum { } /** returns an autoreleased attribute owned by onwer and built from propertyList **/ -+ (id) attributeWithPropertyList: (NSDictionary *)propertyList - owner: (id)owner; ++ (id)attributeWithPropertyList: (NSDictionary *)propertyList + owner: (id)owner; /* Accessing the entity */ - (NSString *)name; @@ -208,7 +208,7 @@ typedef enum { - (void)setDocComment: (NSString *)docComment; -- (id)_normalizeDefinition: (EOExpressionArray*)definition +- (id)_normalizeDefinition: (EOExpressionArray *)definition path: (id)path; @end @@ -280,7 +280,7 @@ typedef enum { @interface NSObject (EOCustomClassArchiving) -+ objectWithArchiveData: (NSData *)data; ++ (id)objectWithArchiveData: (NSData *)data; - (NSData *)archiveData; @end diff --git a/EOAccess/EOAttributePriv.h b/EOAccess/EOAttributePriv.h index bb8dea0..05fab27 100644 --- a/EOAccess/EOAttributePriv.h +++ b/EOAccess/EOAttributePriv.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOAttributePriv.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -37,12 +37,12 @@ @end @interface EOAttribute (EOAttributePrivate2) -- (BOOL) _hasAnyOverrides; -- (void) _resetPrototype; -- (void) _updateFromPrototype; -- (void) _setOverrideForKeyEnum: (int)keyEnum; -- (BOOL) _isKeyEnumOverriden: (int)param0; -- (BOOL) _isKeyEnumDefinedByPrototype: (int)param0; +- (BOOL)_hasAnyOverrides; +- (void)_resetPrototype; +- (void)_updateFromPrototype; +- (void)_setOverrideForKeyEnum: (int)keyEnum; +- (BOOL)_isKeyEnumOverriden: (int)param0; +- (BOOL)_isKeyEnumDefinedByPrototype: (int)param0; @end #endif /* __EOAttributePriv_h__ */ diff --git a/EOAccess/EODatabase.h b/EOAccess/EODatabase.h index 1e783e0..cea8c86 100644 --- a/EOAccess/EODatabase.h +++ b/EOAccess/EODatabase.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EODatabase.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -66,9 +66,9 @@ GDL2ACCESS_EXPORT NSString *EOGeneralDatabaseException; + (EODatabase *)databaseWithModel: (EOModel *)model; -- initWithAdaptor: (EOAdaptor *)adaptor; +- (id)initWithAdaptor: (EOAdaptor *)adaptor; -- initWithModel: (EOModel *)model; +- (id)initWithModel: (EOModel *)model; - (NSArray *)registeredContexts; @@ -99,11 +99,11 @@ GDL2ACCESS_EXPORT NSString *EOGeneralDatabaseException; - (void)recordSnapshot: (NSDictionary *)snapshot forGlobalID: (EOGlobalID *)gid; -- (NSDictionary *)snapshotForGlobalID:(EOGlobalID *)gid; +- (NSDictionary *)snapshotForGlobalID: (EOGlobalID *)gid; -- (void)recordSnapshot:(NSArray *)gids - forSourceGlobalID:(EOGlobalID *)gid - relationshipName:(NSString *)name; +- (void)recordSnapshot: (NSArray *)gids + forSourceGlobalID: (EOGlobalID *)gid + relationshipName: (NSString *)name; - (NSArray *)snapshotForSourceGlobalID: (EOGlobalID *)gid relationshipName: (NSString *)name; diff --git a/EOAccess/EODatabaseChannel.h b/EOAccess/EODatabaseChannel.h index f9e7acc..eae3d48 100644 --- a/EOAccess/EODatabaseChannel.h +++ b/EOAccess/EODatabaseChannel.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EODatabaseChannel.h Copyright (C) 2000-2002 Free Software Foundation, Inc. @@ -66,12 +66,12 @@ } _delegateRespondsTo; } -+ (EODatabaseChannel*)databaseChannelWithDatabaseContext: (EODatabaseContext *)databaseContext; ++ (EODatabaseChannel *)databaseChannelWithDatabaseContext: (EODatabaseContext *)databaseContext; -- initWithDatabaseContext: (EODatabaseContext *)databaseContext; +- (id)initWithDatabaseContext: (EODatabaseContext *)databaseContext; - (void)setCurrentEntity: (EOEntity *)entity; -- (void) setEntity: (EOEntity *)entity; +- (void)setEntity: (EOEntity *)entity; - (void)setCurrentEditingContext: (EOEditingContext *)context; @@ -95,7 +95,7 @@ - (void)setIsLocking: (BOOL)isLocking; - (void)setDelegate: (id)delegate; -- (id) delegate; +- (id)delegate; @end diff --git a/EOAccess/EODatabaseChannelPriv.h b/EOAccess/EODatabaseChannelPriv.h index 77e7e7c..e5274ec 100644 --- a/EOAccess/EODatabaseChannelPriv.h +++ b/EOAccess/EODatabaseChannelPriv.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EODatabaseChannelPriv.h Copyright (C) 2002 Free Software Foundation, Inc. @@ -33,16 +33,16 @@ @interface EODatabaseChannel (EODatabaseChannelPrivate) -- (NSArray*) _propertiesToFetch; +- (NSArray *)_propertiesToFetch; - (void)_setCurrentEntityAndRelationshipWithFetchSpecification: (EOFetchSpecification *)fetch; -(void)_selectWithFetchSpecification: (EOFetchSpecification *)fetch editingContext: (EOEditingContext *)context; -- (void) _buildNodeList: (id)param0 - withParent: (id)param1; -- (id) currentEditingContext; -- (void) _cancelInternalFetch; -- (void) _closeChannel; -- (void) _openChannel; +- (void)_buildNodeList: (id)param0 + withParent: (id)param1; +- (id)currentEditingContext; +- (void)_cancelInternalFetch; +- (void)_closeChannel; +- (void)_openChannel; @end #endif /* __EODatabaseChannelPriv_h__ */ diff --git a/EOAccess/EODatabaseContext.h b/EOAccess/EODatabaseContext.h index a2abc09..0cdc09d 100644 --- a/EOAccess/EODatabaseContext.h +++ b/EOAccess/EODatabaseContext.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EODatabaseContext.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -76,8 +76,8 @@ struct _EOTransactionScope; */ NSMutableArray *_registeredChannels; NSMapTable *_dbOperationsByGlobalID; - EOObjectStoreCoordinator *_coordinator; // not retained - EOEditingContext *_editingContext; // not retained + EOObjectStoreCoordinator *_coordinator; /* unretained */ + EOEditingContext *_editingContext; /* unretained */ id *_lockedObjects;//void* /*TO ADD unsigned int _currentGeneration; unsigned int _concurentFetches; @@ -108,7 +108,7 @@ struct _EOTransactionScope; unsigned int ignoreEntityCaching:1; unsigned int _reserved:29; } _flags; - id _delegate; // not retained + id _delegate; /* unretained */ struct { unsigned int willRunLoginPanelToOpenDatabaseChannel:1; unsigned int newPrimaryKey:1; @@ -129,7 +129,7 @@ struct _EOTransactionScope; + (EODatabaseContext *)databaseContextWithDatabase: (EODatabase *)database; -- initWithDatabase: (EODatabase *)database; +- (id)initWithDatabase: (EODatabase *)database; + (EODatabaseContext *)registeredDatabaseContextForModel: (EOModel *)model editingContext: (EOEditingContext *)editingContext; @@ -168,7 +168,7 @@ struct _EOTransactionScope; entityNamed: (NSString *)entityName editingContext: (EOEditingContext *)editingContext; -- (id) entityForGlobalID: (EOGlobalID *)globalID; +- (id)entityForGlobalID: (EOGlobalID *)globalID; - (id)faultForGlobalID: (EOGlobalID *)globalID editingContext: (EOEditingContext *)context; @@ -184,19 +184,19 @@ struct _EOTransactionScope; - (NSArray *)objectsForSourceGlobalID: (EOGlobalID *)globalID relationshipName: (NSString *)name editingContext: (EOEditingContext *)context; -- (void)_registerSnapshot: (NSArray*)snapshot - forSourceGlobalID: (EOGlobalID*)globalID - relationshipName: (NSString*)name - editingContext: (EOEditingContext*)context; +- (void)_registerSnapshot: (NSArray *)snapshot + forSourceGlobalID: (EOGlobalID *)globalID + relationshipName: (NSString *)name + editingContext: (EOEditingContext *)context; -- (void)refaultObject: object +- (void)refaultObject: (id)object withGlobalID: (EOGlobalID *)globalID editingContext: (EOEditingContext *)context; - (void)saveChangesInEditingContext: (EOEditingContext *)context; - (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpecification - editingContext:(EOEditingContext *)context; + editingContext: (EOEditingContext *)context; - (BOOL)isObjectLockedWithGlobalID: (EOGlobalID *)gid editingContext: (EOEditingContext *)context; @@ -212,7 +212,7 @@ struct _EOTransactionScope; @interface EODatabaseContext (EOCooperatingObjectStoreSupport) -- (BOOL)ownsGlobalID:(EOGlobalID *)globalID; +- (BOOL)ownsGlobalID: (EOGlobalID *)globalID; - (BOOL)ownsObject: (id)object; @@ -230,7 +230,7 @@ It's invoked after prepareForSaveWithCoordinator:editingContext: and before owns **/ - (void)recordChangesInEditingContext; -- (void)recordUpdateForObject: object +- (void)recordUpdateForObject: (id)object changes: (NSDictionary *)changes; - (void)performChanges; @@ -239,58 +239,58 @@ It's invoked after prepareForSaveWithCoordinator:editingContext: and before owns - (void)rollbackChanges; -- (NSDictionary *)valuesForKeys: (NSArray *)keys object: object; +- (NSDictionary *)valuesForKeys: (NSArray *)keys object: (id)object; --(void)relayPrimaryKey: (NSDictionary*)pk +-(void)relayPrimaryKey: (NSDictionary *)pk object: (id)object - entity: (EOEntity*)entity; + entity: (EOEntity *)entity; --(void)nullifyAttributesInRelationship: (EORelationship*)relationship +-(void)nullifyAttributesInRelationship: (EORelationship *)relationship sourceObject: (id)sourceObject - destinationObjects: (NSArray*)destinationObjects; --(void)nullifyAttributesInRelationship: (EORelationship*)relationship + destinationObjects: (NSArray *)destinationObjects; +-(void)nullifyAttributesInRelationship: (EORelationship *)relationship sourceObject: (id)sourceObject destinationObject: (id)destinationObject; --(void)relayAttributesInRelationship: (EORelationship*)relationship +-(void)relayAttributesInRelationship: (EORelationship *)relationship sourceObject: (id)sourceObject - destinationObjects: (NSArray*)destinationObjects; --(NSDictionary*)relayAttributesInRelationship: (EORelationship*)relationship - sourceObject: (id)sourceObject - destinationObject: (id)destinationObject; + destinationObjects: (NSArray *)destinationObjects; +-(NSDictionary *)relayAttributesInRelationship: (EORelationship *)relationship + sourceObject: (id)sourceObject + destinationObject: (id)destinationObject; -- (id) databaseOperationForObject: (id)param0; -- (id) databaseOperationForGlobalID: (id)param0; -- (void) recordDatabaseOperation: (id)param0; -- (void) recordDeleteForObject: (id)param0; -- (void) recordInsertForObject: (id)param0; +- (id)databaseOperationForObject: (id)param0; +- (id)databaseOperationForGlobalID: (id)param0; +- (void)recordDatabaseOperation: (id)param0; +- (void)recordDeleteForObject: (id)param0; +- (void)recordInsertForObject: (id)param0; -- (void) createAdaptorOperationsForDatabaseOperation: (EODatabaseOperation*)dbOpe - attributes: (NSArray*)attributes; -- (void) createAdaptorOperationsForDatabaseOperation: (EODatabaseOperation*)dbOpe; -- (NSArray*) orderAdaptorOperations; +- (void)createAdaptorOperationsForDatabaseOperation: (EODatabaseOperation *)dbOpe + attributes: (NSArray *)attributes; +- (void)createAdaptorOperationsForDatabaseOperation: (EODatabaseOperation *)dbOpe; +- (NSArray *)orderAdaptorOperations; -- (NSArray*) entitiesOnWhichThisEntityDepends: (EOEntity *)entity; --(NSArray*)entityNameOrderingArrayForEntities: (NSArray *)entities; +- (NSArray *)entitiesOnWhichThisEntityDepends: (EOEntity *)entity; +- (NSArray *)entityNameOrderingArrayForEntities: (NSArray *)entities; -- (BOOL) isValidQualifierTypeForAttribute: (EOAttribute*)attribute; -- (id) lockingNonQualifiableAttributes: (NSArray*)attributes; -- (NSArray*) lockingAttributesForAttributes: (NSArray*)attributes - entity: (EOEntity*)enity; -- (NSArray*) primaryKeyAttributesForAttributes: (NSArray*)attributes - entity: (EOEntity*)entity; -- (EOQualifier*) qualifierForLockingAttributes: (NSArray*)attributes - primaryKeyAttributes: (NSArray*)primaryKeyAttributes - entity: (EOEntity*)entity - snapshot: (NSDictionary*)snapshot; -- (void) insertEntity: (EOEntity*)entity - intoOrderingArray: (NSMutableArray*)orderingArray - withDependencies: (NSDictionary*)dependencies - processingSet: (NSMutableSet*)processingSet; -- (void) processSnapshotForDatabaseOperation: (EODatabaseOperation*)dbOpe; +- (BOOL)isValidQualifierTypeForAttribute: (EOAttribute *)attribute; +- (id)lockingNonQualifiableAttributes: (NSArray *)attributes; +- (NSArray *)lockingAttributesForAttributes: (NSArray *)attributes + entity: (EOEntity *)enity; +- (NSArray *)primaryKeyAttributesForAttributes: (NSArray *)attributes + entity: (EOEntity *)entity; +- (EOQualifier *)qualifierForLockingAttributes: (NSArray *)attributes + primaryKeyAttributes: (NSArray *)primaryKeyAttributes + entity: (EOEntity *)entity + snapshot: (NSDictionary *)snapshot; +- (void)insertEntity: (EOEntity *)entity + intoOrderingArray: (NSMutableArray *)orderingArray + withDependencies: (NSDictionary *)dependencies + processingSet: (NSMutableSet *)processingSet; +- (void)processSnapshotForDatabaseOperation: (EODatabaseOperation *)dbOpe; -- (NSDictionary*) valuesToWriteForAttributes: (NSArray*)attributes - entity: (EOEntity*)entity - changedValues: (NSDictionary*)changedValues; +- (NSDictionary *)valuesToWriteForAttributes: (NSArray *)attributes + entity: (EOEntity *)entity + changedValues: (NSDictionary *)changedValues; @end @@ -335,7 +335,7 @@ Only searches locally (in the transaction scope), not in the EODatabase. **/ - (NSDictionary *)localSnapshotForGlobalID: (EOGlobalID *)gid; - (NSArray *)localSnapshotForSourceGlobalID: (EOGlobalID *)gid - relationshipName:(NSString *)name; + relationshipName: (NSString *)name; - (void)forgetSnapshotForGlobalID: (EOGlobalID *)gid; - (void)forgetSnapshotsForGlobalIDs: (NSArray *)gids; @@ -348,16 +348,16 @@ Only searches locally (in the transaction scope), not in the EODatabase. **/ - (BOOL)isObjectLockedWithGlobalID: (EOGlobalID *)globalID; - (void)forgetAllLocks; - (void)forgetLocksForObjectsWithGlobalIDs: (NSArray *)gids; -- (void) _rollbackTransaction; -- (void) _commitTransaction; -- (void) _beginTransaction; -- (EODatabaseChannel*) _obtainOpenChannel; -- (BOOL) _openChannelWithLoginPanel:(id)param0; -- (void) _forceDisconnect; -- (void)initializeObject:(id)object - row:(NSDictionary*)row - entity:(EOEntity*)entity - editingContext:(EOEditingContext*)context; +- (void)_rollbackTransaction; +- (void)_commitTransaction; +- (void)_beginTransaction; +- (EODatabaseChannel *)_obtainOpenChannel; +- (BOOL)_openChannelWithLoginPanel: (id)param0; +- (void)_forceDisconnect; +- (void)initializeObject: (id)object + row: (NSDictionary *)row + entity: (EOEntity *)entity + editingContext: (EOEditingContext *)context; @end @@ -368,7 +368,6 @@ Only searches locally (in the transaction scope), not in the EODatabase. **/ @end -// Notifications: GDL2ACCESS_EXPORT NSString *EODatabaseChannelNeededNotification; diff --git a/EOAccess/EODatabaseContextPriv.h b/EOAccess/EODatabaseContextPriv.h index 09527db..487c4bc 100644 --- a/EOAccess/EODatabaseContextPriv.h +++ b/EOAccess/EODatabaseContextPriv.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EODatabaseContextPriv.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -36,38 +36,40 @@ @interface EODatabaseContext (EODatabaseContextPrivate) -- (void) _fireArrayFault: (id)object; -- (void) _fireFault: (id)object; -- (void) _addBatchForGlobalID: (EOKeyGlobalID *)globalID - fault: (EOFault *)fault; -- (void) _removeBatchForGlobalID: (EOKeyGlobalID *)globalID - fault: (EOFault *)fault; -- (void) _addToManyBatchForSourceGlobalID: (EOKeyGlobalID *)globalID - relationshipName: (NSString *)relationshipName - fault: (EOFault *)fault; +- (void)_fireArrayFault: (id)object; +- (void)_fireFault: (id)object; +- (void)_addBatchForGlobalID: (EOKeyGlobalID *)globalID + fault: (EOFault *)fault; +- (void)_removeBatchForGlobalID: (EOKeyGlobalID *)globalID + fault: (EOFault *)fault; +- (void)_addToManyBatchForSourceGlobalID: (EOKeyGlobalID *)globalID + relationshipName: (NSString *)relationshipName + fault: (EOFault *)fault; -/*- (void)_batchToOne: (id)fault +/* +- (void)_batchToOne: (id)fault withHandler: (EOAccessFaultHandler *)handler; - (void)_batchToMany: (id)fault -withHandler: (EOAccessArrayFaultHandler *)handler;*/ + withHandler: (EOAccessArrayFaultHandler *)handler; +*/ @end @interface EODatabaseContext (EODatabaseContextPrivate2) -- (void) _verifyNoChangesToReadonlyEntity: (EODatabaseOperation*)dbOpe; -- (EOGlobalID*) _globalIDForObject: (id)object; -- (id) _primaryKeyForObject: (id)object; -- (NSDictionary*)_primaryKeyForObject: (id)object - raiseException: (BOOL)raiseException; -- (id) _currentCommittedSnapshotForObject: (id)object; -- (id) _addDatabaseContextStateToException: (id)param0; -- (id) _databaseContextState; -- (void) _cleanUpAfterSave; -- (void) _assertValidStateWithSelector: (SEL)sel; -- (BOOL) _shouldGeneratePrimaryKeyForEntityName: (NSString*)entityName; -- (void) _buildPrimaryKeyGeneratorListForEditingContext: (EOEditingContext*)context; +- (void)_verifyNoChangesToReadonlyEntity: (EODatabaseOperation *)dbOpe; +- (EOGlobalID *)_globalIDForObject: (id)object; +- (id)_primaryKeyForObject: (id)object; +- (NSDictionary *)_primaryKeyForObject: (id)object + raiseException: (BOOL)raiseException; +- (id)_currentCommittedSnapshotForObject: (id)object; +- (id)_addDatabaseContextStateToException: (id)param0; +- (id)_databaseContextState; +- (void)_cleanUpAfterSave; +- (void)_assertValidStateWithSelector: (SEL)sel; +- (BOOL)_shouldGeneratePrimaryKeyForEntityName: (NSString *)entityName; +- (void)_buildPrimaryKeyGeneratorListForEditingContext: (EOEditingContext *)context; @end diff --git a/EOAccess/EODatabaseDataSource.h b/EOAccess/EODatabaseDataSource.h index 8eaa662..01ba1f2 100644 --- a/EOAccess/EODatabaseDataSource.h +++ b/EOAccess/EODatabaseDataSource.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EODatabaseDataSource.m Copyright (C) 2000 Free Software Foundation, Inc. @@ -54,11 +54,11 @@ } _flags; } -- initWithEditingContext: (EOEditingContext *)anEditingContext - entityName: (NSString *)anEntityName; -- initWithEditingContext: (EOEditingContext *)editingContext - entityName: (NSString *)entityName - fetchSpecificationName: (NSString *)fetchName; +- (id)initWithEditingContext: (EOEditingContext *)editingContext + entityName: (NSString *)entityName; +- (id)initWithEditingContext: (EOEditingContext *)editingContext + entityName: (NSString *)entityName + fetchSpecificationName: (NSString *)fetchName; - (EOEntity *)entity; diff --git a/EOAccess/EODatabaseOperation.h b/EOAccess/EODatabaseOperation.h index 70b13ca..908e8ba 100644 --- a/EOAccess/EODatabaseOperation.h +++ b/EOAccess/EODatabaseOperation.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EODatabaseOperation.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -74,7 +74,7 @@ Instance objects are created by EODatabaseOperation + (EOAdaptorOperation *)adaptorOperationWithEntity: (EOEntity *)entity; /** Init the instance with the main concerned entity **/ -- (id) initWithEntity: (EOEntity *)entity; +- (id)initWithEntity: (EOEntity *)entity; /** returns adaptor operator **/ - (EOAdaptorOperator)adaptorOperator; @@ -136,7 +136,7 @@ You generally don't need to create such objects by yourself. They are created by NSMutableDictionary *_toManySnapshots; /** **/ } -+ (EODatabaseOperation*)databaseOperationWithGlobalID: (EOGlobalID *)globalID ++ (EODatabaseOperation *)databaseOperationWithGlobalID: (EOGlobalID *)globalID object: (id)object entity: (EOEntity *)entity; @@ -157,21 +157,17 @@ If the object has just been inserted (i.e. not yet in database), the returned di The newRow dictionary is created when creating the database operation (in EODatabaseChannel -databaseOperationForObject: for exemple). Values come from object state in database and overrides by changes made on the object **/ - (NSMutableDictionary *)newRow; -- (void)setNewRow:(NSMutableDictionary *)newRow; +- (void)setNewRow: (NSMutableDictionary *)newRow; - (EOGlobalID *)globalID; - - (id)object; - - (EOEntity *)entity; - (EODatabaseOperator)databaseOperator; - (void)setDatabaseOperator: (EODatabaseOperator)dbOp; - (NSDictionary *)rowDiffs; - - (NSDictionary *)rowDiffsForAttributes: (NSArray *)attributes; - - (NSDictionary *)primaryKeyDiffs; /** returns array of EOAdaptorOperations to perform **/ @@ -185,7 +181,7 @@ Raises an exception if adaptorOperation is nil /** removes an Adaptor Operation **/ - (void)removeAdaptorOperation: (EOAdaptorOperation *)adaptorOperation; -- (void)recordToManySnapshot: (NSArray *)gids relationshipName:(NSString *)name; +- (void)recordToManySnapshot: (NSArray *)gids relationshipName: (NSString *)name; - (NSDictionary *)toManySnapshots; @end diff --git a/EOAccess/EODatabaseOperationPriv.h b/EOAccess/EODatabaseOperationPriv.h index 2dcbdf4..607a74c 100644 --- a/EOAccess/EODatabaseOperationPriv.h +++ b/EOAccess/EODatabaseOperationPriv.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EODatabaseOperationPriv.h Copyright (C) 2000 Free Software Foundation, Inc. diff --git a/EOAccess/EODefines.h b/EOAccess/EODefines.h index d338c4a..265d624 100644 --- a/EOAccess/EODefines.h +++ b/EOAccess/EODefines.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EODefines.h Copyright (C) 2003 Free Software Foundation, Inc. diff --git a/EOAccess/EODeprecated.h b/EOAccess/EODeprecated.h index e1ace14..48f28c4 100644 --- a/EOAccess/EODeprecated.h +++ b/EOAccess/EODeprecated.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EODeprecated.h Copyright (C) 2002 Free Software Foundation, Inc. diff --git a/EOAccess/EOEntity.h b/EOAccess/EOEntity.h index 9141f7a..f8bd086 100644 --- a/EOAccess/EOEntity.h +++ b/EOAccess/EOEntity.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOEntity.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -134,16 +134,16 @@ - (NSString *)description; /* Accessing the name */ -- (NSString*)name; +- (NSString *)name; /* Accessing the model */ -- (EOModel*)model; +- (EOModel *)model; /* Accessing external information */ -- (NSString*)externalName; +- (NSString *)externalName; /* Accessing the external query */ -- (NSString*)externalQuery; +- (NSString *)externalQuery; /* Getting the qualifier */ - (EOQualifier *)restrictingQualifier; @@ -157,7 +157,7 @@ - (BOOL)cachesObjects; /* Accessing the enterprise object class */ -- (NSString*)className; +- (NSString *)className; -(Class)_classForInstances; @@ -188,10 +188,10 @@ /* Getting primary keys and snapshot for row */ - (NSDictionary *)primaryKeyForRow: (NSDictionary *)row; -- (BOOL)isValidAttributeUsedForLocking: (EOAttribute *)anAttribute; -- (BOOL)isValidPrimaryKeyAttribute: (EOAttribute *)anAttribute; +- (BOOL)isValidAttributeUsedForLocking: (EOAttribute *)attribute; +- (BOOL)isValidPrimaryKeyAttribute: (EOAttribute *)attribute; - (BOOL)isPrimaryKeyValidInObject: (id)object; -- (BOOL)isValidClassProperty: aProp; +- (BOOL)isValidClassProperty: (id)property; /** Accessing the user dictionary **/ - (NSDictionary *)userInfo; @@ -211,22 +211,22 @@ @interface EOEntity (EOKeyGlobalID) - (EOGlobalID *)globalIDForRow: (NSDictionary *)row; -- (id) globalIDForRow: (NSDictionary*)row - isFinal: (BOOL)isFinal; +- (id)globalIDForRow: (NSDictionary *)row + isFinal: (BOOL)isFinal; - (NSDictionary *)primaryKeyForGlobalID: (EOKeyGlobalID *)gid; -- (Class)classForObjectWithGlobalID: (EOKeyGlobalID*)globalID; +- (Class)classForObjectWithGlobalID: (EOKeyGlobalID *)globalID; @end @interface EOEntity (EOEntityEditing) -- (BOOL)setClassProperties: (NSArray*)properties; -- (BOOL)setPrimaryKeyAttributes: (NSArray*)keys; -- (BOOL)setAttributesUsedForLocking: (NSArray*)attributes; -- (NSException *)validateName: (NSString *) name; -- (void)setName: (NSString*)name; -- (void)setExternalName: (NSString*)name; -- (void)setExternalQuery: (NSString*)query; +- (BOOL)setClassProperties: (NSArray *)properties; +- (BOOL)setPrimaryKeyAttributes: (NSArray *)keys; +- (BOOL)setAttributesUsedForLocking: (NSArray *)attributes; +- (NSException *)validateName: (NSString *)name; +- (void)setName: (NSString *)name; +- (void)setExternalName: (NSString *)name; +- (void)setExternalQuery: (NSString *)query; - (void)setRestrictingQualifier: (EOQualifier *)qualifier; - (void)setReadOnly: (BOOL)flag; - (void)setCachesObjects: (BOOL)yn; @@ -241,10 +241,10 @@ withName: (NSString *)name; - (void)removeFetchSpecificationNamed: (NSString *)name; -- (void)setClassName: (NSString*)name; -- (void)setUserInfo: (NSDictionary*)dictionary; -- (void) _setInternalInfo: (NSDictionary*)dictionary; -- (void) setDocComment:(NSString *)docComment; +- (void)setClassName: (NSString *)name; +- (void)setUserInfo: (NSDictionary *)dictionary; +- (void)_setInternalInfo: (NSDictionary *)dictionary; +- (void)setDocComment: (NSString *)docComment; - (void)addSubEntity: (EOEntity *)child; - (void)removeSubEntity: (EOEntity *)child; @@ -257,7 +257,7 @@ @interface EOEntity (EOModelReferentialIntegrity) -- (BOOL)referencesProperty:property; +- (BOOL)referencesProperty: (id)property; - (NSArray *)externalModelsReferenced; @end @@ -276,16 +276,16 @@ GDL2ACCESS_EXPORT NSString *EONextPrimaryKeyProcedureOperation; @interface EOEntity (MethodSet11) - (NSException *)validateObjectForDelete: (id)object; -- (id) classPropertyAttributeNames; -- (id) classPropertyToManyRelationshipNames; -- (id) classPropertyToOneRelationshipNames; -- (id) qualifierForDBSnapshot: (id)param0; -- (EOAttribute*) attributeForPath: (NSString*)path; -- (EORelationship*) relationshipForPath: (NSString*)path; -- (void) _addAttributesToFetchForRelationshipPath: (NSString*)path - atts: (NSMutableDictionary*)atts; -- (id) dbSnapshotKeys; -- (NSArray*) flattenedAttributes; +- (id)classPropertyAttributeNames; +- (id)classPropertyToManyRelationshipNames; +- (id)classPropertyToOneRelationshipNames; +- (id)qualifierForDBSnapshot: (id)param0; +- (EOAttribute *)attributeForPath: (NSString *)path; +- (EORelationship *)relationshipForPath: (NSString *)path; +- (void)_addAttributesToFetchForRelationshipPath: (NSString *)path + atts: (NSMutableDictionary *)atts; +- (id)dbSnapshotKeys; +- (NSArray *)flattenedAttributes; @end @interface EOEntity (EOStoredProcedures) @@ -309,61 +309,61 @@ GDL2ACCESS_EXPORT NSString *EONextPrimaryKeyProcedureOperation; @end @interface EOEntity (EOEntityHidden) -- (NSDictionary*)attributesByName; -- (NSDictionary*)relationshipsByName; -- (NSArray*) _allFetchSpecifications; -- (NSDictionary*) _fetchSpecificationDictionary; -- (void) _loadEntity; -- (id) parentRelationship; -- (int) _numberOfRelationships; -- (BOOL) _hasReadOnlyAttributes; -- (NSArray*) writableDBSnapshotKeys; -- (NSArray*) rootAttributesUsedForLocking; -- (BOOL) isSubEntityOf:(id)param0; -- (id) initObject: (id)param0 - editingContext: (id)param1 - globalID: (id)param2; -- (id) allocBiggestObjectWithZone:(NSZone*)zone; -- (Class) _biggestClass; -- (NSArray*) relationshipsPlist; -- (id) rootParent; -- (void) _setParent: (id)param0; -- (NSArray*) _hiddenRelationships; -- (NSArray*) _propertyNames; -- (id) _flattenAttribute: (id)param0 - relationshipPath: (id)param1 - currentAttributes: (id)param2; -- (NSString*) snapshotKeyForAttributeName: (NSString*)attributeName; -- (id) _flattenedAttNameToSnapshotKeyMapping; -- (EOMKKDSubsetMapping*) _snapshotToAdaptorRowSubsetMapping; -- (EOMutableKnownKeyDictionary*) _dictionaryForPrimaryKey; -- (EOMutableKnownKeyDictionary*) _dictionaryForProperties; -- (EOMutableKnownKeyDictionary*) _dictionaryForInstanceProperties; -- (NSArray*) _relationshipsToFaultForRow: (NSDictionary*)row; -- (NSArray*) _classPropertyAttributes; -- (NSArray*) _attributesToSave; -- (NSArray*) _attributesToFetch; -- (EOMKKDInitializer*) _adaptorDictionaryInitializer; -- (EOMKKDInitializer*) _snapshotDictionaryInitializer; -- (EOMKKDInitializer*) _primaryKeyDictionaryInitializer; -- (EOMKKDInitializer*) _propertyDictionaryInitializer; -- (EOMKKDInitializer*) _instanceDictionaryInitializer; -- (void) _setModel: (EOModel*)model; -- (void) _setIsEdited; -- (NSArray*) _classPropertyAttributes; +- (NSDictionary *)attributesByName; +- (NSDictionary *)relationshipsByName; +- (NSArray *)_allFetchSpecifications; +- (NSDictionary *)_fetchSpecificationDictionary; +- (void)_loadEntity; +- (id)parentRelationship; +- (int)_numberOfRelationships; +- (BOOL)_hasReadOnlyAttributes; +- (NSArray *)writableDBSnapshotKeys; +- (NSArray *)rootAttributesUsedForLocking; +- (BOOL)isSubEntityOf: (id)param0; +- (id)initObject: (id)param0 + editingContext: (id)param1 + globalID: (id)param2; +- (id)allocBiggestObjectWithZone: (NSZone *)zone; +- (Class)_biggestClass; +- (NSArray *)relationshipsPlist; +- (id)rootParent; +- (void)_setParent: (id)param0; +- (NSArray *)_hiddenRelationships; +- (NSArray *)_propertyNames; +- (id)_flattenAttribute: (id)param0 + relationshipPath: (id)param1 + currentAttributes: (id)param2; +- (NSString *)snapshotKeyForAttributeName: (NSString *)attributeName; +- (id)_flattenedAttNameToSnapshotKeyMapping; +- (EOMKKDSubsetMapping *)_snapshotToAdaptorRowSubsetMapping; +- (EOMutableKnownKeyDictionary *)_dictionaryForPrimaryKey; +- (EOMutableKnownKeyDictionary *)_dictionaryForProperties; +- (EOMutableKnownKeyDictionary *)_dictionaryForInstanceProperties; +- (NSArray *)_relationshipsToFaultForRow: (NSDictionary *)row; +- (NSArray *)_classPropertyAttributes; +- (NSArray *)_attributesToSave; +- (NSArray *)_attributesToFetch; +- (EOMKKDInitializer *)_adaptorDictionaryInitializer; +- (EOMKKDInitializer *)_snapshotDictionaryInitializer; +- (EOMKKDInitializer *)_primaryKeyDictionaryInitializer; +- (EOMKKDInitializer *)_propertyDictionaryInitializer; +- (EOMKKDInitializer *)_instanceDictionaryInitializer; +- (void)_setModel: (EOModel *)model; +- (void)_setIsEdited; +- (NSArray *)_classPropertyAttributes; @end -@interface EOEntityClassDescription:EOClassDescription +@interface EOEntityClassDescription : EOClassDescription { EOEntity *_entity; unsigned int extraRefCount; } /** returns an autoreleased entity class description for entity entity **/ -+ (EOEntityClassDescription*)entityClassDescriptionWithEntity: (EOEntity *)entity; ++ (EOEntityClassDescription *)entityClassDescriptionWithEntity: (EOEntity *)entity; /** initialize with entity **/ -- initWithEntity: (EOEntity *)entity; +- (id)initWithEntity: (EOEntity *)entity; /** returns entity **/ - (EOEntity *)entity; @@ -371,7 +371,7 @@ GDL2ACCESS_EXPORT NSString *EONextPrimaryKeyProcedureOperation; /** returns a new autoreleased mutable dictionary to store properties returns nil if there's no key in the instanceDictionaryInitializer **/ -- (EOMutableKnownKeyDictionary*) dictionaryForInstanceProperties; +- (EOMutableKnownKeyDictionary *)dictionaryForInstanceProperties; @end @interface NSString (EODatabaseNameConversion) diff --git a/EOAccess/EOEntityPriv.h b/EOAccess/EOEntityPriv.h index 3020743..cfb3743 100644 --- a/EOAccess/EOEntityPriv.h +++ b/EOAccess/EOEntityPriv.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOEntityPriv.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -45,29 +45,29 @@ @end @interface EOEntity (EOEntityRelationshipPrivate) -- (EORelationship*) _inverseRelationshipPathForPath: (NSString*)path; -- (id) _keyMapForRelationshipPath: (NSString*)path; -- (id) _keyMapForIdenticalKeyRelationshipPath: (id)param0; -- (id) _mapAttribute: (id)param0 -toDestinationAttributeInLastComponentOfRelationshipPath: (NSString*)path; -- (BOOL) _relationshipPathIsToMany: (id)param0; -- (BOOL) _relationshipPathHasIdenticalKeys: (id)param0; +- (EORelationship *)_inverseRelationshipPathForPath: (NSString *)path; +- (id)_keyMapForRelationshipPath: (NSString *)path; +- (id)_keyMapForIdenticalKeyRelationshipPath: (id)param0; +- (id)_mapAttribute: (id)param0 +toDestinationAttributeInLastComponentOfRelationshipPath: (NSString *)path; +- (BOOL)_relationshipPathIsToMany: (id)param0; +- (BOOL)_relationshipPathHasIdenticalKeys: (id)param0; @end @interface EOEntity (EOEntitySQLExpression) -- (id) valueForSQLExpression: (id)param0; -+ (id) valueForSQLExpression: (id)param0; +- (id)valueForSQLExpression: (id)param0; ++ (id)valueForSQLExpression: (id)param0; @end @interface EOEntity (EOEntityPrivateXX) -- (EOExpressionArray *) _parseDescription: (NSString *)description - isFormat: (BOOL)isFormat - arguments: (char*)param2; -- (EOExpressionArray*) _parseRelationshipPath: (NSString*)path; -- (id) _parsePropertyName: (id)param0; -//- (id) _newStringWithBuffer: (unsigned short*)param0 -// length: (unsigned int*)param1; +- (EOExpressionArray *)_parseDescription: (NSString *)description + isFormat: (BOOL)isFormat + arguments: (char *)param2; +- (EOExpressionArray *)_parseRelationshipPath: (NSString *)path; +- (id)_parsePropertyName: (id)param0; +//- (id)_newStringWithBuffer: (unsigned short *)param0 +// length: (unsigned int *)param1; @end #endif diff --git a/EOAccess/EOExpressionArray.h b/EOAccess/EOExpressionArray.h index 39e9722..1111e77 100644 --- a/EOAccess/EOExpressionArray.h +++ b/EOAccess/EOExpressionArray.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOExpressionArray.h Copyright (C) 1996 Free Software Foundation, Inc. @@ -46,7 +46,7 @@ @protocol EOExpressionContext -- (NSString *)expressionValueForAttribute: (EOAttribute *)anAttribute; +- (NSString *)expressionValueForAttribute: (EOAttribute *)attribute; - (NSString *)expressionValueForAttributePath: (NSArray *)path; @end @@ -66,15 +66,15 @@ } _flags; } -+ (EOExpressionArray*)expressionArray; -+ (EOExpressionArray*)expressionArrayWithPrefix: (NSString *)prefix ++ (EOExpressionArray *)expressionArray; ++ (EOExpressionArray *)expressionArrayWithPrefix: (NSString *)prefix infix: (NSString *)infix suffix: (NSString *)suffix; /* Initializing instances */ -- initWithPrefix: (NSString *)prefix - infix: (NSString *)infix - suffix: (NSString *)suffix; +- (id)initWithPrefix: (NSString *)prefix + infix: (NSString *)infix + suffix: (NSString *)suffix; - (NSString *)prefix; - (NSString *)infix; @@ -85,12 +85,12 @@ - (EOAttribute *)realAttribute; /* Accessing the components */ -- (void)setPrefix: (NSString*)prefix; -- (void)setInfix: (NSString*)infix; -- (void)setSuffix: (NSString*)suffix; +- (void)setPrefix: (NSString *)prefix; +- (void)setInfix: (NSString *)infix; +- (void)setSuffix: (NSString *)suffix; /* Checking contents */ -- (BOOL)referencesObject: (id)anObject; +- (BOOL)referencesObject: (id)object; - (NSString *)expressionValueForContext: (id)ctx; @@ -98,13 +98,13 @@ entity: (EOEntity *)entity replacePropertyReferences: (BOOL)flag;*/ -- (NSString*)valueForSQLExpression: (EOSQLExpression *)sqlExpression; +- (NSString *)valueForSQLExpression: (EOSQLExpression *)sqlExpression; @end /* EOExpressionArray */ @interface NSObject (EOExpression) -- (NSString*)expressionValueForContext: (id)context; +- (NSString *)expressionValueForContext: (id)context; @end diff --git a/EOAccess/EOJoin.h b/EOAccess/EOJoin.h index 6f9e29a..ff0c561 100644 --- a/EOAccess/EOJoin.h +++ b/EOAccess/EOJoin.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOJoin.h Copyright (C) 1996 Free Software Foundation, Inc. @@ -46,8 +46,8 @@ + (EOJoin *)joinWithSourceAttribute: (EOAttribute *)source destinationAttribute: (EOAttribute *)destination; -- initWithSourceAttribute: (EOAttribute *)source - destinationAttribute: (EOAttribute *)destination; +- (id)initWithSourceAttribute: (EOAttribute *)source + destinationAttribute: (EOAttribute *)destination; - (NSString *)description; @@ -61,8 +61,8 @@ @interface EOJoin (EOJoinPrivate) -//+ (EOJoin*)joinFromPropertyList:(id)propertyList; -//- (void)replaceStringsWithObjectsInRelationship:(EORelationship*)entity; +//+ (EOJoin *)joinFromPropertyList: (id)propertyList; +//- (void)replaceStringsWithObjectsInRelationship: (EORelationship *)entity; //- (id)propertyList; @end /* EOJoin (EOJoinPrivate) */ diff --git a/EOAccess/EOModel.h b/EOAccess/EOModel.h index a4f84f5..be377e0 100644 --- a/EOAccess/EOModel.h +++ b/EOAccess/EOModel.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOModel.h Copyright (C) 2000-2002 Free Software Foundation, Inc. @@ -79,7 +79,7 @@ + (EOModel *)model; /** Getting the filename **/ -- (NSString*)path; +- (NSString *)path; /** Getting the name **/ - (NSString *)name; @@ -87,7 +87,7 @@ - (NSString *)adaptorClassName; /** Using entities **/ -- (EOEntity *)entityNamed: (NSString*)name; +- (EOEntity *)entityNamed: (NSString *)name; - (NSArray *)entities; - (NSArray *)entityNames; @@ -96,7 +96,7 @@ - (NSArray *)storedProcedures; /** Getting an object's entity **/ -- (EOEntity *)entityForObject: object; +- (EOEntity *)entityForObject: (id)object; /** Accessing the connection dictionary **/ - (NSDictionary *)connectionDictionary; @@ -105,7 +105,7 @@ - (NSDictionary *)userInfo; /** Accessing documentation comments **/ -- (NSString*)docComment; +- (NSString *)docComment; - (EOModelGroup *)modelGroup; @@ -116,15 +116,15 @@ @interface EOModel (EOModelFileAccess) + (EOModel *)modelWithContentsOfFile: (NSString *)path; -- initWithContentsOfFile: (NSString *)path; +- (id)initWithContentsOfFile: (NSString *)path; - (void)writeToFile: (NSString *)path; @end @interface EOModel (EOModelPropertyList) -- (id) initWithTableOfContentsPropertyList: (NSDictionary *)tableOfContents - path: (NSString *)path; +- (id)initWithTableOfContentsPropertyList: (NSDictionary *)tableOfContents + path: (NSString *)path; - (void)encodeTableOfContentsIntoPropertyList: (NSMutableDictionary *)propertyList; - (void)encodeIntoPropertyList: (NSMutableDictionary *)propertyList; @@ -174,7 +174,7 @@ - (void)loadAllModelObjects; /* Checking references */ -- (NSArray *)referencesToProperty: property; +- (NSArray *)referencesToProperty: (id)property; - (NSArray *)externalModelsReferenced; @end diff --git a/EOAccess/EOModelGroup.h b/EOAccess/EOModelGroup.h index 7c00e23..78d39da 100644 --- a/EOAccess/EOModelGroup.h +++ b/EOAccess/EOModelGroup.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOModelGroup.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -31,6 +31,8 @@ #include +#include + @class NSArray; @class NSDictionary; @@ -79,7 +81,7 @@ - (void)addModel: (EOModel *)model; -- (EOModel*)addModelWithFile: (NSString *)path; +- (EOModel *)addModelWithFile: (NSString *)path; - (void)removeModel: (EOModel *)model; @@ -97,13 +99,12 @@ - (EOFetchSpecification *)fetchSpecificationNamed: (NSString *)fetchSpecName entityNamed: (NSString *)entityName; -- (EOStoredProcedure *)storedProcedureNamed: (NSString *)aName; +- (EOStoredProcedure *)storedProcedureNamed: (NSString *)name; @end -// Notifications: -extern NSString *EOModelAddedNotification; -extern NSString *EOModelInvalidatedNotification; +GDL2ACCESS_EXPORT NSString *EOModelAddedNotification; +GDL2ACCESS_EXPORT NSString *EOModelInvalidatedNotification; @interface NSObject (EOModelGroupClassDelegation) diff --git a/EOAccess/EOPropertyListEncoding.h b/EOAccess/EOPropertyListEncoding.h index a04eaff..b774aa4 100644 --- a/EOAccess/EOPropertyListEncoding.h +++ b/EOAccess/EOPropertyListEncoding.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOPropertyListEncoding.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -41,7 +41,7 @@ @protocol EOPropertyListEncoding -- initWithPropertyList: (NSDictionary *)propertyList owner: (id)owner; +- (id)initWithPropertyList: (NSDictionary *)propertyList owner: (id)owner; - (void)awakeWithPropertyList: (NSDictionary *)propertyList; diff --git a/EOAccess/EORelationship.h b/EOAccess/EORelationship.h index 172c345..13dfcf1 100644 --- a/EOAccess/EORelationship.h +++ b/EOAccess/EORelationship.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EORelationship.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -99,7 +99,7 @@ typedef enum { GCMutableArray *_componentRelationships;//Used ???? } -+ (id) relationshipWithPropertyList: (NSDictionary *)propertyList ++ (id)relationshipWithPropertyList: (NSDictionary *)propertyList owner: (id)owner; - (NSString *)name; @@ -116,7 +116,7 @@ typedef enum { - (BOOL)isCompound; -- (BOOL) isParentRelationship; +- (BOOL)isParentRelationship; - (NSArray *)sourceAttributes; @@ -125,7 +125,7 @@ typedef enum { - (NSArray *)joins; - (EOJoinSemantic)joinSemantic; -- (NSString*)joinSemanticString; +- (NSString *)joinSemanticString; - (NSArray *)componentRelationships; @@ -152,7 +152,7 @@ typedef enum { - (EOQualifier *)qualifierWithSourceRow: (NSDictionary *)sourceRow; /** Accessing documentation comments **/ -- (NSString*)docComment; +- (NSString *)docComment; @end @@ -163,7 +163,7 @@ typedef enum { - (void)setEntity: (EOEntity *)entity; - (void)setToMany: (BOOL)yn; - (void)setPropagatesPrimaryKey: (BOOL)yn; -- (void)setIsBidirectional:(BOOL)yn; +- (void)setIsBidirectional: (BOOL)yn; - (void)setOwnsDestination: (BOOL)yn; - (void)addJoin: (EOJoin *)join; - (void)removeJoin: (EOJoin *)join; @@ -188,8 +188,8 @@ typedef enum { @interface EORelationship (EORelationshipPrivate) -/*+ (EORelationship*)relationshipFromPropertyList: (id)propertyList - model: (EOModel*)model; +/*+ (EORelationship *)relationshipFromPropertyList: (id)propertyList + model: (EOModel *)model; - (void)replaceStringsWithObjects; - (void)initFlattenedRelationship; @@ -197,42 +197,42 @@ typedef enum { - (void)setCreateMutableObjects: (BOOL)flag; - (BOOL)createsMutableObjects; -- (void)setInverseRelationship: (EORelationship*)relationship; +- (void)setInverseRelationship: (EORelationship *)relationship; @end /* EORelationship (EORelationshipPrivate) */ @interface EORelationship (EORelationshipXX) -- (NSArray*) _intermediateAttributes; -- (EORelationship*) lastRelationship; -- (EORelationship*) firstRelationship; -- (id) intermediateEntity; -- (BOOL) isMultiHop; -- (void) _setSourceToDestinationKeyMap: (id)param0; -- (id) qualifierForDBSnapshot: (id)param0; -- (id) primaryKeyForTargetRowFromSourceDBSnapshot: (id)param0; -- (NSString*)relationshipPath; +- (NSArray *)_intermediateAttributes; +- (EORelationship *)lastRelationship; +- (EORelationship *)firstRelationship; +- (id)intermediateEntity; +- (BOOL)isMultiHop; +- (void)_setSourceToDestinationKeyMap: (id)param0; +- (id)qualifierForDBSnapshot: (id)param0; +- (id)primaryKeyForTargetRowFromSourceDBSnapshot: (id)param0; +- (NSString *)relationshipPath; - (BOOL)isToManyToOne; -- (NSDictionary*)_sourceToDestinationKeyMap; +- (NSDictionary *)_sourceToDestinationKeyMap; - (BOOL)foreignKeyInDestination; @end @interface EORelationship (EORelationshipPrivate2) -- (BOOL) isPropagatesPrimaryKeyPossible; -- (id) qualifierOmittingAuxiliaryQualifierWithSourceRow: (id)param0; -- (id) auxiliaryQualifier; -- (void) setAuxiliaryQualifier: (id)param0; -- (id) _foreignKeyForSourceRow: (NSDictionary*)row; -- (EOMKKDSubsetMapping*) _sourceRowToForeignKeyMapping; -- (NSArray*) _sourceAttributeNames; -- (EOJoin*) joinForAttribute: (EOAttribute*)attribute; -- (void) _flushCache; -- (EOExpressionArray*) _definitionArray; -- (NSString*) _stringFromDeleteRule: (EODeleteRule)deleteRule; -- (EODeleteRule) _deleteRuleFromString: (NSString*)deleteRuleString; -- (NSDictionary*) _rightSideKeyMap; -- (NSDictionary*) _leftSideKeyMap; -- (EORelationship*)_substitutionRelationshipForRow: (NSDictionary*)row; -- (void) _joinsChanged; +- (BOOL)isPropagatesPrimaryKeyPossible; +- (id)qualifierOmittingAuxiliaryQualifierWithSourceRow: (id)param0; +- (id)auxiliaryQualifier; +- (void)setAuxiliaryQualifier: (id)param0; +- (id)_foreignKeyForSourceRow: (NSDictionary *)row; +- (EOMKKDSubsetMapping *)_sourceRowToForeignKeyMapping; +- (NSArray *)_sourceAttributeNames; +- (EOJoin *)joinForAttribute: (EOAttribute *)attribute; +- (void)_flushCache; +- (EOExpressionArray *)_definitionArray; +- (NSString *)_stringFromDeleteRule: (EODeleteRule)deleteRule; +- (EODeleteRule)_deleteRuleFromString: (NSString *)deleteRuleString; +- (NSDictionary *)_rightSideKeyMap; +- (NSDictionary *)_leftSideKeyMap; +- (EORelationship *)_substitutionRelationshipForRow: (NSDictionary *)row; +- (void)_joinsChanged; @end #endif /* __EORelationship_h__ */ diff --git a/EOAccess/EOSQLExpression.h b/EOAccess/EOSQLExpression.h index 1921282..6ba92be 100644 --- a/EOAccess/EOSQLExpression.h +++ b/EOAccess/EOSQLExpression.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOSQLExpression.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -91,8 +91,10 @@ GDL2ACCESS_EXPORT NSString *EOBindVariableColumnKey; qualifier: (EOQualifier *)qualifier entity: (EOEntity *)entity; +/* 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: entity; + entity: (id)entity; + (EOSQLExpression *)selectStatementForAttributes: (NSArray *)attributes lock: (BOOL)yn @@ -101,7 +103,7 @@ GDL2ACCESS_EXPORT NSString *EOBindVariableColumnKey; + (id)sqlExpressionWithEntity: (EOEntity *)entity; -- initWithEntity: (EOEntity *)entity; +- (id)initWithEntity: (EOEntity *)entity; - (NSMutableDictionary *)aliasesByRelationshipPath; - (EOEntity *)entity; @@ -112,7 +114,7 @@ GDL2ACCESS_EXPORT NSString *EOBindVariableColumnKey; - (NSMutableString *)orderByString; - (NSString *)whereClauseString; - (NSString *)statement; -- (void)setStatement:(NSString *)statement; +- (void)setStatement: (NSString *)statement; - (NSString *)lockClause; - (NSString *)tableListWithRootEntity: (EOEntity *)entity; @@ -175,9 +177,7 @@ GDL2ACCESS_EXPORT NSString *EOBindVariableColumnKey; value: (NSString *)value; + (NSString *)formatStringValue: (NSString *)string; - + (NSString *)formatValue: (id)value forAttribute: (EOAttribute *)attribute; - + (NSString *)formatSQLString: (NSString *)sqlString format: (NSString *)format; @@ -199,15 +199,10 @@ GDL2ACCESS_EXPORT NSString *EOBindVariableColumnKey; - (BOOL)useAliases; - (NSString *)sqlStringForSchemaObjectName: (NSString *)name; - - (NSString *)sqlStringForAttributeNamed: (NSString *)name; - - (NSString *)sqlStringForSelector: (SEL)selector value: (id)value; - - (NSString *)sqlStringForValue: (id)value attributeNamed: (NSString *)string; - -- (NSString *)sqlStringForAttribute: (EOAttribute *)anAttribute; - +- (NSString *)sqlStringForAttribute: (EOAttribute *)attribute; - (NSString *)sqlStringForAttributePath: (NSArray *)path; - (void)appendItem: (NSString *)itemString @@ -219,17 +214,15 @@ GDL2ACCESS_EXPORT NSString *EOBindVariableColumnKey; - (NSMutableDictionary *)bindVariableDictionaryForAttribute: (EOAttribute *)attribute - value: value; + value: (id)value; - (BOOL)shouldUseBindVariableForAttribute: (EOAttribute *)att; - - (BOOL)mustUseBindVariableForAttribute: (EOAttribute *)att; + (BOOL)useBindVariables; + (void)setUseBindVariables: (BOOL)yn; - (NSArray *)bindVariableDictionaries; - - (void)addBindVariableDictionary: (NSMutableDictionary *)binding; @end diff --git a/EOAccess/EOSQLExpressionPriv.h b/EOAccess/EOSQLExpressionPriv.h index 34254ec..d34acad 100644 --- a/EOAccess/EOSQLExpressionPriv.h +++ b/EOAccess/EOSQLExpressionPriv.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOSQLExpression.h Copyright (C) 2002 Free Software Foundation, Inc. @@ -37,15 +37,15 @@ @interface EOSQLExpression (EOSQLExpressionPrivate) - (EOEntity *)_rootEntityForExpression; -- (id) _aliasForRelationshipPath: (id)param0; -- (id) _flattenRelPath: (id)param0 - entity: (id)param1; -- (NSString*) _sqlStringForJoinSemantic: (EOJoinSemantic)joinSemantic +- (id)_aliasForRelationshipPath: (id)param0; +- (id)_flattenRelPath: (id)param0 + entity: (id)param1; +- (NSString *)_sqlStringForJoinSemantic: (EOJoinSemantic)joinSemantic matchSemantic: (int)param1; -- (id) _aliasForRelatedAttribute: (id)param0 - relationshipPath: (id)param1; -- (id) _entityForRelationshipPath: (id)param0 - origin: (id)param1; +- (id)_aliasForRelatedAttribute: (id)param0 + relationshipPath: (id)param1; +- (id)_entityForRelationshipPath: (id)param0 + origin: (id)param1; @end diff --git a/EOAccess/EOSQLQualifier.h b/EOAccess/EOSQLQualifier.h index 6d8db4f..133b08e 100644 --- a/EOAccess/EOSQLQualifier.h +++ b/EOAccess/EOSQLQualifier.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOSQLQualifier.h Copyright (C) 2000-2002 Free Software Foundation, Inc. @@ -51,7 +51,8 @@ - (NSString *)sqlStringForSQLExpression: (EOSQLExpression *)sqlExpression; -/** Returns an equivalent EOQualifier with object references replaced by foreign key references. **/ +/** Returns an equivalent EOQualifier yet having the object references + replaced by foreign key references. **/ - (EOQualifier *)schemaBasedQualifierWithRootEntity: (EOEntity *)entity; @end @@ -69,9 +70,6 @@ @end -// -// Finally, declare the EOSQLQualifier class. -// @interface EOSQLQualifier : EOQualifier { EOEntity *_entity; @@ -87,12 +85,11 @@ - (id)initWithEntity: (EOEntity *)entity qualifierFormat: (NSString *)qualifierFormat, ...; -// This is the designated initializer for EOSQLQualifier. @end @interface NSString (NSStringSQLExpression) -- (NSString *) valueForSQLExpression: (EOSQLExpression *)sqlExpression; +- (NSString *)valueForSQLExpression: (EOSQLExpression *)sqlExpression; @end #endif diff --git a/EOAccess/EOStoredProcedure.h b/EOAccess/EOStoredProcedure.h index 4f38ca4..679d081 100644 --- a/EOAccess/EOStoredProcedure.h +++ b/EOAccess/EOStoredProcedure.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOStoredProcedure.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -54,7 +54,7 @@ + (EOStoredProcedure *)storedProcedureWithPropertyList: (NSDictionary *)propertyList owner: (id)owner; -- (EOStoredProcedure *)initWithName:(NSString *)name; +- (EOStoredProcedure *)initWithName: (NSString *)name; - (NSString *)name; @@ -66,14 +66,14 @@ - (NSDictionary *)userInfo; -- (void)setName:(NSString *)name; -- (void)setExternalName:(NSString *)name; -- (void)setArguments:(NSArray *)arguments; -- (void)setUserInfo:(NSDictionary *)dictionary; +- (void)setName: (NSString *)name; +- (void)setExternalName: (NSString *)name; +- (void)setArguments: (NSArray *)arguments; +- (void)setUserInfo: (NSDictionary *)dictionary; @end -@interface EOStoredProcedure(EOModelBeautifier) +@interface EOStoredProcedure (EOModelBeautifier) - (void)beautifyName; diff --git a/EOAccess/EOUtilities.h b/EOAccess/EOUtilities.h index d557494..96a396f 100644 --- a/EOAccess/EOUtilities.h +++ b/EOAccess/EOUtilities.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOUtilities.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -49,67 +49,67 @@ GDL2ACCESS_EXPORT NSString *EOMoreThanOneException; @interface EOEditingContext (EOUtilities) -- (NSArray*)objectsForEntityNamed: (NSString*)name; -- (NSArray*)objectsOfClass: (Class)classObject; -- (NSArray*)objectsWithFetchSpecificationNamed: (NSString*)fetchSpecName - entityNamed: (NSString*)entityName - bindings: (NSDictionary*)bindings; -- (NSArray*)objectsForEntityNamed: (NSString*)name - qualifierFormat: (NSString*)format, ...; -- (NSArray*)objectsMatchingValue: (id)value - forKey: (NSString*)key - entityNamed: (NSString*)name; -- (NSArray*)objectsMatchingValues: (NSDictionary*)values - entityNamed: (NSString*)name; +- (NSArray *)objectsForEntityNamed: (NSString *)name; +- (NSArray *)objectsOfClass: (Class)classObject; +- (NSArray *)objectsWithFetchSpecificationNamed: (NSString *)fetchSpecName + entityNamed: (NSString *)entityName + bindings: (NSDictionary *)bindings; +- (NSArray *)objectsForEntityNamed: (NSString *)name + qualifierFormat: (NSString *)format, ...; +- (NSArray *)objectsMatchingValue: (id)value + forKey: (NSString *)key + entityNamed: (NSString *)name; +- (NSArray *)objectsMatchingValues: (NSDictionary *)values + entityNamed: (NSString *)name; -- (id)objectWithFetchSpecificationNamed: (NSString*)fetchSpecName - entityNamed: (NSString*)entityName - bindings: (NSDictionary*)bindings; -- (id)objectForEntityNamed: (NSString*)name - qualifierFormat: (NSString*)format, ...; +- (id)objectWithFetchSpecificationNamed: (NSString *)fetchSpecName + entityNamed: (NSString *)entityName + bindings: (NSDictionary *)bindings; +- (id)objectForEntityNamed: (NSString *)name + qualifierFormat: (NSString *)format, ...; - (id)objectMatchingValue: (id)value - forKey: (NSString*)key - entityNamed: (NSString*)name; -- (id)objectMatchingValues: (NSDictionary*)values - entityNamed: (NSString*)name; + forKey: (NSString *)key + entityNamed: (NSString *)name; +- (id)objectMatchingValues: (NSDictionary *)values + entityNamed: (NSString *)name; - (id)objectWithPrimaryKeyValue: (id)value - entityNamed: (NSString*)name; -- (id)objectWithPrimaryKey: (NSDictionary*)pkDict - entityNamed: (NSString*)name; + entityNamed: (NSString *)name; +- (id)objectWithPrimaryKey: (NSDictionary *)pkDict + entityNamed: (NSString *)name; -- (NSArray*)rawRowsForEntityNamed: (NSString*)name - qualifierFormat: (NSString*)format, ...; -- (NSArray*)rawRowsMatchingValue: (id)value - forKey: (NSString*)key - entityNamed: (NSString*)name; -- (NSArray*)rawRowsMatchingValues: (NSDictionary*)values - entityNamed: (NSString*)name; -- (NSArray*)rawRowsWithSQL: (NSString*)sqlString - modelNamed: (NSString*)name; -- (NSArray*)rawRowsWithStoredProcedureNamed: (NSString*)name - arguments: (NSDictionary*)args; -- (NSDictionary*)executeStoredProcedureNamed: (NSString*)name - arguments: (NSDictionary*)args; -- (id)objectFromRawRow: (NSDictionary*)row - entityNamed: (NSString*)name; +- (NSArray *)rawRowsForEntityNamed: (NSString *)name + qualifierFormat: (NSString *)format, ...; +- (NSArray *)rawRowsMatchingValue: (id)value + forKey: (NSString *)key + entityNamed: (NSString *)name; +- (NSArray *)rawRowsMatchingValues: (NSDictionary *)values + entityNamed: (NSString *)name; +- (NSArray *)rawRowsWithSQL: (NSString *)sqlString + modelNamed: (NSString *)name; +- (NSArray *)rawRowsWithStoredProcedureNamed: (NSString *)name + arguments: (NSDictionary *)args; +- (NSDictionary *)executeStoredProcedureNamed: (NSString *)name + arguments: (NSDictionary *)args; +- (id)objectFromRawRow: (NSDictionary *)row + entityNamed: (NSString *)name; -- (EODatabaseContext*)databaseContextForModelNamed: (NSString*)name; -- (void)connectWithModelNamed: (NSString*)name -connectionDictionaryOverrides: (NSDictionary*)overrides; +- (EODatabaseContext *)databaseContextForModelNamed: (NSString *)name; +- (void)connectWithModelNamed: (NSString *)name +connectionDictionaryOverrides: (NSDictionary *)overrides; - (id)createAndInsertInstanceOfEntityNamed: (NSString *)entityName; -- (NSDictionary*)primaryKeyForObject: (id)object; -- (NSDictionary*)destinationKeyForSourceObject: (id)object - relationshipNamed: (NSString*)name; +- (NSDictionary *)primaryKeyForObject: (id)object; +- (NSDictionary *)destinationKeyForSourceObject: (id)object + relationshipNamed: (NSString *)name; - (id)localInstanceOfObject: (id)object; -- (NSArray*)localInstancesOfObjects: (NSArray*)objects; +- (NSArray *)localInstancesOfObjects: (NSArray *)objects; -- (EOModelGroup*)modelGroup; -- (EOEntity*)entityNamed: (NSString*)name; -- (EOEntity*)entityForClass: (Class)classObject; -- (EOEntity*)entityForObject: (id)obj; +- (EOModelGroup *)modelGroup; +- (EOEntity *)entityNamed: (NSString *)name; +- (EOEntity *)entityForClass: (Class)classObject; +- (EOEntity *)entityForObject: (id)obj; @end @@ -124,8 +124,8 @@ connectionDictionaryOverrides: (NSDictionary*)overrides; @interface EOObjectStoreCoordinator (EOModelGroup) -- (id) modelGroup; -- (void) setModelGroup: (EOModelGroup*)modelGroup; +- (id)modelGroup; +- (void)setModelGroup: (EOModelGroup *)modelGroup; @end diff --git a/EOControl/EOArrayDataSource.h b/EOControl/EOArrayDataSource.h index b973f44..cec3eb3 100644 --- a/EOControl/EOArrayDataSource.h +++ b/EOControl/EOArrayDataSource.h @@ -1,4 +1,4 @@ -/** +/* -*-objc-*- EOArrayDataSource.h Copyright (C) 2003 Free Software Foundation, Inc. @@ -42,10 +42,10 @@ EOClassDescription *_classDescription; } -- (id) initWithClassDescription: (EOClassDescription *)classDescription - editingContext: (EOEditingContext *)context; +- (id)initWithClassDescription: (EOClassDescription *)classDescription + editingContext: (EOEditingContext *)context; -- (void) setArray: (NSArray *)array; +- (void)setArray: (NSArray *)array; @end diff --git a/EOControl/EOCheapArray.h b/EOControl/EOCheapArray.h index b8fda5f..7b2088b 100644 --- a/EOControl/EOCheapArray.h +++ b/EOControl/EOCheapArray.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOCheapArray.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -43,17 +43,17 @@ unsigned int _refcount; } -- (id) initWithArray: (id)array; -- (id) initWithObjects: (id*)objects - count: (unsigned int)count; -- (void) dealloc; -- (void) release; -- (unsigned int) retainCount; -- (id) retain; -- (id) objectAtIndex: (unsigned int)index; -//- (id) copyWithZone: (NSZone*)zone; -- (unsigned int) count; -//- (BOOL) containsObject: (id)obejct; +- (id)initWithArray: (id)array; +- (id)initWithObjects: (id *)objects + count: (unsigned int)count; +- (void)dealloc; +- (void)release; +- (unsigned int)retainCount; +- (id)retain; +- (id)objectAtIndex: (unsigned int)index; +//- (id)copyWithZone: (NSZone *)zone; +- (unsigned int)count; +//- (BOOL)containsObject: (id)obejct; @end @@ -67,28 +67,28 @@ id _immutableCopy; } -- (id) initWithCapacity: (unsigned int)capacity; -- (id) initWithObjects: (id*)objects - count: (unsigned int)count; -- (id) initWithArray: (NSArray*)array; -- (void) dealloc; -- (id) shallowCopy; -- (void) _setCopy: (id)param0; -- (void) _mutate; -- (unsigned int) count; -- (id) objectAtIndex: (unsigned int)index; -- (void) addObject: (id)object; -- (void) insertObject: (id)object - atIndex: (unsigned int)index; -- (void) removeLastObject; -- (void) removeObjectAtIndex: (unsigned int)index; -- (void) replaceObjectAtIndex: (unsigned int)index - withObject: (id)object; -//- (BOOL) containsObject: (id)object; -//- (unsigned int) indexOfObjectIdenticalTo: (id)object; -//- (void) removeAllObjects; -- (void) exchangeObjectAtIndex: (unsigned int)index1 - withObjectAtIndex: (unsigned int)index2; +- (id)initWithCapacity: (unsigned int)capacity; +- (id)initWithObjects: (id *)objects + count: (unsigned int)count; +- (id)initWithArray: (NSArray *)array; +- (void)dealloc; +- (id)shallowCopy; +- (void)_setCopy: (id)param0; +- (void)_mutate; +- (unsigned int)count; +- (id)objectAtIndex: (unsigned int)index; +- (void)addObject: (id)object; +- (void)insertObject: (id)object + atIndex: (unsigned int)index; +- (void)removeLastObject; +- (void)removeObjectAtIndex: (unsigned int)index; +- (void)replaceObjectAtIndex: (unsigned int)index + withObject: (id)object; +//- (BOOL)containsObject: (id)object; +//- (unsigned int)indexOfObjectIdenticalTo: (id)object; +//- (void)removeAllObjects; +- (void)exchangeObjectAtIndex: (unsigned int)index1 + withObjectAtIndex: (unsigned int)index2; @end diff --git a/EOControl/EOClassDescription.h b/EOControl/EOClassDescription.h index 58adba8..18f22c2 100644 --- a/EOControl/EOClassDescription.h +++ b/EOControl/EOClassDescription.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOClassDescription.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -35,6 +35,7 @@ #include #endif +#include @class NSDictionary; @class NSFormatter; @@ -65,7 +66,9 @@ typedef enum + (void)setClassDelegate: (id)delegate; + (id)classDelegate; -// Must be implemented by subclasses. +/* + * Subclass responsibility. + */ - (NSString *)entityName; - (id)createInstanceWithEditingContext: (EOEditingContext *)editingContext @@ -86,10 +89,10 @@ fromFetchInEditingContext: (EOEditingContext *)editingContext; - (NSArray *)toManyRelationshipKeys; /** returns a new autoreleased mutable dictionary to store properties **/ -- (NSMutableDictionary*) dictionaryForInstanceProperties; +- (NSMutableDictionary *)dictionaryForInstanceProperties; - (EORelationship *)relationshipNamed: (NSString *)relationshipName; -- (EORelationship *)anyRelationshipNamed: (NSString *)relationshipNamed; +- (EORelationship *)anyRelationshipNamed: (NSString *)relationshipName; - (NSString *)inverseForRelationshipKey: (NSString *)relationshipKey; @@ -103,7 +106,7 @@ fromFetchInEditingContext: (EOEditingContext *)editingContext; - (NSString *)displayNameForKey: (NSString *)key; -- (NSString *)userPresentableDescriptionForObject: (id)anObject; +- (NSString *)userPresentableDescriptionForObject: (id)object; - (NSException *)validateValue: (id *)valueP forKey: (NSString *)key; @@ -116,9 +119,9 @@ fromFetchInEditingContext: (EOEditingContext *)editingContext; @interface NSObject (EOInitialization) -- initWithEditingContext: (EOEditingContext *)ec - classDescription: (EOClassDescription *)classDesc - globalID: (EOGlobalID *)globalID; +- (id)initWithEditingContext: (EOEditingContext *)editingContext + classDescription: (EOClassDescription *)classDescription + globalID: (EOGlobalID *)globalID; @end @@ -149,12 +152,9 @@ fromFetchInEditingContext: (EOEditingContext *)editingContext; @end -// Notifications: - -extern NSString *EOClassDescriptionNeededNotification; -extern NSString *EOClassDescriptionNeededForClassNotification; - -extern NSString *EOClassDescriptionNeededForEntityNameNotification; +GDL2CONTROL_EXPORT NSString *EOClassDescriptionNeededNotification; +GDL2CONTROL_EXPORT NSString *EOClassDescriptionNeededForClassNotification; +GDL2CONTROL_EXPORT NSString *EOClassDescriptionNeededForEntityNameNotification; @interface NSArray (EOShallowCopy) @@ -187,21 +187,25 @@ extern NSString *EOClassDescriptionNeededForEntityNameNotification; @interface NSObject (EOKeyRelationshipManipulation) -- (void)addObject: object toPropertyWithKey: (NSString *)key; +- (void)addObject: (id)object toPropertyWithKey: (NSString *)key; -- (void)removeObject: object fromPropertyWithKey: (NSString *)key; +- (void)removeObject: (id)object fromPropertyWithKey: (NSString *)key; -- (void)addObject: object toBothSidesOfRelationshipWithKey: (NSString *)key; -- (void)removeObject: object +- (void)addObject: (id)object +toBothSidesOfRelationshipWithKey: (NSString *)key; + +- (void)removeObject: (id)object fromBothSidesOfRelationshipWithKey: (NSString *)key; @end -// Validation exceptions (with name EOValidationException) -extern NSString *EOValidationException; -extern NSString *EOAdditionalExceptionsKey; -extern NSString *EOValidatedObjectUserInfoKey; -extern NSString *EOValidatedPropertyUserInfoKey; +/* + * Validation exceptions (with name EOValidationException) + */ +GDL2CONTROL_EXPORT NSString *EOValidationException; +GDL2CONTROL_EXPORT NSString *EOAdditionalExceptionsKey; +GDL2CONTROL_EXPORT NSString *EOValidatedObjectUserInfoKey; +GDL2CONTROL_EXPORT NSString *EOValidatedPropertyUserInfoKey; @interface NSException (EOValidationError) @@ -214,7 +218,7 @@ extern NSString *EOValidatedPropertyUserInfoKey; @interface NSObject (EOClassDescriptionClassDelegate) - (BOOL)shouldPropagateDeleteForObject: (id)object - inEditingContext: (EOEditingContext *)ec + inEditingContext: (EOEditingContext *)editingContext forRelationshipKey: (NSString *)key; @end @@ -230,7 +234,7 @@ extern NSString *EOValidatedPropertyUserInfoKey; @end @interface NSObject (_EOEditingContext) -- (EOEditingContext*)editingContext; +- (EOEditingContext *)editingContext; @end #endif diff --git a/EOControl/EODataSource.h b/EOControl/EODataSource.h index 9a1f09d..560b609 100644 --- a/EOControl/EODataSource.h +++ b/EOControl/EODataSource.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EODataSource.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -44,23 +44,18 @@ @interface EODataSource : NSObject - (id)createObject; - -- (void)insertObject: object; - -- (void)deleteObject: object; - +- (void)insertObject: (id)object; +- (void)deleteObject: (id)object; - (NSArray *)fetchObjects; - (EOEditingContext *)editingContext; -- (void)qualifyWithRelationshipKey: (NSString *)key ofObject: sourceObject; - +- (void)qualifyWithRelationshipKey: (NSString *)key ofObject: (id)sourceObject; - (EODataSource *)dataSourceQualifiedByKey: (NSString *)key; - (EOClassDescription *)classDescriptionForObjects; - (NSArray *)qualifierBindingKeys; - - (void)setQualifierBindings: (NSDictionary *)bindings; - (NSDictionary *)qualifierBindings; diff --git a/EOControl/EODebug.h b/EOControl/EODebug.h index 9208355..d1272cd 100644 --- a/EOControl/EODebug.h +++ b/EOControl/EODebug.h @@ -1,4 +1,5 @@ -/* debug.h - debug +/* -*-objc-*- + debug.h - debug Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. Written by: Manuel Guesdon @@ -273,7 +274,7 @@ GDL2CONTROL_EXPORT void EOFLogAssertGood_(const char* file,int line, #endif #ifndef NSEmitTODO -#define NSEmitTODO(); NSLog(@"DVLP WARNING %s (%d): TODO",(char*)__FILE__,(int)__LINE__); +#define NSEmitTODO(); NSLog(@"DVLP WARNING %s (%d): TODO",(char *)__FILE__,(int)__LINE__); #endif #endif // _EODebug_h__ diff --git a/EOControl/EODefines.h b/EOControl/EODefines.h index 114aa30..bdf5c3c 100644 --- a/EOControl/EODefines.h +++ b/EOControl/EODefines.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EODefines.h Copyright (C) 2003 Free Software Foundation, Inc. diff --git a/EOControl/EODeprecated.h b/EOControl/EODeprecated.h index 5eeb0f5..15d6a8e 100644 --- a/EOControl/EODeprecated.h +++ b/EOControl/EODeprecated.h @@ -1,4 +1,4 @@ -/** +/** -*-objc-*- EODeprecated.h Copyright (C) 2003 Free Software Foundation, Inc. @@ -39,32 +39,32 @@ @interface NSObject (EODeprecated) /** Deprecated. GDL2 doesn't cache key bindungs.*/ -+ (void) flushClassKeyBindings; ++ (void)flushClassKeyBindings; @end @interface EOClassDescription (EODeprecated) /** Deprecated. Use +setClassDelegate. */ -+ (void) setDelegate:(id)delegate; ++ (void)setDelegate: (id)delegate; /** Deprecated. Use +classDelegate. */ -+ (id) delegate; ++ (id)delegate; @end /** Deprecated. Use NSUndoManager. */ @interface EOUndoManager : NSUndoManager /** Deprecated. Use -removeAllActionsWithTarget:. */ -- (void) forgetAllWithTarget: (id)param0; +- (void)forgetAllWithTarget: (id)param0; /** Deprecated. Use -removeAllActionsWithTarget:. */ -- (void) forgetAll; +- (void)forgetAll; /** Deprecated. Use -registerUndoWithTarget:selector:object:. */ -- (void) registerUndoWithTarget: (id)param0 - selector: (SEL)param1 - arg: (id)param2; +- (void)registerUndoWithTarget: (id)param0 + selector: (SEL)param1 + arg: (id)param2; /** Deprecated. Use -enableUndoRegistration. */ -- (void) reenableUndoRegistration; +- (void)reenableUndoRegistration; @end diff --git a/EOControl/EODetailDataSource.h b/EOControl/EODetailDataSource.h index 2d92fc9..87acd2d 100644 --- a/EOControl/EODetailDataSource.h +++ b/EOControl/EODetailDataSource.h @@ -1,5 +1,5 @@ -/* - EODetailDataSource.m +/* -*-objc-*- + EODetailDataSource.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -44,13 +44,13 @@ + (EODetailDataSource *)detailDataSourceWithMasterDataSource: (EODataSource *)master detailKey: (NSString *)detailKey; -- initWithMasterClassDescription: (EOClassDescription *)masterClassDescription - detailKey: (NSString *)detailKey; +- (id)initWithMasterClassDescription: (EOClassDescription *)masterClassDescription + detailKey: (NSString *)detailKey; -- initWithMasterDataSource: (EODataSource *)master - detailKey: (NSString *)detailKey; +- (id)initWithMasterDataSource: (EODataSource *)master + detailKey: (NSString *)detailKey; -- (id) initWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver; +- (id)initWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver; - (EODataSource *)masterDataSource; @@ -59,9 +59,9 @@ - (EOClassDescription *)classDescriptionForObjects; - (void)qualifyWithRelationshipKey: (NSString *)key - ofObject: masterObject; + ofObject: (id)masterObject; - (NSString *)detailKey; -- (void)setDetailKey:(NSString *)detailKey; +- (void)setDetailKey: (NSString *)detailKey; - (id)masterObject; - (EOEditingContext *)editingContext; diff --git a/EOControl/EOEditingContext.h b/EOControl/EOEditingContext.h index d9ad1ff..b728fb4 100644 --- a/EOControl/EOEditingContext.h +++ b/EOControl/EOEditingContext.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOEditingContext.h Copyright (C) 2000-2002 Free Software Foundation, Inc. @@ -37,6 +37,8 @@ #include #include +#include + @class NSArray; @class NSMutableArray; @@ -70,9 +72,9 @@ unsigned registeredForCallback:1; unsigned propagatesDeletesAtEndOfEvent:1; unsigned ignoreChangeNotification:1; - unsigned exhaustiveValidation:1;// unsigned stopsValidation:1; + unsigned exhaustiveValidation:1; /* unsigned stopsValidation:1; */ unsigned autoLocking:1; - unsigned processingChanges:1;// unsigned savingChanges:1; + unsigned processingChanges:1; /* unsigned savingChanges:1; */ unsigned skipInvalidateOnDealloc:1; unsigned useCommittedSnapshot:1; unsigned registeredUndoTransactionID:1; @@ -100,30 +102,27 @@ + (void)setInstancesRetainRegisteredObjects: (BOOL)flag; + (BOOL)instancesRetainRegisteredObjects; -- initWithParentObjectStore:(EOObjectStore *)parentObjectStore; +- (id)initWithParentObjectStore: (EOObjectStore *)parentObjectStore; - (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpecification; - (void)insertObject: (id)object; -- (void)insertObject: object +- (void)insertObject: (id)object withGlobalID: (EOGlobalID *)gid; - (void)_insertObject: (id)object withGlobalID: (EOGlobalID *)gid; --(void)setLevelsOfUndo:(int)levels; +-(void)setLevelsOfUndo: (int)levels; - (void)deleteObject: (id)object; - - (void)lockObject: (id)object; - (BOOL)hasChanges; - - (void)saveChanges; - - (void)revert; - (id)objectForGlobalID: (EOGlobalID *)globalID; -- (EOGlobalID *)globalIDForObject: object; +- (EOGlobalID *)globalIDForObject: (id)object; - (void)setDelegate: (id)delegate; - (id)delegate; @@ -136,7 +135,7 @@ - (void)setUndoManager: (NSUndoManager *)undoManager; - (NSUndoManager *)undoManager; -- (void) _observeUndoManagerNotifications; +- (void)_observeUndoManagerNotifications; - (void)objectWillChange: (id)object; @@ -145,7 +144,7 @@ - (void)forgetObject: (id)object; -- (void) registerUndoForModifiedObject: (id)object; +- (void)registerUndoForModifiedObject: (id)object; - (NSArray *)registeredObjects; @@ -153,19 +152,19 @@ - (NSArray *)insertedObjects; - (NSArray *)deletedObjects; -- (void) _processDeletedObjects; -- (void) _processOwnedObjectsUsingChangeTable: (NSHashTable*)changeTable - deleteTable: (NSHashTable*)deleteTable; -- (void) propagatesDeletesUsingTable: (NSHashTable*)deleteTable; -- (void) validateDeletesUsingTable: (NSHashTable*)deleteTable; -- (BOOL) validateTable: (NSHashTable*)table - withSelector: (SEL)sel - exceptionArray: (NSMutableArray**)exceptionArray - continueAfterFailure: (BOOL)continueAfterFailure; +- (void)_processDeletedObjects; +- (void)_processOwnedObjectsUsingChangeTable: (NSHashTable *)changeTable + deleteTable: (NSHashTable *)deleteTable; +- (void)propagatesDeletesUsingTable: (NSHashTable *)deleteTable; +- (void)validateDeletesUsingTable: (NSHashTable *)deleteTable; +- (BOOL)validateTable: (NSHashTable *)table + withSelector: (SEL)sel + exceptionArray: (NSMutableArray**)exceptionArray + continueAfterFailure: (BOOL)continueAfterFailure; - (void)processRecentChanges; -- (void) _registerClearStateWithUndoManager; +- (void)_registerClearStateWithUndoManager; - (BOOL)propagatesDeletesAtEndOfEvent; - (void)setPropagatesDeletesAtEndOfEvent: (BOOL)propagatesDeletesAtEndOfEvent; @@ -229,7 +228,7 @@ modified state of the object.**/ relationshipName: (NSString *)name editingContext: (EOEditingContext *)context; -- (void)refaultObject: object +- (void)refaultObject: (id)object withGlobalID: (EOGlobalID *)globalID editingContext: (EOEditingContext *)context; @@ -244,18 +243,17 @@ modified state of the object.**/ - (BOOL)isObjectLockedWithGlobalID: (EOGlobalID *)gid editingContext: (EOEditingContext *)context; -- (void) clearOriginalSnapshotForObject: (id)object; +- (void)clearOriginalSnapshotForObject: (id)object; @end -// used with NSRunLoop's performSelector:target:argument:order:modes: +/* To be used with NSRunLoop's performSelector:target:argument:order:modes: */ enum { EOEditingContextFlushChangesRunLoopOrdering = 300000 }; -extern NSString *EOObjectsChangedInEditingContextNotification; - -extern NSString *EOEditingContextDidSaveChangesNotification; +GDL2CONTROL_EXPORT NSString *EOObjectsChangedInEditingContextNotification; +GDL2CONTROL_EXPORT NSString *EOEditingContextDidSaveChangesNotification; @interface NSObject (EOEditingContext) @@ -264,9 +262,9 @@ extern NSString *EOEditingContextDidSaveChangesNotification; @end -// -// Delegation methods -// +/* + * Methods implemented by the delegate. + */ @interface NSObject (EOEditingContextDelegation) - (BOOL)editingContext: (EOEditingContext *)editingContext @@ -285,16 +283,16 @@ shouldInvalidateObject: (id)object - (NSArray *)editingContext: (EOEditingContext *)editingContext shouldFetchObjectsDescribedByFetchSpecification: (EOFetchSpecification *)fetchSpecification; -- (BOOL) editingContext: (EOEditingContext *)editingContext +- (BOOL)editingContext: (EOEditingContext *)editingContext shouldMergeChangedObject: (id)object; - (void)didMergeChangedObjectsInEditingContext: (EOEditingContext *)editingContext; @end -// -// EOEditors informal protocol -// +/* + * Informal protocol for EOEditors. + */ @interface NSObject (EOEditors) - (BOOL)editorHasChangesForEditingContext: (EOEditingContext *)editingContext; @@ -303,9 +301,9 @@ shouldMergeChangedObject: (id)object; @end -// -// EOMessageHandler informal protocol -// +/* + * Informal protocol for EOMessageHandlers. + */ @interface NSObject (EOMessageHandlers) - (void)editingContext: (EOEditingContext *)editingContext @@ -349,26 +347,30 @@ shouldContinueFetchingWithCurrentObjectCount: (unsigned)count - (void)undo: (id)sender; - (void)redo: (id)sender; -//Private --(NSString*)objectsDescription; --(NSString*)unprocessedDescription; +/* + * Private + */ +-(NSString *)objectsDescription; +-(NSString *)unprocessedDescription; @end -@interface EOEditingContext(EOMultiThreaded) +@interface EOEditingContext (EOMultiThreaded) + (void)setEOFMultiThreadedEnabled: (BOOL)flag; - (void)lock; - (void)unlock; -- (BOOL) tryLock; +- (BOOL)tryLock; @end -// Informations -@interface EOEditingContext(EOEditingContextInfo) +/* + * Information + */ +@interface EOEditingContext (EOEditingContextInfo) -- (NSDictionary*)unprocessedInfo; -- (NSDictionary*)pendingInfo; +- (NSDictionary *)unprocessedInfo; +- (NSDictionary *)pendingInfo; @end diff --git a/EOControl/EOFault.h b/EOControl/EOFault.h index 5201d77..925d28a 100644 --- a/EOControl/EOFault.h +++ b/EOControl/EOFault.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOFault.h Copyright (C) 1996-2000 Free Software Foundation, Inc. @@ -88,11 +88,11 @@ - (Class)superclass; - (Class)class; -- (BOOL)isKindOfClass: (Class)aclass; -- (BOOL)isMemberOfClass: (Class)aclass; +- (BOOL)isKindOfClass: (Class)aClass; +- (BOOL)isMemberOfClass: (Class)aClass; - (BOOL)conformsToProtocol: (Protocol *)protocol; - (BOOL)respondsToSelector: (SEL)sel; -- (NSMethodSignature *)methodSignatureForSelector: (SEL)aSelector; +- (NSMethodSignature *)methodSignatureForSelector: (SEL)selector; - (id)retain; - (void)release; @@ -110,7 +110,7 @@ - (void)dealloc; - (NSZone *)zone; -- (BOOL)isProxy; // Always NO. +- (BOOL)isProxy; - (id)self; @@ -118,8 +118,8 @@ - (void)doesNotRecognizeSelector: (SEL)sel; - (void)forwardInvocation: (NSInvocation *)invocation; -- gcSetNextObject: (id)anObject; -- gcSetPreviousObject: (id)anObject; +- (id)gcSetNextObject: (id)object; +- (id)gcSetPreviousObject: (id)object; - (id)gcNextObject; - (id)gcPreviousObject; - (BOOL)gcAlreadyVisited; @@ -137,8 +137,9 @@ { gcInfo gc; - Class _targetClass; // the first 8 bytes of - void *_extraData; // the faulted object + Class _targetClass; /* Cached class of original object. */ + void *_extraData; /* Cached memory contents of original object + overwritten by fault handler reference. */ unsigned _extraRefCount; @@ -155,7 +156,7 @@ - (BOOL)decrementExtraRefCountWasZero; - (unsigned)extraRefCount; -- (NSString *)descriptionForObject: object; +- (NSString *)descriptionForObject: (id)object; - (Class)classForFault: (id)fault; @@ -174,8 +175,8 @@ // Garbage Collector -- gcSetNextObject: (id)anObject; -- gcSetPreviousObject: (id)anObject; +- (id)gcSetNextObject: (id)object; +- (id)gcSetPreviousObject: (id)object; - (id)gcNextObject; - (id)gcPreviousObject; - (BOOL)gcAlreadyVisited; diff --git a/EOControl/EOFetchSpecification.h b/EOControl/EOFetchSpecification.h index d52ed42..e303eaf 100644 --- a/EOControl/EOFetchSpecification.h +++ b/EOControl/EOFetchSpecification.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOFetchSpecification.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -33,6 +33,7 @@ #include #endif +#include @class NSArray; @class NSDictionary; @@ -60,20 +61,18 @@ unsigned refreshesRefetchedObjects:1; unsigned promptsAfterFetchLimit:1; unsigned allVariablesRequiredFromBindings:1; - unsigned :26; //padding + unsigned reserved:26; }_flags; } + (EOFetchSpecification *)fetchSpecification; -- init; - -- initWithEntityName: (NSString *)entityName - qualifier: (EOQualifier *)qualifier - sortOrderings: (NSArray *)sortOrderings - usesDistinct: (BOOL)usesDistinct - isDeep: (BOOL)isDeep - hints: (NSDictionary *)hints; +- (id)initWithEntityName: (NSString *)entityName + qualifier: (EOQualifier *)qualifier + sortOrderings: (NSArray *)sortOrderings + usesDistinct: (BOOL)usesDistinct + isDeep: (BOOL)isDeep + hints: (NSDictionary *)hints; - (EOFetchSpecification *)fetchSpecificationByApplyingBindings: (id)bindings; @@ -98,10 +97,10 @@ sortOrderings: (NSArray *)sortOrderings usesDistinct: (BOOL)usesDistinct; -- copyWithZone:(NSZone *)zone; +- (id)copyWithZone: (NSZone *)zone; -- (id) initWithKeyValueUnarchiver: (EOKeyValueUnarchiver*)unarchiver; -- (void) encodeWithKeyValueArchiver: (EOKeyValueArchiver*)archiver; +- (id)initWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver; +- (void)encodeWithKeyValueArchiver: (EOKeyValueArchiver *)archiver; - (void)setEntityName: (NSString *)entityName; - (NSString *)entityName; @@ -154,13 +153,9 @@ @end - - -extern NSString *EOPrefetchingRelationshipHintKey; - -extern NSString *EOFetchLimitHintKey; - -extern NSString *EOPromptsAfterFetchLimitHintKey; +GDL2CONTROL_EXPORT NSString *EOPrefetchingRelationshipHintKey; +GDL2CONTROL_EXPORT NSString *EOFetchLimitHintKey; +GDL2CONTROL_EXPORT NSString *EOPromptsAfterFetchLimitHintKey; #endif diff --git a/EOControl/EOGenericRecord.h b/EOControl/EOGenericRecord.h index fcddeec..f03d461 100644 --- a/EOControl/EOGenericRecord.h +++ b/EOControl/EOGenericRecord.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOGenericRecord.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -49,28 +49,23 @@ EOMutableKnownKeyDictionary *dictionary; } -// Initializing new instances +/* Initializing new instances. */ -- initWithEditingContext: (EOEditingContext *)context - classDescription: (EOClassDescription *)classDesc - globalID: (EOGlobalID *)globalID; +- (id)initWithEditingContext: (EOEditingContext *)context + classDescription: (EOClassDescription *)classDesc + globalID: (EOGlobalID *)globalID; -#if !FOUNDATION_HAS_KVC -- (id)valueForKey: (NSString *)key; -- (void)takeValue: (id)value - forKey: (NSString *)key; -#endif - -+ (void)eoCalculateAllSizeWith: (NSMutableDictionary*)dict; -- (unsigned int)eoCalculateSizeWith: (NSMutableDictionary*)dict; ++ (void)eoCalculateAllSizeWith: (NSMutableDictionary *)dict; +- (unsigned int)eoCalculateSizeWith: (NSMutableDictionary *)dict; + (unsigned int)eoCalculateSizeWith: (NSMutableDictionary *)dict forArray: (NSArray *)array; - (NSString *)debugDictionaryDescription; -/** should returns an array of property names to exclude from entity -instanceDictionaryInitializer. -You can override this to exclude properties manually handled by derived object **/ +/** should return an array of property names + to exclude from entity instanceDictionaryInitializer. + You can override this to exclude properties manually + handled by derived object. **/ + (NSArray *)_instanceDictionaryInitializerExcludedPropertyNames; @end /* EOGenericRecord */ diff --git a/EOControl/EOGlobalID.h b/EOControl/EOGlobalID.h index 3f622d3..4064cf2 100644 --- a/EOControl/EOGlobalID.h +++ b/EOControl/EOGlobalID.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOGlobalID.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -48,7 +48,8 @@ GDL2CONTROL_EXPORT NSString *EOGlobalIDChangedNotification; @interface EOGlobalID : NSObject -- (BOOL)isEqual:other; + +- (BOOL)isEqual: (id)other; - (unsigned)hash; - (BOOL)isTemporary; @@ -68,14 +69,12 @@ enum { + (EOTemporaryGlobalID *)temporaryGlobalID; + (void)assignGloballyUniqueBytes: (unsigned char *)buffer; - // < Sequence [2], ProcessID [2] , Time [4], IP Addr [4] > - -- init; +/* Sequence (2) - ProcessID (2) - Time (4) - IP (4) */ - (BOOL)isTemporary; -- (void)encodeWithCoder: (NSCoder *)aCoder; -- (id)initWithCoder: (NSCoder *)aDecoder; +- (void)encodeWithCoder: (NSCoder *)coder; +- (id)initWithCoder: (NSCoder *)decoder; @end diff --git a/EOControl/EOKeyGlobalID.h b/EOControl/EOKeyGlobalID.h index 04fb094..194df8f 100644 --- a/EOControl/EOKeyGlobalID.h +++ b/EOControl/EOKeyGlobalID.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOKeyGlobalID.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -49,14 +49,14 @@ - (unsigned)keyCount; - (NSArray *)keyValuesArray; -- (BOOL)isEqual: other; +- (BOOL)isEqual: (id)other; - (unsigned)hash; -- (void)encodeWithCoder: (NSCoder *)aCoder; -- (id)initWithCoder: (NSCoder *)aDecoder; +- (void)encodeWithCoder: (NSCoder *)coder; +- (id)initWithCoder: (NSCoder *)decoder; -- (BOOL) isFinal; -- (NSString*)description; +- (BOOL)isFinal; +- (NSString *)description; - (BOOL)areKeysAllNulls; @end diff --git a/EOControl/EOKeyValueArchiver.h b/EOControl/EOKeyValueArchiver.h index ff85395..79b084d 100644 --- a/EOControl/EOKeyValueArchiver.h +++ b/EOControl/EOKeyValueArchiver.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOKeyValueArchiver.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -48,10 +48,6 @@ id _delegate; } -- (id) init; - -- (void)dealloc; - - (void)encodeObject: (id)object forKey: (NSString *)key; @@ -64,12 +60,12 @@ - (void)encodeInt: (int)intValue forKey: (NSString *)key; -- (void) _encodeDictionary: (id)dictionary - forKey: (id)key; -- (void) _encodeObjects: (id)objects - forKey: (id)key; -- (void) _encodeValue: (id)value - forKey: (id)key; +- (void)_encodeDictionary: (id)dictionary + forKey: (id)key; +- (void)_encodeObjects: (id)objects + forKey: (id)key; +- (void)_encodeValue: (id)value + forKey: (id)key; - (NSDictionary *)dictionary; @@ -107,7 +103,7 @@ referenceToEncodeForObject: (id)object; - (int)decodeIntForKey: (NSString *)key; -- (BOOL) isThereValueForKey: (NSString *)key; +- (BOOL)isThereValueForKey: (NSString *)key; - (void)ensureObjectAwake: (id)object; @@ -120,10 +116,10 @@ referenceToEncodeForObject: (id)object; - (void)setDelegate: (id)delegate; - (id)delegate; -- (id) _findTypeForPropertyListDecoding: (id)param0; -- (id) _dictionaryForPropertyList: (NSDictionary*)propList; -- (id) _objectsForPropertyList: (NSArray*)propList; -- (id) _objectForPropertyList: (NSDictionary*)propList; +- (id)_findTypeForPropertyListDecoding: (id)param0; +- (id)_dictionaryForPropertyList: (NSDictionary *)propList; +- (id)_objectsForPropertyList: (NSArray *)propList; +- (id)_objectForPropertyList: (NSDictionary *)propList; @end @@ -136,13 +132,13 @@ objectForReference: (id)keyPath; @protocol EOKeyValueArchiving -- (id) initWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver; +- (id)initWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver; - (void)encodeWithKeyValueArchiver: (EOKeyValueArchiver *)archiver; @end -@interface NSObject(EOKeyValueArchivingAwakeMethods) +@interface NSObject(EOKeyValueArchivingAwakeMethods) - (void)finishInitializationWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver; diff --git a/EOControl/EOKeyValueCoding.h b/EOControl/EOKeyValueCoding.h index 35bc5f8..4a8f304 100644 --- a/EOControl/EOKeyValueCoding.h +++ b/EOControl/EOKeyValueCoding.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOKeyValueCoding.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -158,7 +158,7 @@ - (id)valueForKey: (NSString *)key; - (id)storedValueForKey: (NSString *)key; - (id)valueForKeyPath: (NSString *)keyPath; -- (id)storedValueForKeyPath: (NSString*)keyPath; +- (id)storedValueForKeyPath: (NSString *)keyPath; @end @@ -168,18 +168,18 @@ * See documentation or source file for details on how it differs. */ - (void)takeValue: (id)value - forKey: (NSString*)key; + forKey: (NSString *)key; @end @interface NSObject (EOKVCGDL2Additions) /* These are hooks for EOGenericRecord KVC implementaion. */ -- (void)smartTakeValue: (id)anObject - forKey: (NSString *)aKey; -- (void)smartTakeValue: (id)anObject - forKeyPath: (NSString *)aKeyPath; +- (void)smartTakeValue: (id)object + forKey: (NSString *)key; +- (void)smartTakeValue: (id)object + forKeyPath: (NSString *)keyPath; -- (void)takeStoredValue: value +- (void)takeStoredValue: (id)value forKeyPath: (NSString *)key; - (id)storedValueForKeyPath: (NSString *)key; diff --git a/EOControl/EOKeyValueCodingBase.h b/EOControl/EOKeyValueCodingBase.h index 16e2e12..5451d1a 100644 --- a/EOControl/EOKeyValueCodingBase.h +++ b/EOControl/EOKeyValueCodingBase.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOKeyValueCodingBase.h Copyright (C) 2000 Free Software Foundation, Inc. diff --git a/EOControl/EOMutableKnownKeyDictionary.h b/EOControl/EOMutableKnownKeyDictionary.h index 3275e39..44b9b68 100644 --- a/EOControl/EOMutableKnownKeyDictionary.h +++ b/EOControl/EOMutableKnownKeyDictionary.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOMultipleKnownKeyDictionary.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -52,27 +52,27 @@ NSString **_keys; } -+ (EOMKKDInitializer*)initializerFromKeyArray:(NSArray*)keys; -+ (id)newWithKeyArray: (NSArray*)keys; -+ (id)newWithKeyArray: (NSArray*)keys - zone: (NSZone*)zone; ++ (EOMKKDInitializer *)initializerFromKeyArray: (NSArray *)keys; ++ (id)newWithKeyArray: (NSArray *)keys; ++ (id)newWithKeyArray: (NSArray *)keys + zone: (NSZone *)zone; -- (id)initWithKeys: (NSArray*)keys; -- (void) dealloc; -- (NSString*)description; -- (unsigned int) count; -- (void) setObject: (id)object - forIndex: (unsigned int)index - dictionary: (NSMutableDictionary*)dictionary; -- (id) objectForIndex: (unsigned int)index - dictionary: (NSDictionary*)dictionary; -- (unsigned int) indexForKey: (id)key; -- (id) arrayMappingForKeys: (id)keys; -- (id) subsetMappingForSourceDictionaryInitializer: (EOMKKDInitializer*)initialize - sourceKeys: (NSArray*)sourceKeys - destinationKeys: (NSArray*)destinationKeys; -- (id) subsetMappingForSourceDictionaryInitializer: (id)param0; -- (id*) keys; +- (id)initWithKeys: (NSArray *)keys; +- (void)dealloc; +- (NSString *)description; +- (unsigned int)count; +- (void)setObject: (id)object + forIndex: (unsigned int)index + dictionary: (NSMutableDictionary *)dictionary; +- (id)objectForIndex: (unsigned int)index + dictionary: (NSDictionary *)dictionary; +- (unsigned int)indexForKey: (id)key; +- (id)arrayMappingForKeys: (id)keys; +- (id)subsetMappingForSourceDictionaryInitializer: (EOMKKDInitializer *)init + sourceKeys: (NSArray *)sourceKeys + destinationKeys: (NSArray *)destinationKeys; +- (id)subsetMappingForSourceDictionaryInitializer: (id)param0; +- (id *)keys; - (BOOL)hasKey: (id)key; @end @@ -87,10 +87,10 @@ NSString **_keys; } -- (id) initWithTarget: (EOMutableKnownKeyDictionary*)target; -- (void) dealloc; -- (NSString*)description; -- (id) nextObject; +- (id)initWithTarget: (EOMutableKnownKeyDictionary *)target; +- (void)dealloc; +- (NSString *)description; +- (id)nextObject; @end @@ -103,11 +103,11 @@ } +(id)newInstanceWithKeyCount: (unsigned int)keyCount - sourceDescription: (EOMKKDInitializer*)source - destinationDescription: (EOMKKDInitializer*)destination - zone: (NSZone*)zone; -- (void) dealloc; -- (NSString*)description; + sourceDescription: (EOMKKDInitializer *)source + destinationDescription: (EOMKKDInitializer *)destination + zone: (NSZone *)zone; +- (void)dealloc; +- (NSString *)description; @end @@ -118,10 +118,10 @@ int _destinationOffsetForArrayIndex[1]; } + (id)newInstanceWithKeyCount: (unsigned int)keyCount - destinationDescription: (EOMKKDInitializer*)destination - zone: (NSZone*)zone; -- (void) dealloc; -- (NSString*)description; + destinationDescription: (EOMKKDInitializer *)destination + zone: (NSZone *)zone; +- (void)dealloc; +- (NSString *)description; @end @@ -135,43 +135,43 @@ + (id)dictionaryFromDictionary: (NSDictionary *)dict subsetMapping: (EOMKKDSubsetMapping *)subsetMapping; -+ (id)newDictionaryFromDictionary: (NSDictionary*)dict - subsetMapping: (EOMKKDSubsetMapping*)subsetMapping - zone: (NSZone*)zone; -+ (id)newDictionaryWithObjects: (id*)objects ++ (id)newDictionaryFromDictionary: (NSDictionary *)dict + subsetMapping: (EOMKKDSubsetMapping *)subsetMapping + zone: (NSZone *)zone; ++ (id)newDictionaryWithObjects: (id *)objects arrayMapping: (id)mapping - zone: (NSZone*)zone; -+ (id)newWithInitializer: (EOMKKDInitializer*)initializer - objects: (id*)objects - zone: (NSZone*)zone; -+ (id)dictionaryWithObjects: (NSArray*)objects - forKeys: (NSArray*)keys; + zone: (NSZone *)zone; ++ (id)newWithInitializer: (EOMKKDInitializer *)initializer + objects: (id *)objects + zone: (NSZone *)zone; ++ (id)dictionaryWithObjects: (NSArray *)objects + forKeys: (NSArray *)keys; -+ (EOMKKDInitializer*)initializerFromKeyArray: (NSArray*)keys; -+ (id) dictionaryWithInitializer: (EOMKKDInitializer*)initializer; -+ (id)newWithInitializer: (EOMKKDInitializer*)initializer; -+ (id)newWithInitializer: (EOMKKDInitializer*)initializer - zone: (NSZone*)zone; -+ (id) dictionaryWithInitializer: (EOMKKDInitializer*)initializer; ++ (EOMKKDInitializer *)initializerFromKeyArray: (NSArray *)keys; ++ (id)dictionaryWithInitializer: (EOMKKDInitializer *)initializer; ++ (id)newWithInitializer: (EOMKKDInitializer *)initializer; ++ (id)newWithInitializer: (EOMKKDInitializer *)initializer + zone: (NSZone *)zone; ++ (id)dictionaryWithInitializer: (EOMKKDInitializer *)initializer; -- (id)initWithInitializer: (EOMKKDInitializer*)initializer; -- (id) initWithInitializer: (EOMKKDInitializer*)initializer - objects: (id*)objects; -- (id) initWithObjects: (id*)objects - forKeys: (id*)keys - count: (unsigned int)count; -- (void) dealloc; -- (unsigned int) count; -- (id) objectForKey: (id)key; -- (void) setObject: (id)object - forKey: (NSString*)key; -- (void) removeObjectForKey: (NSString*)key; -- (BOOL) containsObjectsNotIdenticalTo: (id)object; -- (void) addEntriesFromDictionary: (NSDictionary*)dictionary; -- (NSEnumerator*) keyEnumerator; -- (EOMKKDInitializer*) eoMKKDInitializer; -- (NSMutableDictionary*)extraData; -- (BOOL)hasKey:(id)key; +- (id)initWithInitializer: (EOMKKDInitializer *)initializer; +- (id)initWithInitializer: (EOMKKDInitializer *)initializer + objects: (id *)objects; +- (id)initWithObjects: (id *)objects + forKeys: (id *)keys + count: (unsigned int)count; +- (void)dealloc; +- (unsigned int)count; +- (id)objectForKey: (id)key; +- (void)setObject: (id)object + forKey: (NSString *)key; +- (void)removeObjectForKey: (NSString *)key; +- (BOOL)containsObjectsNotIdenticalTo: (id)object; +- (void)addEntriesFromDictionary: (NSDictionary *)dictionary; +- (NSEnumerator *)keyEnumerator; +- (EOMKKDInitializer *)eoMKKDInitializer; +- (NSMutableDictionary *)extraData; +- (BOOL)hasKey: (id)key; - (NSString *)debugDescription; @end diff --git a/EOControl/EONSAddOns.h b/EOControl/EONSAddOns.h index 5d3f9b2..f044000 100644 --- a/EOControl/EONSAddOns.h +++ b/EOControl/EONSAddOns.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EONSAddOns.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -50,35 +50,35 @@ GDL2CONTROL_EXPORT BOOL GSUseStrictWO451Compatibility(NSString *key); @interface NSObject (NSObjectPerformingSelector) -- (NSArray*)resultsOfPerformingSelector: (SEL)sel - withEachObjectInArray: (NSArray*)array; -- (NSArray*)resultsOfPerformingSelector: (SEL)sel - withEachObjectInArray: (NSArray*)array - defaultResult: (id)defaultResult; +- (NSArray *)resultsOfPerformingSelector: (SEL)sel + withEachObjectInArray: (NSArray *)array; +- (NSArray *)resultsOfPerformingSelector: (SEL)sel + withEachObjectInArray: (NSArray *)array + defaultResult: (id)defaultResult; @end @interface NSArray (NSArrayPerformingSelector) - (id)firstObject; -- (NSArray*)resultsOfPerformingSelector: (SEL)sel; -- (NSArray*)resultsOfPerformingSelector: (SEL)sel - defaultResult: (id)defaultResult; -- (NSArray*)resultsOfPerformingSelector: (SEL)sel - withObject: (id)obj1; -- (NSArray*)resultsOfPerformingSelector: (SEL)sel - withObject: (id)obj1 - defaultResult: (id)defaultResult; -- (NSArray*)resultsOfPerformingSelector: (SEL)sel - withObject: (id)obj1 - withObject: (id)obj2; -- (NSArray*)resultsOfPerformingSelector: (SEL)sel - withObject: (id)obj1 - withObject: (id)obj2 - defaultResult: (id)defaultResult; -- (NSArray*)arrayExcludingObjectsInArray: (NSArray*)array; -- (NSArray*)arrayExcludingObject: (id)object; -- (NSArray*)arrayByReplacingObject: (id)object1 - withObject: (id)object2; -- (BOOL)containsIdenticalObjectsWithArray: (NSArray*)array; +- (NSArray *)resultsOfPerformingSelector: (SEL)sel; +- (NSArray *)resultsOfPerformingSelector: (SEL)sel + defaultResult: (id)defaultResult; +- (NSArray *)resultsOfPerformingSelector: (SEL)sel + withObject: (id)obj1; +- (NSArray *)resultsOfPerformingSelector: (SEL)sel + withObject: (id)obj1 + defaultResult: (id)defaultResult; +- (NSArray *)resultsOfPerformingSelector: (SEL)sel + withObject: (id)obj1 + withObject: (id)obj2; +- (NSArray *)resultsOfPerformingSelector: (SEL)sel + withObject: (id)obj1 + withObject: (id)obj2 + defaultResult: (id)defaultResult; +- (NSArray *)arrayExcludingObjectsInArray: (NSArray *)array; +- (NSArray *)arrayExcludingObject: (id)object; +- (NSArray *)arrayByReplacingObject: (id)object1 + withObject: (id)object2; +- (BOOL)containsIdenticalObjectsWithArray: (NSArray *)array; @end @@ -109,14 +109,14 @@ GSUseStrictWO451Compatibility(NSString *key); @interface NSObject (PerformSelect3) /** * Causes the receiver to execute the method implementation corresponding - * to aSelector and returns the result.
+ * to selector and returns the result.
* The method must be one which takes three arguments and returns an object. *
Raises NSInvalidArgumentException if given a null selector. */ -- (id) performSelector: (SEL)aSelector - withObject: (id) object1 - withObject: (id) object2 - withObject: (id) object3; +- (id)performSelector: (SEL)selector + withObject: (id)object1 + withObject: (id)object2 + withObject: (id)object3; @end #endif /* __EONSAddOns_h__ */ diff --git a/EOControl/EONull.h b/EOControl/EONull.h index c2f2d00..8e522b8 100644 --- a/EOControl/EONull.h +++ b/EOControl/EONull.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EONull.h Copyright (C) 1996-2002, 2003 Free Software Foundation, Inc. diff --git a/EOControl/EOObjectStore.h b/EOControl/EOObjectStore.h index 685d493..de8a9af 100644 --- a/EOControl/EOObjectStore.h +++ b/EOControl/EOObjectStore.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOObjectStore.h Copyright (C) 2000, 2003 Free Software Foundation, Inc. @@ -65,13 +65,13 @@ relationshipName: (NSString *)name editingContext: (EOEditingContext *)context; -- (void)refaultObject: object +- (void)refaultObject: (id)object withGlobalID: (EOGlobalID *)globalID editingContext: (EOEditingContext *)context; - (void)saveChangesInEditingContext: (EOEditingContext *)context; -- (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpecification +- (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpec editingContext: (EOEditingContext *)context; - (BOOL)isObjectLockedWithGlobalID: (EOGlobalID *)gid @@ -83,8 +83,8 @@ - (void)invalidateAllObjects; - (void)invalidateObjectsWithGlobalIDs: (NSArray *)globalIDs; -- (id) propertiesForObjectWithGlobalID: (EOGlobalID *)gid - editingContext: (EOEditingContext *)context; +- (id)propertiesForObjectWithGlobalID: (EOGlobalID *)gid + editingContext: (EOEditingContext *)context; @end diff --git a/EOControl/EOObjectStoreCoordinator.h b/EOControl/EOObjectStoreCoordinator.h index a180848..a361aac 100644 --- a/EOControl/EOObjectStoreCoordinator.h +++ b/EOControl/EOObjectStoreCoordinator.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOObjectStoreCoordinator.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -29,6 +29,8 @@ #include +#include + @class NSArray; @class NSMutableArray; @@ -40,27 +42,25 @@ @class EOModelGroup; -@interface EOObjectStoreCoordinator:EOObjectStore +@interface EOObjectStoreCoordinator : EOObjectStore { NSMutableArray *_stores; NSDictionary *_userInfo; } -- init; - - (void)addCooperatingObjectStore: (EOCooperatingObjectStore *)store; - (void)removeCooperatingObjectStore: (EOCooperatingObjectStore *)store; - (NSArray *)cooperatingObjectStores; -- (void)forwardUpdateForObject: object changes: (NSDictionary *)changes; +- (void)forwardUpdateForObject: (id)object changes: (NSDictionary *)changes; -- (NSDictionary *)valuesForKeys: (NSArray *)keys object: object; +- (NSDictionary *)valuesForKeys: (NSArray *)keys object: (id)object; - (EOCooperatingObjectStore *)objectStoreForGlobalID: (EOGlobalID *)gloablID; -- (EOCooperatingObjectStore *)objectStoreForObject: object; +- (EOCooperatingObjectStore *)objectStoreForObject: (id)object; - (EOCooperatingObjectStore *)objectStoreForFetchSpecification: (EOFetchSpecification *)fetchSpecification; @@ -73,14 +73,14 @@ @end -// Notifications: -extern NSString *EOCooperatingObjectStoreWasAdded; -extern NSString *EOCooperatingObjectStoreWasRemoved; +/* Notifications */ +GDL2CONTROL_EXPORT NSString *EOCooperatingObjectStoreWasAdded; +GDL2CONTROL_EXPORT NSString *EOCooperatingObjectStoreWasRemoved; -extern NSString *EOCooperatingObjectStoreNeeded; +GDL2CONTROL_EXPORT NSString *EOCooperatingObjectStoreNeeded; -@interface EOCooperatingObjectStore:EOObjectStore +@interface EOCooperatingObjectStore : EOObjectStore - (BOOL)ownsGlobalID: (EOGlobalID *)globalID; @@ -90,18 +90,19 @@ extern NSString *EOCooperatingObjectStoreNeeded; - (BOOL)handlesFetchSpecification: (EOFetchSpecification *)fetchSpecification; -- (void)prepareForSaveWithCoordinator: (EOObjectStoreCoordinator *)coordinator editingContext:(EOEditingContext *)context; +- (void)prepareForSaveWithCoordinator: (EOObjectStoreCoordinator *)coordinator + editingContext: (EOEditingContext *)context; - (void)recordChangesInEditingContext; -- (void)recordUpdateForObject:object changes: (NSDictionary *)changes; +- (void)recordUpdateForObject: (id)object changes: (NSDictionary *)changes; - (void)performChanges; - (void)commitChanges; - (void)rollbackChanges; -- (NSDictionary *)valuesForKeys: (NSArray *)keys object: object; +- (NSDictionary *)valuesForKeys: (NSArray *)keys object: (id)object; @end diff --git a/EOControl/EOObserver.h b/EOControl/EOObserver.h index 1af1bd6..e1e2ee7 100644 --- a/EOControl/EOObserver.h +++ b/EOControl/EOObserver.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOObserver.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -44,6 +44,7 @@ @end @protocol EOObserving + - (void)objectWillChange: (id)subject; @end @@ -90,7 +91,7 @@ typedef enum { @interface EODelayedObserver : NSObject { @public - EODelayedObserver *_next; // linked list. Nil if not on list. + EODelayedObserver *_next; /* Linked List. */ } - (void)objectWillChange: (id)subject; @@ -99,14 +100,13 @@ typedef enum { - (EODelayedObserverQueue *)observerQueue; -// Must be implemented by subclasses -- (void)subjectChanged; +- (void)subjectChanged; /* Subclass responsibility. */ - (void)discardPendingNotification; @end -// used with NSRunLoop's performSelector:target:argument:order:modes: +/* To be used with NSRunLoop's performSelector:target:argument:order:modes: */ enum { EOFlushDelayedObserversRunLoopOrdering = 400000 @@ -115,7 +115,8 @@ enum @interface EODelayedObserverQueue : NSObject { - EODelayedObserver *_queue[EOObserverNumberOfPriorities]; // lists for each priority + /* Lists per priority. */ + EODelayedObserver *_queue[EOObserverNumberOfPriorities]; unsigned _highestNonEmptyQueue; BOOL _haveEntryInNotificationQueue; NSArray *_modes; @@ -141,9 +142,9 @@ enum EOObserverPriority _priority; } -- initWithTarget: (id)target - action: (SEL)action - priority: (EOObserverPriority)priority; +- (id)initWithTarget: (id)target + action: (SEL)action + priority: (EOObserverPriority)priority; @end diff --git a/EOControl/EOQualifier.h b/EOControl/EOQualifier.h index 6c02643..cc68709 100644 --- a/EOControl/EOQualifier.h +++ b/EOControl/EOQualifier.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOQualifier.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -35,6 +35,8 @@ #include +#include + @class NSArray; @class NSDictionary; @class NSString; @@ -47,8 +49,6 @@ @interface EOQualifier : NSObject -{ -} + (EOQualifier *)qualifierWithQualifierFormat: (NSString *)qualifierFormat, ...; @@ -95,7 +95,7 @@ @protocol EOQualifierEvaluation -- (BOOL)evaluateWithObject: object; +- (BOOL)evaluateWithObject: (id)object; @end @@ -126,40 +126,40 @@ #define EOQualifierOperatorCaseInsensitiveLike @selector(isCaseInsensitiveLike:) -@interface EOKeyValueQualifier:EOQualifier +@interface EOKeyValueQualifier : EOQualifier { SEL _selector; NSString *_key; id _value; } -+ (EOKeyValueQualifier*)qualifierWithKey: (NSString *)key - operatorSelector: (SEL)selector - value: (id)value; ++ (EOKeyValueQualifier *)qualifierWithKey: (NSString *)key + operatorSelector: (SEL)selector + value: (id)value; -- (id) initWithKey: (NSString *)key - operatorSelector: (SEL)selector - value: (id)value; +- (id)initWithKey: (NSString *)key + operatorSelector: (SEL)selector + value: (id)value; - (SEL)selector; - (NSString *)key; - (id)value; @end -@interface EOKeyComparisonQualifier:EOQualifier +@interface EOKeyComparisonQualifier : EOQualifier { SEL _selector; NSString *_leftKey; NSString *_rightKey; } -+ (EOQualifier*)qualifierWithLeftKey: (NSString *)leftKey - operatorSelector: (SEL)selector - rightKey: (id)rightKey; ++ (EOQualifier *)qualifierWithLeftKey: (NSString *)leftKey + operatorSelector: (SEL)selector + rightKey: (id)rightKey; -- initWithLeftKey: (NSString *)leftKey - operatorSelector: (SEL)selector - rightKey: (id)rightKey; +- (id)initWithLeftKey: (NSString *)leftKey + operatorSelector: (SEL)selector + rightKey: (id)rightKey; - (SEL)selector; - (NSString *)leftKey; - (NSString *)rightKey; @@ -175,15 +175,15 @@ + (EOQualifier *)qualifierWithQualifierArray: (NSArray *)array; + (EOQualifier *)qualifierWithQualifiers: (EOQualifier *)qualifiers, ...; -- initWithQualifiers: (EOQualifier *)qualifiers, ...; -- initWithQualifierArray: (NSArray *)array; +- (id)initWithQualifiers: (EOQualifier *)qualifiers, ...; +- (id)initWithQualifierArray: (NSArray *)array; - (NSArray *)qualifiers; @end -@interface EOOrQualifier:EOQualifier +@interface EOOrQualifier : EOQualifier { NSArray *_qualifiers; } @@ -191,31 +191,31 @@ + (EOQualifier *)qualifierWithQualifierArray: (NSArray *)array; + (EOQualifier *)qualifierWithQualifiers: (EOQualifier *)qualifiers, ...; -- initWithQualifiers: (EOQualifier *)qualifiers, ...; -- initWithQualifierArray: (NSArray *)array; +- (id)initWithQualifiers: (EOQualifier *)qualifiers, ...; +- (id)initWithQualifierArray: (NSArray *)array; - (NSArray *)qualifiers; @end -@interface EONotQualifier:EOQualifier +@interface EONotQualifier : EOQualifier { EOQualifier *_qualifier; } + (EOQualifier *)qualifierWithQualifier: (EOQualifier *)qualifier; -- initWithQualifier: (EOQualifier *)qualifier; +- (id)initWithQualifier: (EOQualifier *)qualifier; - (EOQualifier *)qualifier; @end -extern NSString *EOQualifierVariableSubstitutionException; +GDL2CONTROL_EXPORT NSString *EOQualifierVariableSubstitutionException; -@interface EOQualifierVariable:NSObject +@interface EOQualifierVariable : NSObject { NSString *_key; } diff --git a/EOControl/EOSortOrdering.h b/EOControl/EOSortOrdering.h index 677187b..699dfb1 100644 --- a/EOControl/EOSortOrdering.h +++ b/EOControl/EOSortOrdering.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOSortOrdering.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -26,7 +26,7 @@ #ifndef __EOSortOrdering_h__ #define __EOSortOrdering_h__ - +/* WO45 OK */ #ifdef GNUSTEP #include @@ -47,7 +47,7 @@ + (EOSortOrdering *)sortOrderingWithKey: (NSString *)key selector: (SEL)selector; -- initWithKey: (NSString *)key selector: (SEL)selector; +- (id)initWithKey: (NSString *)key selector: (SEL)selector; - (NSString *)key; - (SEL)selector; diff --git a/EOControl/EOUndoManager.h b/EOControl/EOUndoManager.h index 2e42a69..9cb8b55 100644 --- a/EOControl/EOUndoManager.h +++ b/EOControl/EOUndoManager.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOUndoManager.h Copyright (C) 2000 Free Software Foundation, Inc. @@ -36,12 +36,12 @@ @interface EOUndoManager : NSUndoManager -- (void) forgetAllWithTarget: (id)param0; -- (void) forgetAll; -- (void) registerUndoWithTarget: (id)param0 - selector: (SEL)param1 - arg: (id)param2; -- (void) reenableUndoRegistration; +- (void)forgetAllWithTarget: (id)param0; +- (void)forgetAll; +- (void)registerUndoWithTarget: (id)param0 + selector: (SEL)param1 + arg: (id)param2; +- (void)reenableUndoRegistration; @end diff --git a/EOModeler/EOModelExtensions.h b/EOModeler/EOModelExtensions.h index 590c9c6..0b82274 100644 --- a/EOModeler/EOModelExtensions.h +++ b/EOModeler/EOModelExtensions.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOModelExtensions.h Copyright (C) 2001 Free Software Foundation, Inc. @@ -76,7 +76,7 @@ @interface NSMutableAttributedString (_EOModelerErrorConstruction) -+ (NSMutableAttributedString *)mutableAttributedStringWithBoldSubstitutionsWithFormat:(NSString *)format, ...; ++ (NSMutableAttributedString *)mutableAttributedStringWithBoldSubstitutionsWithFormat: (NSString *)format, ...; @end diff --git a/Tools/EOAttribute+GSDoc.h b/Tools/EOAttribute+GSDoc.h index 749c329..c9490d4 100644 --- a/Tools/EOAttribute+GSDoc.h +++ b/Tools/EOAttribute+GSDoc.h @@ -1,4 +1,4 @@ -/* +/* -*-objc-*- EOAttribute+GSDoc.h Copyright (C) 2000-2002 Free Software Foundation, Inc. diff --git a/Tools/EOEntity+GSDoc.h b/Tools/EOEntity+GSDoc.h index c36e28d..5b1cce2 100644 --- a/Tools/EOEntity+GSDoc.h +++ b/Tools/EOEntity+GSDoc.h @@ -1,4 +1,4 @@ -/** +/* -*-objc-*- EOEntity+GSDoc.h Copyright (C) 2000-2002 Free Software Foundation, Inc. diff --git a/Tools/EOJoin+GSDoc.h b/Tools/EOJoin+GSDoc.h index 31e047a..86461db 100644 --- a/Tools/EOJoin+GSDoc.h +++ b/Tools/EOJoin+GSDoc.h @@ -1,4 +1,4 @@ -/** +/* -*-objc-*- EOJoin+GSDoc.h EOJoin+GSDoc Copyright (C) 2000-2002 Free Software Foundation, Inc. diff --git a/Tools/EOModel+GSDoc.h b/Tools/EOModel+GSDoc.h index 615852e..db69c43 100644 --- a/Tools/EOModel+GSDoc.h +++ b/Tools/EOModel+GSDoc.h @@ -1,4 +1,4 @@ -/** +/* -*-objc-*- EOModel+GSDoc.h Copyright (C) 2000-2002 Free Software Foundation, Inc. diff --git a/Tools/EORelationship+GSDoc.h b/Tools/EORelationship+GSDoc.h index ea3fad4..cd6ade8 100644 --- a/Tools/EORelationship+GSDoc.h +++ b/Tools/EORelationship+GSDoc.h @@ -1,4 +1,4 @@ -/** +/* -*-objc-*- EORelationship+GSDoc.h Copyright (C) 2000-2002 Free Software Foundation, Inc. diff --git a/Tools/NSArray+GSDoc.h b/Tools/NSArray+GSDoc.h index 042f5f0..993f99c 100644 --- a/Tools/NSArray+GSDoc.h +++ b/Tools/NSArray+GSDoc.h @@ -1,4 +1,4 @@ -/** +/* -*-objc-*- NSArray+GSDoc.h Copyright (C) 2000-2002 Free Software Foundation, Inc. diff --git a/Tools/NSDictionary+GSDoc.h b/Tools/NSDictionary+GSDoc.h index 424c4db..cb92605 100644 --- a/Tools/NSDictionary+GSDoc.h +++ b/Tools/NSDictionary+GSDoc.h @@ -1,4 +1,4 @@ -/** +/* -*-objc-*- NSDictionary+GSDoc.h Copyright (C) 2000-2002 Free Software Foundation, Inc.