gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-05-30 17:01:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* */*.h: Format declarations consistently. Add -*-objc-*

Browse source 
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
This commit is contained in:
ayers 2004-04-17 11:30:47 +00:00
parent dd15f889e0
commit e6689b0cc8
66 changed files with 847 additions and 863 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-04-17 David Ayers <d.ayers@inode.at>
* */*.h: Format declarations consistently. Add -*-objc-*
shabang line. Replace remaining extern declarations with
GDL2*_EXPORT.
2004-04-16 David Ayers <d.ayers@inode.at> 2004-04-16 David Ayers <d.ayers@inode.at>
* EOAccess/EOModel.m ([EOModel writeToFile:]) Set path (and * EOAccess/EOModel.m ([EOModel writeToFile:]) Set path (and

26
EOAccess/EOAccessFault.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOAccessFault.h EOAccessFault.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -39,7 +39,7 @@
@class NSString; @class NSString;
@interface EOAccessGenericFaultHandler:EOFaultHandler @interface EOAccessGenericFaultHandler : EOFaultHandler
{ {
unsigned int _generation; unsigned int _generation;
EOAccessGenericFaultHandler *_next; EOAccessGenericFaultHandler *_next;
@ -55,7 +55,7 @@
@end @end
@interface EOAccessFaultHandler:EOAccessGenericFaultHandler @interface EOAccessFaultHandler : EOAccessGenericFaultHandler
{ {
EOKeyGlobalID *gid; EOKeyGlobalID *gid;
EODatabaseContext *databaseContext; EODatabaseContext *databaseContext;
@ -66,9 +66,9 @@
databaseContext: (EODatabaseContext *)dbcontext databaseContext: (EODatabaseContext *)dbcontext
editingContext: (EOEditingContext *)ec; editingContext: (EOEditingContext *)ec;
- initWithGlobalID: (EOKeyGlobalID *)globalID - (id)initWithGlobalID: (EOKeyGlobalID *)globalID
databaseContext: (EODatabaseContext *)dbcontext databaseContext: (EODatabaseContext *)dbcontext
editingContext: (EOEditingContext *)ec; editingContext: (EOEditingContext *)ec;
- (EOKeyGlobalID *)globalID; - (EOKeyGlobalID *)globalID;
- (EODatabaseContext *)databaseContext; - (EODatabaseContext *)databaseContext;
@ -77,7 +77,7 @@
@end @end
@interface EOAccessArrayFaultHandler:EOAccessGenericFaultHandler @interface EOAccessArrayFaultHandler : EOAccessGenericFaultHandler
{ {
EOKeyGlobalID *sgid; EOKeyGlobalID *sgid;
NSString *relationshipName; NSString *relationshipName;
@ -91,10 +91,10 @@
databaseContext: (EODatabaseContext *)dbcontext databaseContext: (EODatabaseContext *)dbcontext
editingContext: (EOEditingContext *)ec; editingContext: (EOEditingContext *)ec;
- initWithSourceGlobalID: (EOKeyGlobalID *)sourceGID - (id)initWithSourceGlobalID: (EOKeyGlobalID *)sourceGID
relationshipName: (NSString *)relationshipName relationshipName: (NSString *)relationshipName
databaseContext: (EODatabaseContext *)dbcontext databaseContext: (EODatabaseContext *)dbcontext
editingContext: (EOEditingContext *)ec; editingContext: (EOEditingContext *)ec;
- (EOKeyGlobalID *)sourceGlobalID; - (EOKeyGlobalID *)sourceGlobalID;
- (NSString *)relationshipName; - (NSString *)relationshipName;
@ -106,8 +106,8 @@
@interface NSObject (EOAccessFaultUnableToFaultToOne) @interface NSObject (EOAccessFaultUnableToFaultToOne)
- (void)unableToFaultObject:(id)object - (void)unableToFaultObject: (id)object
databaseContext:(EODatabaseContext *)context; databaseContext: (EODatabaseContext *)context;
@end @end

2
EOAccess/EOAccessFaultPriv.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOAccessFaultPriv.h EOAccessFaultPriv.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.

16
EOAccess/EOAdaptor.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOAdaptor.h EOAdaptor.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -85,7 +85,7 @@ GDL2ACCESS_EXPORT NSString *EOGeneralAdaptorException;
+ (NSArray *)availableAdaptorNames; + (NSArray *)availableAdaptorNames;
- (NSArray *)prototypeAttributes; - (NSArray *)prototypeAttributes;
- initWithName:(NSString *)name; - (id)initWithName: (NSString *)name;
/* Getting an adaptor's name */ /* Getting an adaptor's name */
- (NSString *)name; - (NSString *)name;
@ -95,8 +95,8 @@ GDL2ACCESS_EXPORT NSString *EOGeneralAdaptorException;
- (NSArray *)contexts; - (NSArray *)contexts;
/* Setting the model */ /* Setting the model */
- (void)setModel: (EOModel*)aModel;//Not in EOFD - (void)setModel: (EOModel *)model;//Not in EOFD
- (EOModel*)model;//Not in EOFD - (EOModel *)model;//Not in EOFD
/* Checking connection status */ /* Checking connection status */
- (BOOL)hasOpenChannels; - (BOOL)hasOpenChannels;
@ -110,7 +110,7 @@ GDL2ACCESS_EXPORT NSString *EOGeneralAdaptorException;
- (BOOL)isDroppedConnectionException: (NSException *)exception; - (BOOL)isDroppedConnectionException: (NSException *)exception;
/* Setting connection information */ /* Setting connection information */
- (void)setConnectionDictionary: (NSDictionary*)aDictionary; - (void)setConnectionDictionary: (NSDictionary *)dictionary;
- (NSDictionary *)connectionDictionary; - (NSDictionary *)connectionDictionary;
- (void)assertConnectionDictionaryIsValid; - (void)assertConnectionDictionaryIsValid;
@ -131,10 +131,10 @@ GDL2ACCESS_EXPORT NSString *EOGeneralAdaptorException;
/* Setting the delegate */ /* Setting the delegate */
- (id)delegate; - (id)delegate;
- (void)setDelegate: delegate; - (void)setDelegate: (id)delegate;
- (BOOL) isValidQualifierType: (NSString *)attribute - (BOOL)isValidQualifierType: (NSString *)attribute
model: (EOModel *)model; model: (EOModel *)model;
@end /* EOAdaptor */ @end /* EOAdaptor */

42
EOAccess/EOAdaptorChannel.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOAdaptorChannel.h EOAdaptorChannel.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -91,7 +91,7 @@
+ (EOAdaptorChannel *)adaptorChannelWithAdaptorContext: (EOAdaptorContext *)adaptorContext; + (EOAdaptorChannel *)adaptorChannelWithAdaptorContext: (EOAdaptorContext *)adaptorContext;
/* Initializing an adaptor context */ /* Initializing an adaptor context */
- initWithAdaptorContext: (EOAdaptorContext *)adaptorContext; - (id)initWithAdaptorContext: (EOAdaptorContext *)adaptorContext;
/* Getting the adaptor context */ /* Getting the adaptor context */
- (EOAdaptorContext *)adaptorContext; - (EOAdaptorContext *)adaptorContext;
@ -117,7 +117,7 @@ inRowDescribedByQualifier: (EOQualifier *)qualifier
/* Fetching rows */ /* Fetching rows */
- (void)selectAttributes: (NSArray *)attributes - (void)selectAttributes: (NSArray *)attributes
fetchSpecification: (EOFetchSpecification *)fetchSpecification fetchSpecification: (EOFetchSpecification *)fetchSpecification
lock: (BOOL)aLockFlag lock: (BOOL)lockFlag
entity: (EOEntity *)entity; entity: (EOEntity *)entity;
- (void)lockRowComparingAttributes: (NSArray *)atts - (void)lockRowComparingAttributes: (NSArray *)atts
@ -150,11 +150,11 @@ inRowDescribedByQualifier: (EOQualifier *)qualifier
- (void)addStoredProceduresNamed: (NSArray *)storedProcedureNames - (void)addStoredProceduresNamed: (NSArray *)storedProcedureNames
toModel: (EOModel *)model; toModel: (EOModel *)model;
- (void)setDebugEnabled:(BOOL)yn; - (void)setDebugEnabled: (BOOL)yn;
- (BOOL)isDebugEnabled; - (BOOL)isDebugEnabled;
- (id)delegate; - (id)delegate;
- (void)setDelegate:(id)delegate; - (void)setDelegate: (id)delegate;
- (NSMutableDictionary *)dictionaryWithObjects: (id *)objects - (NSMutableDictionary *)dictionaryWithObjects: (id *)objects
forAttributes: (NSArray *)attributes forAttributes: (NSArray *)attributes
@ -182,50 +182,50 @@ inRowDescribedByQualifier: (EOQualifier *)qualifier
@interface NSObject (EOAdaptorChannelDelegation) @interface NSObject (EOAdaptorChannelDelegation)
- (NSArray *)adaptorChannel: channel - (NSArray *)adaptorChannel: (id)channel
willPerformOperations: (NSArray *)operations; willPerformOperations: (NSArray *)operations;
- (NSException *)adaptorChannel: channel - (NSException *)adaptorChannel: (id)channel
didPerformOperations: (NSArray *)operations didPerformOperations: (NSArray *)operations
exception: (NSException *)exception; exception: (NSException *)exception;
- (BOOL)adaptorChannel: channel - (BOOL)adaptorChannel: (id)channel
shouldSelectAttributes: (NSArray *)attributes shouldSelectAttributes: (NSArray *)attributes
fetchSpecification: (EOFetchSpecification *)fetchSpecification fetchSpecification: (EOFetchSpecification *)fetchSpecification
lock: (BOOL)flag lock: (BOOL)flag
entity: (EOEntity *)entity; entity: (EOEntity *)entity;
- (void)adaptorChannel: channel - (void)adaptorChannel: (id)channel
didSelectAttributes: (NSArray *)attributes didSelectAttributes: (NSArray *)attributes
fetchSpecification: (EOFetchSpecification *)fetchSpecification fetchSpecification: (EOFetchSpecification *)fetchSpecification
lock: (BOOL) flag lock: (BOOL) flag
entity: (EOEntity *)entity; 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 - (BOOL)adaptorChannel: (id)channel
shouldEvaluateExpression: (EOSQLExpression *)expression; shouldEvaluateExpression: (EOSQLExpression *)expression;
- (void)adaptorChannel: channel - (void)adaptorChannel: (id)channel
didEvaluateExpression: (EOSQLExpression *)expression; didEvaluateExpression: (EOSQLExpression *)expression;
- (NSDictionary *)adaptorChannel: channel - (NSDictionary *)adaptorChannel: (id)channel
shouldExecuteStoredProcedure: (EOStoredProcedure *)procedure shouldExecuteStoredProcedure: (EOStoredProcedure *)procedure
withValues: (NSDictionary *)values; withValues: (NSDictionary *)values;
- (void)adaptorChannel: channel - (void)adaptorChannel: (id)channel
didExecuteStoredProcedure: (EOStoredProcedure *)procedure didExecuteStoredProcedure: (EOStoredProcedure *)procedure
withValues: (NSDictionary *)values; withValues: (NSDictionary *)values;
- (NSDictionary *)adaptorChannelShouldConstructStoredProcedureReturnValues: channel; - (NSDictionary *)adaptorChannelShouldConstructStoredProcedureReturnValues: (id)channel;
- (NSDictionary *)adaptorChannel: channel - (NSDictionary *)adaptorChannel: (id)channel
shouldReturnValuesForStoredProcedure: (NSDictionary *)returnValues; shouldReturnValuesForStoredProcedure: (NSDictionary *)returnValues;
@end /* NSObject(EOAdaptorChannelDelegation) */ @end /* NSObject(EOAdaptorChannelDelegation) */

28
EOAccess/EOAdaptorContext.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOAdaptorContext.h EOAdaptorContext.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -77,17 +77,17 @@ typedef enum {
+ (EOAdaptorContext *)adaptorContextWithAdaptor: (EOAdaptor *)adaptor; + (EOAdaptorContext *)adaptorContextWithAdaptor: (EOAdaptor *)adaptor;
- initWithAdaptor: (EOAdaptor *)adaptor; - (id)initWithAdaptor: (EOAdaptor *)adaptor;
- (EOAdaptor*)adaptor; - (EOAdaptor *)adaptor;
- (EOAdaptorChannel *)createAdaptorChannel; // override - (EOAdaptorChannel *)createAdaptorChannel; // override
- (BOOL)hasOpenChannels; - (BOOL)hasOpenChannels;
- (BOOL)hasBusyChannels; - (BOOL)hasBusyChannels;
- delegate; - (id)delegate;
- (void)setDelegate:aDelegate; - (void)setDelegate: (id)delegate;
- (void)handleDroppedConnection; - (void)handleDroppedConnection;
@ -119,21 +119,21 @@ typedef enum {
@interface EOAdaptorContext(Private) @interface EOAdaptorContext(Private)
- (void)_channelDidInit: aChannel; - (void)_channelDidInit: (id)channel;
- (void)_channelWillDealloc: aChannel; - (void)_channelWillDealloc: (id)channel;
@end @end
@interface NSObject (EOAdaptorContextDelegation) @interface NSObject (EOAdaptorContextDelegation)
- (BOOL)adaptorContextShouldConnect: context; - (BOOL)adaptorContextShouldConnect: (id)context;
- (BOOL)adaptorContextShouldBegin: context; - (BOOL)adaptorContextShouldBegin: (id)context;
- (void)adaptorContextDidBegin: context; - (void)adaptorContextDidBegin: (id)context;
- (BOOL)adaptorContextShouldCommit: context; - (BOOL)adaptorContextShouldCommit: (id)context;
- (void)adaptorContextDidCommit: context; - (void)adaptorContextDidCommit: (id)context;
- (BOOL)adaptorContextShouldRollback: context; - (BOOL)adaptorContextShouldRollback: (id)context;
- (void)adaptorContextDidRollback: context; - (void)adaptorContextDidRollback: (id)context;
@end /* NSObject(EOAdaptorContextDelegate) */ @end /* NSObject(EOAdaptorContextDelegate) */

8
EOAccess/EOAdaptorPriv.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOAdaptorPriv.h EOAdaptorPriv.h
Copyright (C) 2002 Free Software Foundation, Inc. Copyright (C) 2002 Free Software Foundation, Inc.
@ -30,9 +30,9 @@
@interface EOAdaptor(EOAdaptorPrivate) @interface EOAdaptor(EOAdaptorPrivate)
- (void) _requestConcreteImplementationForSelector: (SEL)param0; - (void)_requestConcreteImplementationForSelector: (SEL)param0;
- (void) _unregisterAdaptorContext: (EOAdaptorContext*)adaptorContext; - (void)_unregisterAdaptorContext: (EOAdaptorContext *)adaptorContext;
- (void) _registerAdaptorContext: (EOAdaptorContext*)adaptorContext; - (void)_registerAdaptorContext: (EOAdaptorContext *)adaptorContext;
@end @end

10
EOAccess/EOAttribute.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOAttribute.h EOAttribute.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -115,8 +115,8 @@ typedef enum {
} }
/** returns an autoreleased attribute owned by onwer and built from propertyList **/ /** returns an autoreleased attribute owned by onwer and built from propertyList **/
+ (id) attributeWithPropertyList: (NSDictionary *)propertyList + (id)attributeWithPropertyList: (NSDictionary *)propertyList
owner: (id)owner; owner: (id)owner;
/* Accessing the entity */ /* Accessing the entity */
- (NSString *)name; - (NSString *)name;
@ -208,7 +208,7 @@ typedef enum {
- (void)setDocComment: (NSString *)docComment; - (void)setDocComment: (NSString *)docComment;
- (id)_normalizeDefinition: (EOExpressionArray*)definition - (id)_normalizeDefinition: (EOExpressionArray *)definition
path: (id)path; path: (id)path;
@end @end
@ -280,7 +280,7 @@ typedef enum {
@interface NSObject (EOCustomClassArchiving) @interface NSObject (EOCustomClassArchiving)
+ objectWithArchiveData: (NSData *)data; + (id)objectWithArchiveData: (NSData *)data;
- (NSData *)archiveData; - (NSData *)archiveData;
@end @end

14
EOAccess/EOAttributePriv.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOAttributePriv.h EOAttributePriv.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -37,12 +37,12 @@
@end @end
@interface EOAttribute (EOAttributePrivate2) @interface EOAttribute (EOAttributePrivate2)
- (BOOL) _hasAnyOverrides; - (BOOL)_hasAnyOverrides;
- (void) _resetPrototype; - (void)_resetPrototype;
- (void) _updateFromPrototype; - (void)_updateFromPrototype;
- (void) _setOverrideForKeyEnum: (int)keyEnum; - (void)_setOverrideForKeyEnum: (int)keyEnum;
- (BOOL) _isKeyEnumOverriden: (int)param0; - (BOOL)_isKeyEnumOverriden: (int)param0;
- (BOOL) _isKeyEnumDefinedByPrototype: (int)param0; - (BOOL)_isKeyEnumDefinedByPrototype: (int)param0;
@end @end
#endif /* __EOAttributePriv_h__ */ #endif /* __EOAttributePriv_h__ */

14
EOAccess/EODatabase.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EODatabase.h EODatabase.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -66,9 +66,9 @@ GDL2ACCESS_EXPORT NSString *EOGeneralDatabaseException;
+ (EODatabase *)databaseWithModel: (EOModel *)model; + (EODatabase *)databaseWithModel: (EOModel *)model;
- initWithAdaptor: (EOAdaptor *)adaptor; - (id)initWithAdaptor: (EOAdaptor *)adaptor;
- initWithModel: (EOModel *)model; - (id)initWithModel: (EOModel *)model;
- (NSArray *)registeredContexts; - (NSArray *)registeredContexts;
@ -99,11 +99,11 @@ GDL2ACCESS_EXPORT NSString *EOGeneralDatabaseException;
- (void)recordSnapshot: (NSDictionary *)snapshot forGlobalID: (EOGlobalID *)gid; - (void)recordSnapshot: (NSDictionary *)snapshot forGlobalID: (EOGlobalID *)gid;
- (NSDictionary *)snapshotForGlobalID:(EOGlobalID *)gid; - (NSDictionary *)snapshotForGlobalID: (EOGlobalID *)gid;
- (void)recordSnapshot:(NSArray *)gids - (void)recordSnapshot: (NSArray *)gids
forSourceGlobalID:(EOGlobalID *)gid forSourceGlobalID: (EOGlobalID *)gid
relationshipName:(NSString *)name; relationshipName: (NSString *)name;
- (NSArray *)snapshotForSourceGlobalID: (EOGlobalID *)gid - (NSArray *)snapshotForSourceGlobalID: (EOGlobalID *)gid
relationshipName: (NSString *)name; relationshipName: (NSString *)name;

10
EOAccess/EODatabaseChannel.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EODatabaseChannel.h EODatabaseChannel.h
Copyright (C) 2000-2002 Free Software Foundation, Inc. Copyright (C) 2000-2002 Free Software Foundation, Inc.
@ -66,12 +66,12 @@
} _delegateRespondsTo; } _delegateRespondsTo;
} }
+ (EODatabaseChannel*)databaseChannelWithDatabaseContext: (EODatabaseContext *)databaseContext; + (EODatabaseChannel *)databaseChannelWithDatabaseContext: (EODatabaseContext *)databaseContext;
- initWithDatabaseContext: (EODatabaseContext *)databaseContext; - (id)initWithDatabaseContext: (EODatabaseContext *)databaseContext;
- (void)setCurrentEntity: (EOEntity *)entity; - (void)setCurrentEntity: (EOEntity *)entity;
- (void) setEntity: (EOEntity *)entity; - (void)setEntity: (EOEntity *)entity;
- (void)setCurrentEditingContext: (EOEditingContext *)context; - (void)setCurrentEditingContext: (EOEditingContext *)context;
@ -95,7 +95,7 @@
- (void)setIsLocking: (BOOL)isLocking; - (void)setIsLocking: (BOOL)isLocking;
- (void)setDelegate: (id)delegate; - (void)setDelegate: (id)delegate;
- (id) delegate; - (id)delegate;
@end @end

16
EOAccess/EODatabaseChannelPriv.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EODatabaseChannelPriv.h EODatabaseChannelPriv.h
Copyright (C) 2002 Free Software Foundation, Inc. Copyright (C) 2002 Free Software Foundation, Inc.
@ -33,16 +33,16 @@
@interface EODatabaseChannel (EODatabaseChannelPrivate) @interface EODatabaseChannel (EODatabaseChannelPrivate)
- (NSArray*) _propertiesToFetch; - (NSArray *)_propertiesToFetch;
- (void)_setCurrentEntityAndRelationshipWithFetchSpecification: (EOFetchSpecification *)fetch; - (void)_setCurrentEntityAndRelationshipWithFetchSpecification: (EOFetchSpecification *)fetch;
-(void)_selectWithFetchSpecification: (EOFetchSpecification *)fetch -(void)_selectWithFetchSpecification: (EOFetchSpecification *)fetch
editingContext: (EOEditingContext *)context; editingContext: (EOEditingContext *)context;
- (void) _buildNodeList: (id)param0 - (void)_buildNodeList: (id)param0
withParent: (id)param1; withParent: (id)param1;
- (id) currentEditingContext; - (id)currentEditingContext;
- (void) _cancelInternalFetch; - (void)_cancelInternalFetch;
- (void) _closeChannel; - (void)_closeChannel;
- (void) _openChannel; - (void)_openChannel;
@end @end
#endif /* __EODatabaseChannelPriv_h__ */ #endif /* __EODatabaseChannelPriv_h__ */

131
EOAccess/EODatabaseContext.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EODatabaseContext.h EODatabaseContext.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -76,8 +76,8 @@ struct _EOTransactionScope;
*/ */
NSMutableArray *_registeredChannels; NSMutableArray *_registeredChannels;
NSMapTable *_dbOperationsByGlobalID; NSMapTable *_dbOperationsByGlobalID;
EOObjectStoreCoordinator *_coordinator; // not retained EOObjectStoreCoordinator *_coordinator; /* unretained */
EOEditingContext *_editingContext; // not retained EOEditingContext *_editingContext; /* unretained */
id *_lockedObjects;//void* id *_lockedObjects;//void*
/*TO ADD unsigned int _currentGeneration; /*TO ADD unsigned int _currentGeneration;
unsigned int _concurentFetches; unsigned int _concurentFetches;
@ -108,7 +108,7 @@ struct _EOTransactionScope;
unsigned int ignoreEntityCaching:1; unsigned int ignoreEntityCaching:1;
unsigned int _reserved:29; unsigned int _reserved:29;
} _flags; } _flags;
id _delegate; // not retained id _delegate; /* unretained */
struct { struct {
unsigned int willRunLoginPanelToOpenDatabaseChannel:1; unsigned int willRunLoginPanelToOpenDatabaseChannel:1;
unsigned int newPrimaryKey:1; unsigned int newPrimaryKey:1;
@ -129,7 +129,7 @@ struct _EOTransactionScope;
+ (EODatabaseContext *)databaseContextWithDatabase: (EODatabase *)database; + (EODatabaseContext *)databaseContextWithDatabase: (EODatabase *)database;
- initWithDatabase: (EODatabase *)database; - (id)initWithDatabase: (EODatabase *)database;
+ (EODatabaseContext *)registeredDatabaseContextForModel: (EOModel *)model + (EODatabaseContext *)registeredDatabaseContextForModel: (EOModel *)model
editingContext: (EOEditingContext *)editingContext; editingContext: (EOEditingContext *)editingContext;
@ -168,7 +168,7 @@ struct _EOTransactionScope;
entityNamed: (NSString *)entityName entityNamed: (NSString *)entityName
editingContext: (EOEditingContext *)editingContext; editingContext: (EOEditingContext *)editingContext;
- (id) entityForGlobalID: (EOGlobalID *)globalID; - (id)entityForGlobalID: (EOGlobalID *)globalID;
- (id)faultForGlobalID: (EOGlobalID *)globalID - (id)faultForGlobalID: (EOGlobalID *)globalID
editingContext: (EOEditingContext *)context; editingContext: (EOEditingContext *)context;
@ -184,19 +184,19 @@ struct _EOTransactionScope;
- (NSArray *)objectsForSourceGlobalID: (EOGlobalID *)globalID - (NSArray *)objectsForSourceGlobalID: (EOGlobalID *)globalID
relationshipName: (NSString *)name relationshipName: (NSString *)name
editingContext: (EOEditingContext *)context; editingContext: (EOEditingContext *)context;
- (void)_registerSnapshot: (NSArray*)snapshot - (void)_registerSnapshot: (NSArray *)snapshot
forSourceGlobalID: (EOGlobalID*)globalID forSourceGlobalID: (EOGlobalID *)globalID
relationshipName: (NSString*)name relationshipName: (NSString *)name
editingContext: (EOEditingContext*)context; editingContext: (EOEditingContext *)context;
- (void)refaultObject: object - (void)refaultObject: (id)object
withGlobalID: (EOGlobalID *)globalID withGlobalID: (EOGlobalID *)globalID
editingContext: (EOEditingContext *)context; editingContext: (EOEditingContext *)context;
- (void)saveChangesInEditingContext: (EOEditingContext *)context; - (void)saveChangesInEditingContext: (EOEditingContext *)context;
- (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpecification - (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpecification
editingContext:(EOEditingContext *)context; editingContext: (EOEditingContext *)context;
- (BOOL)isObjectLockedWithGlobalID: (EOGlobalID *)gid - (BOOL)isObjectLockedWithGlobalID: (EOGlobalID *)gid
editingContext: (EOEditingContext *)context; editingContext: (EOEditingContext *)context;
@ -212,7 +212,7 @@ struct _EOTransactionScope;
@interface EODatabaseContext (EOCooperatingObjectStoreSupport) @interface EODatabaseContext (EOCooperatingObjectStoreSupport)
- (BOOL)ownsGlobalID:(EOGlobalID *)globalID; - (BOOL)ownsGlobalID: (EOGlobalID *)globalID;
- (BOOL)ownsObject: (id)object; - (BOOL)ownsObject: (id)object;
@ -230,7 +230,7 @@ It's invoked after prepareForSaveWithCoordinator:editingContext: and before owns
**/ **/
- (void)recordChangesInEditingContext; - (void)recordChangesInEditingContext;
- (void)recordUpdateForObject: object - (void)recordUpdateForObject: (id)object
changes: (NSDictionary *)changes; changes: (NSDictionary *)changes;
- (void)performChanges; - (void)performChanges;
@ -239,58 +239,58 @@ It's invoked after prepareForSaveWithCoordinator:editingContext: and before owns
- (void)rollbackChanges; - (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 object: (id)object
entity: (EOEntity*)entity; entity: (EOEntity *)entity;
-(void)nullifyAttributesInRelationship: (EORelationship*)relationship -(void)nullifyAttributesInRelationship: (EORelationship *)relationship
sourceObject: (id)sourceObject sourceObject: (id)sourceObject
destinationObjects: (NSArray*)destinationObjects; destinationObjects: (NSArray *)destinationObjects;
-(void)nullifyAttributesInRelationship: (EORelationship*)relationship -(void)nullifyAttributesInRelationship: (EORelationship *)relationship
sourceObject: (id)sourceObject sourceObject: (id)sourceObject
destinationObject: (id)destinationObject; destinationObject: (id)destinationObject;
-(void)relayAttributesInRelationship: (EORelationship*)relationship -(void)relayAttributesInRelationship: (EORelationship *)relationship
sourceObject: (id)sourceObject sourceObject: (id)sourceObject
destinationObjects: (NSArray*)destinationObjects; destinationObjects: (NSArray *)destinationObjects;
-(NSDictionary*)relayAttributesInRelationship: (EORelationship*)relationship -(NSDictionary *)relayAttributesInRelationship: (EORelationship *)relationship
sourceObject: (id)sourceObject sourceObject: (id)sourceObject
destinationObject: (id)destinationObject; destinationObject: (id)destinationObject;
- (id) databaseOperationForObject: (id)param0; - (id)databaseOperationForObject: (id)param0;
- (id) databaseOperationForGlobalID: (id)param0; - (id)databaseOperationForGlobalID: (id)param0;
- (void) recordDatabaseOperation: (id)param0; - (void)recordDatabaseOperation: (id)param0;
- (void) recordDeleteForObject: (id)param0; - (void)recordDeleteForObject: (id)param0;
- (void) recordInsertForObject: (id)param0; - (void)recordInsertForObject: (id)param0;
- (void) createAdaptorOperationsForDatabaseOperation: (EODatabaseOperation*)dbOpe - (void)createAdaptorOperationsForDatabaseOperation: (EODatabaseOperation *)dbOpe
attributes: (NSArray*)attributes; attributes: (NSArray *)attributes;
- (void) createAdaptorOperationsForDatabaseOperation: (EODatabaseOperation*)dbOpe; - (void)createAdaptorOperationsForDatabaseOperation: (EODatabaseOperation *)dbOpe;
- (NSArray*) orderAdaptorOperations; - (NSArray *)orderAdaptorOperations;
- (NSArray*) entitiesOnWhichThisEntityDepends: (EOEntity *)entity; - (NSArray *)entitiesOnWhichThisEntityDepends: (EOEntity *)entity;
-(NSArray*)entityNameOrderingArrayForEntities: (NSArray *)entities; - (NSArray *)entityNameOrderingArrayForEntities: (NSArray *)entities;
- (BOOL) isValidQualifierTypeForAttribute: (EOAttribute*)attribute; - (BOOL)isValidQualifierTypeForAttribute: (EOAttribute *)attribute;
- (id) lockingNonQualifiableAttributes: (NSArray*)attributes; - (id)lockingNonQualifiableAttributes: (NSArray *)attributes;
- (NSArray*) lockingAttributesForAttributes: (NSArray*)attributes - (NSArray *)lockingAttributesForAttributes: (NSArray *)attributes
entity: (EOEntity*)enity; entity: (EOEntity *)enity;
- (NSArray*) primaryKeyAttributesForAttributes: (NSArray*)attributes - (NSArray *)primaryKeyAttributesForAttributes: (NSArray *)attributes
entity: (EOEntity*)entity; entity: (EOEntity *)entity;
- (EOQualifier*) qualifierForLockingAttributes: (NSArray*)attributes - (EOQualifier *)qualifierForLockingAttributes: (NSArray *)attributes
primaryKeyAttributes: (NSArray*)primaryKeyAttributes primaryKeyAttributes: (NSArray *)primaryKeyAttributes
entity: (EOEntity*)entity entity: (EOEntity *)entity
snapshot: (NSDictionary*)snapshot; snapshot: (NSDictionary *)snapshot;
- (void) insertEntity: (EOEntity*)entity - (void)insertEntity: (EOEntity *)entity
intoOrderingArray: (NSMutableArray*)orderingArray intoOrderingArray: (NSMutableArray *)orderingArray
withDependencies: (NSDictionary*)dependencies withDependencies: (NSDictionary *)dependencies
processingSet: (NSMutableSet*)processingSet; processingSet: (NSMutableSet *)processingSet;
- (void) processSnapshotForDatabaseOperation: (EODatabaseOperation*)dbOpe; - (void)processSnapshotForDatabaseOperation: (EODatabaseOperation *)dbOpe;
- (NSDictionary*) valuesToWriteForAttributes: (NSArray*)attributes - (NSDictionary *)valuesToWriteForAttributes: (NSArray *)attributes
entity: (EOEntity*)entity entity: (EOEntity *)entity
changedValues: (NSDictionary*)changedValues; changedValues: (NSDictionary *)changedValues;
@end @end
@ -335,7 +335,7 @@ Only searches locally (in the transaction scope), not in the EODatabase. **/
- (NSDictionary *)localSnapshotForGlobalID: (EOGlobalID *)gid; - (NSDictionary *)localSnapshotForGlobalID: (EOGlobalID *)gid;
- (NSArray *)localSnapshotForSourceGlobalID: (EOGlobalID *)gid - (NSArray *)localSnapshotForSourceGlobalID: (EOGlobalID *)gid
relationshipName:(NSString *)name; relationshipName: (NSString *)name;
- (void)forgetSnapshotForGlobalID: (EOGlobalID *)gid; - (void)forgetSnapshotForGlobalID: (EOGlobalID *)gid;
- (void)forgetSnapshotsForGlobalIDs: (NSArray *)gids; - (void)forgetSnapshotsForGlobalIDs: (NSArray *)gids;
@ -348,16 +348,16 @@ Only searches locally (in the transaction scope), not in the EODatabase. **/
- (BOOL)isObjectLockedWithGlobalID: (EOGlobalID *)globalID; - (BOOL)isObjectLockedWithGlobalID: (EOGlobalID *)globalID;
- (void)forgetAllLocks; - (void)forgetAllLocks;
- (void)forgetLocksForObjectsWithGlobalIDs: (NSArray *)gids; - (void)forgetLocksForObjectsWithGlobalIDs: (NSArray *)gids;
- (void) _rollbackTransaction; - (void)_rollbackTransaction;
- (void) _commitTransaction; - (void)_commitTransaction;
- (void) _beginTransaction; - (void)_beginTransaction;
- (EODatabaseChannel*) _obtainOpenChannel; - (EODatabaseChannel *)_obtainOpenChannel;
- (BOOL) _openChannelWithLoginPanel:(id)param0; - (BOOL)_openChannelWithLoginPanel: (id)param0;
- (void) _forceDisconnect; - (void)_forceDisconnect;
- (void)initializeObject:(id)object - (void)initializeObject: (id)object
row:(NSDictionary*)row row: (NSDictionary *)row
entity:(EOEntity*)entity entity: (EOEntity *)entity
editingContext:(EOEditingContext*)context; editingContext: (EOEditingContext *)context;
@end @end
@ -368,7 +368,6 @@ Only searches locally (in the transaction scope), not in the EODatabase. **/
@end @end
// Notifications:
GDL2ACCESS_EXPORT NSString *EODatabaseChannelNeededNotification; GDL2ACCESS_EXPORT NSString *EODatabaseChannelNeededNotification;

50
EOAccess/EODatabaseContextPriv.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EODatabaseContextPriv.h EODatabaseContextPriv.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -36,38 +36,40 @@
@interface EODatabaseContext (EODatabaseContextPrivate) @interface EODatabaseContext (EODatabaseContextPrivate)
- (void) _fireArrayFault: (id)object; - (void)_fireArrayFault: (id)object;
- (void) _fireFault: (id)object; - (void)_fireFault: (id)object;
- (void) _addBatchForGlobalID: (EOKeyGlobalID *)globalID - (void)_addBatchForGlobalID: (EOKeyGlobalID *)globalID
fault: (EOFault *)fault; fault: (EOFault *)fault;
- (void) _removeBatchForGlobalID: (EOKeyGlobalID *)globalID - (void)_removeBatchForGlobalID: (EOKeyGlobalID *)globalID
fault: (EOFault *)fault; fault: (EOFault *)fault;
- (void) _addToManyBatchForSourceGlobalID: (EOKeyGlobalID *)globalID - (void)_addToManyBatchForSourceGlobalID: (EOKeyGlobalID *)globalID
relationshipName: (NSString *)relationshipName relationshipName: (NSString *)relationshipName
fault: (EOFault *)fault; fault: (EOFault *)fault;
/*- (void)_batchToOne: (id)fault /*
- (void)_batchToOne: (id)fault
withHandler: (EOAccessFaultHandler *)handler; withHandler: (EOAccessFaultHandler *)handler;
- (void)_batchToMany: (id)fault - (void)_batchToMany: (id)fault
withHandler: (EOAccessArrayFaultHandler *)handler;*/ withHandler: (EOAccessArrayFaultHandler *)handler;
*/
@end @end
@interface EODatabaseContext (EODatabaseContextPrivate2) @interface EODatabaseContext (EODatabaseContextPrivate2)
- (void) _verifyNoChangesToReadonlyEntity: (EODatabaseOperation*)dbOpe; - (void)_verifyNoChangesToReadonlyEntity: (EODatabaseOperation *)dbOpe;
- (EOGlobalID*) _globalIDForObject: (id)object; - (EOGlobalID *)_globalIDForObject: (id)object;
- (id) _primaryKeyForObject: (id)object; - (id)_primaryKeyForObject: (id)object;
- (NSDictionary*)_primaryKeyForObject: (id)object - (NSDictionary *)_primaryKeyForObject: (id)object
raiseException: (BOOL)raiseException; raiseException: (BOOL)raiseException;
- (id) _currentCommittedSnapshotForObject: (id)object; - (id)_currentCommittedSnapshotForObject: (id)object;
- (id) _addDatabaseContextStateToException: (id)param0; - (id)_addDatabaseContextStateToException: (id)param0;
- (id) _databaseContextState; - (id)_databaseContextState;
- (void) _cleanUpAfterSave; - (void)_cleanUpAfterSave;
- (void) _assertValidStateWithSelector: (SEL)sel; - (void)_assertValidStateWithSelector: (SEL)sel;
- (BOOL) _shouldGeneratePrimaryKeyForEntityName: (NSString*)entityName; - (BOOL)_shouldGeneratePrimaryKeyForEntityName: (NSString *)entityName;
- (void) _buildPrimaryKeyGeneratorListForEditingContext: (EOEditingContext*)context; - (void)_buildPrimaryKeyGeneratorListForEditingContext: (EOEditingContext *)context;
@end @end

12
EOAccess/EODatabaseDataSource.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EODatabaseDataSource.m EODatabaseDataSource.m
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -54,11 +54,11 @@
} _flags; } _flags;
} }
- initWithEditingContext: (EOEditingContext *)anEditingContext - (id)initWithEditingContext: (EOEditingContext *)editingContext
entityName: (NSString *)anEntityName; entityName: (NSString *)entityName;
- initWithEditingContext: (EOEditingContext *)editingContext - (id)initWithEditingContext: (EOEditingContext *)editingContext
entityName: (NSString *)entityName entityName: (NSString *)entityName
fetchSpecificationName: (NSString *)fetchName; fetchSpecificationName: (NSString *)fetchName;
- (EOEntity *)entity; - (EOEntity *)entity;

14
EOAccess/EODatabaseOperation.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EODatabaseOperation.h EODatabaseOperation.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -74,7 +74,7 @@ Instance objects are created by EODatabaseOperation
+ (EOAdaptorOperation *)adaptorOperationWithEntity: (EOEntity *)entity; + (EOAdaptorOperation *)adaptorOperationWithEntity: (EOEntity *)entity;
/** Init the instance with the main concerned entity **/ /** Init the instance with the main concerned entity **/
- (id) initWithEntity: (EOEntity *)entity; - (id)initWithEntity: (EOEntity *)entity;
/** returns adaptor operator **/ /** returns adaptor operator **/
- (EOAdaptorOperator)adaptorOperator; - (EOAdaptorOperator)adaptorOperator;
@ -136,7 +136,7 @@ You generally don't need to create such objects by yourself. They are created by
NSMutableDictionary *_toManySnapshots; /** **/ NSMutableDictionary *_toManySnapshots; /** **/
} }
+ (EODatabaseOperation*)databaseOperationWithGlobalID: (EOGlobalID *)globalID + (EODatabaseOperation *)databaseOperationWithGlobalID: (EOGlobalID *)globalID
object: (id)object object: (id)object
entity: (EOEntity *)entity; 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 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; - (NSMutableDictionary *)newRow;
- (void)setNewRow:(NSMutableDictionary *)newRow; - (void)setNewRow: (NSMutableDictionary *)newRow;
- (EOGlobalID *)globalID; - (EOGlobalID *)globalID;
- (id)object; - (id)object;
- (EOEntity *)entity; - (EOEntity *)entity;
- (EODatabaseOperator)databaseOperator; - (EODatabaseOperator)databaseOperator;
- (void)setDatabaseOperator: (EODatabaseOperator)dbOp; - (void)setDatabaseOperator: (EODatabaseOperator)dbOp;
- (NSDictionary *)rowDiffs; - (NSDictionary *)rowDiffs;
- (NSDictionary *)rowDiffsForAttributes: (NSArray *)attributes; - (NSDictionary *)rowDiffsForAttributes: (NSArray *)attributes;
- (NSDictionary *)primaryKeyDiffs; - (NSDictionary *)primaryKeyDiffs;
/** returns array of EOAdaptorOperations to perform **/ /** returns array of EOAdaptorOperations to perform **/
@ -185,7 +181,7 @@ Raises an exception if adaptorOperation is nil
/** removes an Adaptor Operation **/ /** removes an Adaptor Operation **/
- (void)removeAdaptorOperation: (EOAdaptorOperation *)adaptorOperation; - (void)removeAdaptorOperation: (EOAdaptorOperation *)adaptorOperation;
- (void)recordToManySnapshot: (NSArray *)gids relationshipName:(NSString *)name; - (void)recordToManySnapshot: (NSArray *)gids relationshipName: (NSString *)name;
- (NSDictionary *)toManySnapshots; - (NSDictionary *)toManySnapshots;
@end @end

2
EOAccess/EODatabaseOperationPriv.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EODatabaseOperationPriv.h EODatabaseOperationPriv.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.

2
EOAccess/EODefines.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EODefines.h EODefines.h
Copyright (C) 2003 Free Software Foundation, Inc. Copyright (C) 2003 Free Software Foundation, Inc.

2
EOAccess/EODeprecated.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EODeprecated.h EODeprecated.h
Copyright (C) 2002 Free Software Foundation, Inc. Copyright (C) 2002 Free Software Foundation, Inc.

160
EOAccess/EOEntity.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOEntity.h EOEntity.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -134,16 +134,16 @@
- (NSString *)description; - (NSString *)description;
/* Accessing the name */ /* Accessing the name */
- (NSString*)name; - (NSString *)name;
/* Accessing the model */ /* Accessing the model */
- (EOModel*)model; - (EOModel *)model;
/* Accessing external information */ /* Accessing external information */
- (NSString*)externalName; - (NSString *)externalName;
/* Accessing the external query */ /* Accessing the external query */
- (NSString*)externalQuery; - (NSString *)externalQuery;
/* Getting the qualifier */ /* Getting the qualifier */
- (EOQualifier *)restrictingQualifier; - (EOQualifier *)restrictingQualifier;
@ -157,7 +157,7 @@
- (BOOL)cachesObjects; - (BOOL)cachesObjects;
/* Accessing the enterprise object class */ /* Accessing the enterprise object class */
- (NSString*)className; - (NSString *)className;
-(Class)_classForInstances; -(Class)_classForInstances;
@ -188,10 +188,10 @@
/* Getting primary keys and snapshot for row */ /* Getting primary keys and snapshot for row */
- (NSDictionary *)primaryKeyForRow: (NSDictionary *)row; - (NSDictionary *)primaryKeyForRow: (NSDictionary *)row;
- (BOOL)isValidAttributeUsedForLocking: (EOAttribute *)anAttribute; - (BOOL)isValidAttributeUsedForLocking: (EOAttribute *)attribute;
- (BOOL)isValidPrimaryKeyAttribute: (EOAttribute *)anAttribute; - (BOOL)isValidPrimaryKeyAttribute: (EOAttribute *)attribute;
- (BOOL)isPrimaryKeyValidInObject: (id)object; - (BOOL)isPrimaryKeyValidInObject: (id)object;
- (BOOL)isValidClassProperty: aProp; - (BOOL)isValidClassProperty: (id)property;
/** Accessing the user dictionary **/ /** Accessing the user dictionary **/
- (NSDictionary *)userInfo; - (NSDictionary *)userInfo;
@ -211,22 +211,22 @@
@interface EOEntity (EOKeyGlobalID) @interface EOEntity (EOKeyGlobalID)
- (EOGlobalID *)globalIDForRow: (NSDictionary *)row; - (EOGlobalID *)globalIDForRow: (NSDictionary *)row;
- (id) globalIDForRow: (NSDictionary*)row - (id)globalIDForRow: (NSDictionary *)row
isFinal: (BOOL)isFinal; isFinal: (BOOL)isFinal;
- (NSDictionary *)primaryKeyForGlobalID: (EOKeyGlobalID *)gid; - (NSDictionary *)primaryKeyForGlobalID: (EOKeyGlobalID *)gid;
- (Class)classForObjectWithGlobalID: (EOKeyGlobalID*)globalID; - (Class)classForObjectWithGlobalID: (EOKeyGlobalID *)globalID;
@end @end
@interface EOEntity (EOEntityEditing) @interface EOEntity (EOEntityEditing)
- (BOOL)setClassProperties: (NSArray*)properties; - (BOOL)setClassProperties: (NSArray *)properties;
- (BOOL)setPrimaryKeyAttributes: (NSArray*)keys; - (BOOL)setPrimaryKeyAttributes: (NSArray *)keys;
- (BOOL)setAttributesUsedForLocking: (NSArray*)attributes; - (BOOL)setAttributesUsedForLocking: (NSArray *)attributes;
- (NSException *)validateName: (NSString *) name; - (NSException *)validateName: (NSString *)name;
- (void)setName: (NSString*)name; - (void)setName: (NSString *)name;
- (void)setExternalName: (NSString*)name; - (void)setExternalName: (NSString *)name;
- (void)setExternalQuery: (NSString*)query; - (void)setExternalQuery: (NSString *)query;
- (void)setRestrictingQualifier: (EOQualifier *)qualifier; - (void)setRestrictingQualifier: (EOQualifier *)qualifier;
- (void)setReadOnly: (BOOL)flag; - (void)setReadOnly: (BOOL)flag;
- (void)setCachesObjects: (BOOL)yn; - (void)setCachesObjects: (BOOL)yn;
@ -241,10 +241,10 @@
withName: (NSString *)name; withName: (NSString *)name;
- (void)removeFetchSpecificationNamed: (NSString *)name; - (void)removeFetchSpecificationNamed: (NSString *)name;
- (void)setClassName: (NSString*)name; - (void)setClassName: (NSString *)name;
- (void)setUserInfo: (NSDictionary*)dictionary; - (void)setUserInfo: (NSDictionary *)dictionary;
- (void) _setInternalInfo: (NSDictionary*)dictionary; - (void)_setInternalInfo: (NSDictionary *)dictionary;
- (void) setDocComment:(NSString *)docComment; - (void)setDocComment: (NSString *)docComment;
- (void)addSubEntity: (EOEntity *)child; - (void)addSubEntity: (EOEntity *)child;
- (void)removeSubEntity: (EOEntity *)child; - (void)removeSubEntity: (EOEntity *)child;
@ -257,7 +257,7 @@
@interface EOEntity (EOModelReferentialIntegrity) @interface EOEntity (EOModelReferentialIntegrity)
- (BOOL)referencesProperty:property; - (BOOL)referencesProperty: (id)property;
- (NSArray *)externalModelsReferenced; - (NSArray *)externalModelsReferenced;
@end @end
@ -276,16 +276,16 @@ GDL2ACCESS_EXPORT NSString *EONextPrimaryKeyProcedureOperation;
@interface EOEntity (MethodSet11) @interface EOEntity (MethodSet11)
- (NSException *)validateObjectForDelete: (id)object; - (NSException *)validateObjectForDelete: (id)object;
- (id) classPropertyAttributeNames; - (id)classPropertyAttributeNames;
- (id) classPropertyToManyRelationshipNames; - (id)classPropertyToManyRelationshipNames;
- (id) classPropertyToOneRelationshipNames; - (id)classPropertyToOneRelationshipNames;
- (id) qualifierForDBSnapshot: (id)param0; - (id)qualifierForDBSnapshot: (id)param0;
- (EOAttribute*) attributeForPath: (NSString*)path; - (EOAttribute *)attributeForPath: (NSString *)path;
- (EORelationship*) relationshipForPath: (NSString*)path; - (EORelationship *)relationshipForPath: (NSString *)path;
- (void) _addAttributesToFetchForRelationshipPath: (NSString*)path - (void)_addAttributesToFetchForRelationshipPath: (NSString *)path
atts: (NSMutableDictionary*)atts; atts: (NSMutableDictionary *)atts;
- (id) dbSnapshotKeys; - (id)dbSnapshotKeys;
- (NSArray*) flattenedAttributes; - (NSArray *)flattenedAttributes;
@end @end
@interface EOEntity (EOStoredProcedures) @interface EOEntity (EOStoredProcedures)
@ -309,61 +309,61 @@ GDL2ACCESS_EXPORT NSString *EONextPrimaryKeyProcedureOperation;
@end @end
@interface EOEntity (EOEntityHidden) @interface EOEntity (EOEntityHidden)
- (NSDictionary*)attributesByName; - (NSDictionary *)attributesByName;
- (NSDictionary*)relationshipsByName; - (NSDictionary *)relationshipsByName;
- (NSArray*) _allFetchSpecifications; - (NSArray *)_allFetchSpecifications;
- (NSDictionary*) _fetchSpecificationDictionary; - (NSDictionary *)_fetchSpecificationDictionary;
- (void) _loadEntity; - (void)_loadEntity;
- (id) parentRelationship; - (id)parentRelationship;
- (int) _numberOfRelationships; - (int)_numberOfRelationships;
- (BOOL) _hasReadOnlyAttributes; - (BOOL)_hasReadOnlyAttributes;
- (NSArray*) writableDBSnapshotKeys; - (NSArray *)writableDBSnapshotKeys;
- (NSArray*) rootAttributesUsedForLocking; - (NSArray *)rootAttributesUsedForLocking;
- (BOOL) isSubEntityOf:(id)param0; - (BOOL)isSubEntityOf: (id)param0;
- (id) initObject: (id)param0 - (id)initObject: (id)param0
editingContext: (id)param1 editingContext: (id)param1
globalID: (id)param2; globalID: (id)param2;
- (id) allocBiggestObjectWithZone:(NSZone*)zone; - (id)allocBiggestObjectWithZone: (NSZone *)zone;
- (Class) _biggestClass; - (Class)_biggestClass;
- (NSArray*) relationshipsPlist; - (NSArray *)relationshipsPlist;
- (id) rootParent; - (id)rootParent;
- (void) _setParent: (id)param0; - (void)_setParent: (id)param0;
- (NSArray*) _hiddenRelationships; - (NSArray *)_hiddenRelationships;
- (NSArray*) _propertyNames; - (NSArray *)_propertyNames;
- (id) _flattenAttribute: (id)param0 - (id)_flattenAttribute: (id)param0
relationshipPath: (id)param1 relationshipPath: (id)param1
currentAttributes: (id)param2; currentAttributes: (id)param2;
- (NSString*) snapshotKeyForAttributeName: (NSString*)attributeName; - (NSString *)snapshotKeyForAttributeName: (NSString *)attributeName;
- (id) _flattenedAttNameToSnapshotKeyMapping; - (id)_flattenedAttNameToSnapshotKeyMapping;
- (EOMKKDSubsetMapping*) _snapshotToAdaptorRowSubsetMapping; - (EOMKKDSubsetMapping *)_snapshotToAdaptorRowSubsetMapping;
- (EOMutableKnownKeyDictionary*) _dictionaryForPrimaryKey; - (EOMutableKnownKeyDictionary *)_dictionaryForPrimaryKey;
- (EOMutableKnownKeyDictionary*) _dictionaryForProperties; - (EOMutableKnownKeyDictionary *)_dictionaryForProperties;
- (EOMutableKnownKeyDictionary*) _dictionaryForInstanceProperties; - (EOMutableKnownKeyDictionary *)_dictionaryForInstanceProperties;
- (NSArray*) _relationshipsToFaultForRow: (NSDictionary*)row; - (NSArray *)_relationshipsToFaultForRow: (NSDictionary *)row;
- (NSArray*) _classPropertyAttributes; - (NSArray *)_classPropertyAttributes;
- (NSArray*) _attributesToSave; - (NSArray *)_attributesToSave;
- (NSArray*) _attributesToFetch; - (NSArray *)_attributesToFetch;
- (EOMKKDInitializer*) _adaptorDictionaryInitializer; - (EOMKKDInitializer *)_adaptorDictionaryInitializer;
- (EOMKKDInitializer*) _snapshotDictionaryInitializer; - (EOMKKDInitializer *)_snapshotDictionaryInitializer;
- (EOMKKDInitializer*) _primaryKeyDictionaryInitializer; - (EOMKKDInitializer *)_primaryKeyDictionaryInitializer;
- (EOMKKDInitializer*) _propertyDictionaryInitializer; - (EOMKKDInitializer *)_propertyDictionaryInitializer;
- (EOMKKDInitializer*) _instanceDictionaryInitializer; - (EOMKKDInitializer *)_instanceDictionaryInitializer;
- (void) _setModel: (EOModel*)model; - (void)_setModel: (EOModel *)model;
- (void) _setIsEdited; - (void)_setIsEdited;
- (NSArray*) _classPropertyAttributes; - (NSArray *)_classPropertyAttributes;
@end @end
@interface EOEntityClassDescription:EOClassDescription @interface EOEntityClassDescription : EOClassDescription
{ {
EOEntity *_entity; EOEntity *_entity;
unsigned int extraRefCount; unsigned int extraRefCount;
} }
/** returns an autoreleased entity class description for entity entity **/ /** returns an autoreleased entity class description for entity entity **/
+ (EOEntityClassDescription*)entityClassDescriptionWithEntity: (EOEntity *)entity; + (EOEntityClassDescription *)entityClassDescriptionWithEntity: (EOEntity *)entity;
/** initialize with entity **/ /** initialize with entity **/
- initWithEntity: (EOEntity *)entity; - (id)initWithEntity: (EOEntity *)entity;
/** returns entity **/ /** returns entity **/
- (EOEntity *)entity; - (EOEntity *)entity;
@ -371,7 +371,7 @@ GDL2ACCESS_EXPORT NSString *EONextPrimaryKeyProcedureOperation;
/** returns a new autoreleased mutable dictionary to store properties /** returns a new autoreleased mutable dictionary to store properties
returns nil if there's no key in the instanceDictionaryInitializer returns nil if there's no key in the instanceDictionaryInitializer
**/ **/
- (EOMutableKnownKeyDictionary*) dictionaryForInstanceProperties; - (EOMutableKnownKeyDictionary *)dictionaryForInstanceProperties;
@end @end
@interface NSString (EODatabaseNameConversion) @interface NSString (EODatabaseNameConversion)

34
EOAccess/EOEntityPriv.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOEntityPriv.h EOEntityPriv.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -45,29 +45,29 @@
@end @end
@interface EOEntity (EOEntityRelationshipPrivate) @interface EOEntity (EOEntityRelationshipPrivate)
- (EORelationship*) _inverseRelationshipPathForPath: (NSString*)path; - (EORelationship *)_inverseRelationshipPathForPath: (NSString *)path;
- (id) _keyMapForRelationshipPath: (NSString*)path; - (id)_keyMapForRelationshipPath: (NSString *)path;
- (id) _keyMapForIdenticalKeyRelationshipPath: (id)param0; - (id)_keyMapForIdenticalKeyRelationshipPath: (id)param0;
- (id) _mapAttribute: (id)param0 - (id)_mapAttribute: (id)param0
toDestinationAttributeInLastComponentOfRelationshipPath: (NSString*)path; toDestinationAttributeInLastComponentOfRelationshipPath: (NSString *)path;
- (BOOL) _relationshipPathIsToMany: (id)param0; - (BOOL)_relationshipPathIsToMany: (id)param0;
- (BOOL) _relationshipPathHasIdenticalKeys: (id)param0; - (BOOL)_relationshipPathHasIdenticalKeys: (id)param0;
@end @end
@interface EOEntity (EOEntitySQLExpression) @interface EOEntity (EOEntitySQLExpression)
- (id) valueForSQLExpression: (id)param0; - (id)valueForSQLExpression: (id)param0;
+ (id) valueForSQLExpression: (id)param0; + (id)valueForSQLExpression: (id)param0;
@end @end
@interface EOEntity (EOEntityPrivateXX) @interface EOEntity (EOEntityPrivateXX)
- (EOExpressionArray *) _parseDescription: (NSString *)description - (EOExpressionArray *)_parseDescription: (NSString *)description
isFormat: (BOOL)isFormat isFormat: (BOOL)isFormat
arguments: (char*)param2; arguments: (char *)param2;
- (EOExpressionArray*) _parseRelationshipPath: (NSString*)path; - (EOExpressionArray *)_parseRelationshipPath: (NSString *)path;
- (id) _parsePropertyName: (id)param0; - (id)_parsePropertyName: (id)param0;
//- (id) _newStringWithBuffer: (unsigned short*)param0 //- (id)_newStringWithBuffer: (unsigned short *)param0
// length: (unsigned int*)param1; // length: (unsigned int *)param1;
@end @end
#endif #endif

26
EOAccess/EOExpressionArray.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOExpressionArray.h EOExpressionArray.h
Copyright (C) 1996 Free Software Foundation, Inc. Copyright (C) 1996 Free Software Foundation, Inc.
@ -46,7 +46,7 @@
@protocol EOExpressionContext <NSObject> @protocol EOExpressionContext <NSObject>
- (NSString *)expressionValueForAttribute: (EOAttribute *)anAttribute; - (NSString *)expressionValueForAttribute: (EOAttribute *)attribute;
- (NSString *)expressionValueForAttributePath: (NSArray *)path; - (NSString *)expressionValueForAttributePath: (NSArray *)path;
@end @end
@ -66,15 +66,15 @@
} _flags; } _flags;
} }
+ (EOExpressionArray*)expressionArray; + (EOExpressionArray *)expressionArray;
+ (EOExpressionArray*)expressionArrayWithPrefix: (NSString *)prefix + (EOExpressionArray *)expressionArrayWithPrefix: (NSString *)prefix
infix: (NSString *)infix infix: (NSString *)infix
suffix: (NSString *)suffix; suffix: (NSString *)suffix;
/* Initializing instances */ /* Initializing instances */
- initWithPrefix: (NSString *)prefix - (id)initWithPrefix: (NSString *)prefix
infix: (NSString *)infix infix: (NSString *)infix
suffix: (NSString *)suffix; suffix: (NSString *)suffix;
- (NSString *)prefix; - (NSString *)prefix;
- (NSString *)infix; - (NSString *)infix;
@ -85,12 +85,12 @@
- (EOAttribute *)realAttribute; - (EOAttribute *)realAttribute;
/* Accessing the components */ /* Accessing the components */
- (void)setPrefix: (NSString*)prefix; - (void)setPrefix: (NSString *)prefix;
- (void)setInfix: (NSString*)infix; - (void)setInfix: (NSString *)infix;
- (void)setSuffix: (NSString*)suffix; - (void)setSuffix: (NSString *)suffix;
/* Checking contents */ /* Checking contents */
- (BOOL)referencesObject: (id)anObject; - (BOOL)referencesObject: (id)object;
- (NSString *)expressionValueForContext: (id<EOExpressionContext>)ctx; - (NSString *)expressionValueForContext: (id<EOExpressionContext>)ctx;
@ -98,13 +98,13 @@
entity: (EOEntity *)entity entity: (EOEntity *)entity
replacePropertyReferences: (BOOL)flag;*/ replacePropertyReferences: (BOOL)flag;*/
- (NSString*)valueForSQLExpression: (EOSQLExpression *)sqlExpression; - (NSString *)valueForSQLExpression: (EOSQLExpression *)sqlExpression;
@end /* EOExpressionArray */ @end /* EOExpressionArray */
@interface NSObject (EOExpression) @interface NSObject (EOExpression)
- (NSString*)expressionValueForContext: (id<EOExpressionContext>)context; - (NSString *)expressionValueForContext: (id<EOExpressionContext>)context;
@end @end

10
EOAccess/EOJoin.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOJoin.h EOJoin.h
Copyright (C) 1996 Free Software Foundation, Inc. Copyright (C) 1996 Free Software Foundation, Inc.
@ -46,8 +46,8 @@
+ (EOJoin *)joinWithSourceAttribute: (EOAttribute *)source + (EOJoin *)joinWithSourceAttribute: (EOAttribute *)source
destinationAttribute: (EOAttribute *)destination; destinationAttribute: (EOAttribute *)destination;
- initWithSourceAttribute: (EOAttribute *)source - (id)initWithSourceAttribute: (EOAttribute *)source
destinationAttribute: (EOAttribute *)destination; destinationAttribute: (EOAttribute *)destination;
- (NSString *)description; - (NSString *)description;
@ -61,8 +61,8 @@
@interface EOJoin (EOJoinPrivate) @interface EOJoin (EOJoinPrivate)
//+ (EOJoin*)joinFromPropertyList:(id)propertyList; //+ (EOJoin *)joinFromPropertyList: (id)propertyList;
//- (void)replaceStringsWithObjectsInRelationship:(EORelationship*)entity; //- (void)replaceStringsWithObjectsInRelationship: (EORelationship *)entity;
//- (id)propertyList; //- (id)propertyList;
@end /* EOJoin (EOJoinPrivate) */ @end /* EOJoin (EOJoinPrivate) */

18
EOAccess/EOModel.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOModel.h EOModel.h
Copyright (C) 2000-2002 Free Software Foundation, Inc. Copyright (C) 2000-2002 Free Software Foundation, Inc.
@ -79,7 +79,7 @@
+ (EOModel *)model; + (EOModel *)model;
/** Getting the filename **/ /** Getting the filename **/
- (NSString*)path; - (NSString *)path;
/** Getting the name **/ /** Getting the name **/
- (NSString *)name; - (NSString *)name;
@ -87,7 +87,7 @@
- (NSString *)adaptorClassName; - (NSString *)adaptorClassName;
/** Using entities **/ /** Using entities **/
- (EOEntity *)entityNamed: (NSString*)name; - (EOEntity *)entityNamed: (NSString *)name;
- (NSArray *)entities; - (NSArray *)entities;
- (NSArray *)entityNames; - (NSArray *)entityNames;
@ -96,7 +96,7 @@
- (NSArray *)storedProcedures; - (NSArray *)storedProcedures;
/** Getting an object's entity **/ /** Getting an object's entity **/
- (EOEntity *)entityForObject: object; - (EOEntity *)entityForObject: (id)object;
/** Accessing the connection dictionary **/ /** Accessing the connection dictionary **/
- (NSDictionary *)connectionDictionary; - (NSDictionary *)connectionDictionary;
@ -105,7 +105,7 @@
- (NSDictionary *)userInfo; - (NSDictionary *)userInfo;
/** Accessing documentation comments **/ /** Accessing documentation comments **/
- (NSString*)docComment; - (NSString *)docComment;
- (EOModelGroup *)modelGroup; - (EOModelGroup *)modelGroup;
@ -116,15 +116,15 @@
@interface EOModel (EOModelFileAccess) @interface EOModel (EOModelFileAccess)
+ (EOModel *)modelWithContentsOfFile: (NSString *)path; + (EOModel *)modelWithContentsOfFile: (NSString *)path;
- initWithContentsOfFile: (NSString *)path; - (id)initWithContentsOfFile: (NSString *)path;
- (void)writeToFile: (NSString *)path; - (void)writeToFile: (NSString *)path;
@end @end
@interface EOModel (EOModelPropertyList) <EOPropertyListEncoding> @interface EOModel (EOModelPropertyList) <EOPropertyListEncoding>
- (id) initWithTableOfContentsPropertyList: (NSDictionary *)tableOfContents - (id)initWithTableOfContentsPropertyList: (NSDictionary *)tableOfContents
path: (NSString *)path; path: (NSString *)path;
- (void)encodeTableOfContentsIntoPropertyList: (NSMutableDictionary *)propertyList; - (void)encodeTableOfContentsIntoPropertyList: (NSMutableDictionary *)propertyList;
- (void)encodeIntoPropertyList: (NSMutableDictionary *)propertyList; - (void)encodeIntoPropertyList: (NSMutableDictionary *)propertyList;
@ -174,7 +174,7 @@
- (void)loadAllModelObjects; - (void)loadAllModelObjects;
/* Checking references */ /* Checking references */
- (NSArray *)referencesToProperty: property; - (NSArray *)referencesToProperty: (id)property;
- (NSArray *)externalModelsReferenced; - (NSArray *)externalModelsReferenced;
@end @end

13
EOAccess/EOModelGroup.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOModelGroup.h EOModelGroup.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -31,6 +31,8 @@
#include <EOControl/EOObjectStoreCoordinator.h> #include <EOControl/EOObjectStoreCoordinator.h>
#include <EOAccess/EODefines.h>
@class NSArray; @class NSArray;
@class NSDictionary; @class NSDictionary;
@ -79,7 +81,7 @@
- (void)addModel: (EOModel *)model; - (void)addModel: (EOModel *)model;
- (EOModel*)addModelWithFile: (NSString *)path; - (EOModel *)addModelWithFile: (NSString *)path;
- (void)removeModel: (EOModel *)model; - (void)removeModel: (EOModel *)model;
@ -97,13 +99,12 @@
- (EOFetchSpecification *)fetchSpecificationNamed: (NSString *)fetchSpecName - (EOFetchSpecification *)fetchSpecificationNamed: (NSString *)fetchSpecName
entityNamed: (NSString *)entityName; entityNamed: (NSString *)entityName;
- (EOStoredProcedure *)storedProcedureNamed: (NSString *)aName; - (EOStoredProcedure *)storedProcedureNamed: (NSString *)name;
@end @end
// Notifications: GDL2ACCESS_EXPORT NSString *EOModelAddedNotification;
extern NSString *EOModelAddedNotification; GDL2ACCESS_EXPORT NSString *EOModelInvalidatedNotification;
extern NSString *EOModelInvalidatedNotification;
@interface NSObject (EOModelGroupClassDelegation) @interface NSObject (EOModelGroupClassDelegation)

4
EOAccess/EOPropertyListEncoding.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOPropertyListEncoding.h EOPropertyListEncoding.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -41,7 +41,7 @@
@protocol EOPropertyListEncoding @protocol EOPropertyListEncoding
- initWithPropertyList: (NSDictionary *)propertyList owner: (id)owner; - (id)initWithPropertyList: (NSDictionary *)propertyList owner: (id)owner;
- (void)awakeWithPropertyList: (NSDictionary *)propertyList; - (void)awakeWithPropertyList: (NSDictionary *)propertyList;

70
EOAccess/EORelationship.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EORelationship.h EORelationship.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -99,7 +99,7 @@ typedef enum {
GCMutableArray *_componentRelationships;//Used ???? GCMutableArray *_componentRelationships;//Used ????
} }
+ (id) relationshipWithPropertyList: (NSDictionary *)propertyList + (id)relationshipWithPropertyList: (NSDictionary *)propertyList
owner: (id)owner; owner: (id)owner;
- (NSString *)name; - (NSString *)name;
@ -116,7 +116,7 @@ typedef enum {
- (BOOL)isCompound; - (BOOL)isCompound;
- (BOOL) isParentRelationship; - (BOOL)isParentRelationship;
- (NSArray *)sourceAttributes; - (NSArray *)sourceAttributes;
@ -125,7 +125,7 @@ typedef enum {
- (NSArray *)joins; - (NSArray *)joins;
- (EOJoinSemantic)joinSemantic; - (EOJoinSemantic)joinSemantic;
- (NSString*)joinSemanticString; - (NSString *)joinSemanticString;
- (NSArray *)componentRelationships; - (NSArray *)componentRelationships;
@ -152,7 +152,7 @@ typedef enum {
- (EOQualifier *)qualifierWithSourceRow: (NSDictionary *)sourceRow; - (EOQualifier *)qualifierWithSourceRow: (NSDictionary *)sourceRow;
/** Accessing documentation comments **/ /** Accessing documentation comments **/
- (NSString*)docComment; - (NSString *)docComment;
@end @end
@ -163,7 +163,7 @@ typedef enum {
- (void)setEntity: (EOEntity *)entity; - (void)setEntity: (EOEntity *)entity;
- (void)setToMany: (BOOL)yn; - (void)setToMany: (BOOL)yn;
- (void)setPropagatesPrimaryKey: (BOOL)yn; - (void)setPropagatesPrimaryKey: (BOOL)yn;
- (void)setIsBidirectional:(BOOL)yn; - (void)setIsBidirectional: (BOOL)yn;
- (void)setOwnsDestination: (BOOL)yn; - (void)setOwnsDestination: (BOOL)yn;
- (void)addJoin: (EOJoin *)join; - (void)addJoin: (EOJoin *)join;
- (void)removeJoin: (EOJoin *)join; - (void)removeJoin: (EOJoin *)join;
@ -188,8 +188,8 @@ typedef enum {
@interface EORelationship (EORelationshipPrivate) @interface EORelationship (EORelationshipPrivate)
/*+ (EORelationship*)relationshipFromPropertyList: (id)propertyList /*+ (EORelationship *)relationshipFromPropertyList: (id)propertyList
model: (EOModel*)model; model: (EOModel *)model;
- (void)replaceStringsWithObjects; - (void)replaceStringsWithObjects;
- (void)initFlattenedRelationship; - (void)initFlattenedRelationship;
@ -197,42 +197,42 @@ typedef enum {
- (void)setCreateMutableObjects: (BOOL)flag; - (void)setCreateMutableObjects: (BOOL)flag;
- (BOOL)createsMutableObjects; - (BOOL)createsMutableObjects;
- (void)setInverseRelationship: (EORelationship*)relationship; - (void)setInverseRelationship: (EORelationship *)relationship;
@end /* EORelationship (EORelationshipPrivate) */ @end /* EORelationship (EORelationshipPrivate) */
@interface EORelationship (EORelationshipXX) @interface EORelationship (EORelationshipXX)
- (NSArray*) _intermediateAttributes; - (NSArray *)_intermediateAttributes;
- (EORelationship*) lastRelationship; - (EORelationship *)lastRelationship;
- (EORelationship*) firstRelationship; - (EORelationship *)firstRelationship;
- (id) intermediateEntity; - (id)intermediateEntity;
- (BOOL) isMultiHop; - (BOOL)isMultiHop;
- (void) _setSourceToDestinationKeyMap: (id)param0; - (void)_setSourceToDestinationKeyMap: (id)param0;
- (id) qualifierForDBSnapshot: (id)param0; - (id)qualifierForDBSnapshot: (id)param0;
- (id) primaryKeyForTargetRowFromSourceDBSnapshot: (id)param0; - (id)primaryKeyForTargetRowFromSourceDBSnapshot: (id)param0;
- (NSString*)relationshipPath; - (NSString *)relationshipPath;
- (BOOL)isToManyToOne; - (BOOL)isToManyToOne;
- (NSDictionary*)_sourceToDestinationKeyMap; - (NSDictionary *)_sourceToDestinationKeyMap;
- (BOOL)foreignKeyInDestination; - (BOOL)foreignKeyInDestination;
@end @end
@interface EORelationship (EORelationshipPrivate2) @interface EORelationship (EORelationshipPrivate2)
- (BOOL) isPropagatesPrimaryKeyPossible; - (BOOL)isPropagatesPrimaryKeyPossible;
- (id) qualifierOmittingAuxiliaryQualifierWithSourceRow: (id)param0; - (id)qualifierOmittingAuxiliaryQualifierWithSourceRow: (id)param0;
- (id) auxiliaryQualifier; - (id)auxiliaryQualifier;
- (void) setAuxiliaryQualifier: (id)param0; - (void)setAuxiliaryQualifier: (id)param0;
- (id) _foreignKeyForSourceRow: (NSDictionary*)row; - (id)_foreignKeyForSourceRow: (NSDictionary *)row;
- (EOMKKDSubsetMapping*) _sourceRowToForeignKeyMapping; - (EOMKKDSubsetMapping *)_sourceRowToForeignKeyMapping;
- (NSArray*) _sourceAttributeNames; - (NSArray *)_sourceAttributeNames;
- (EOJoin*) joinForAttribute: (EOAttribute*)attribute; - (EOJoin *)joinForAttribute: (EOAttribute *)attribute;
- (void) _flushCache; - (void)_flushCache;
- (EOExpressionArray*) _definitionArray; - (EOExpressionArray *)_definitionArray;
- (NSString*) _stringFromDeleteRule: (EODeleteRule)deleteRule; - (NSString *)_stringFromDeleteRule: (EODeleteRule)deleteRule;
- (EODeleteRule) _deleteRuleFromString: (NSString*)deleteRuleString; - (EODeleteRule)_deleteRuleFromString: (NSString *)deleteRuleString;
- (NSDictionary*) _rightSideKeyMap; - (NSDictionary *)_rightSideKeyMap;
- (NSDictionary*) _leftSideKeyMap; - (NSDictionary *)_leftSideKeyMap;
- (EORelationship*)_substitutionRelationshipForRow: (NSDictionary*)row; - (EORelationship *)_substitutionRelationshipForRow: (NSDictionary *)row;
- (void) _joinsChanged; - (void)_joinsChanged;
@end @end
#endif /* __EORelationship_h__ */ #endif /* __EORelationship_h__ */

23
EOAccess/EOSQLExpression.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOSQLExpression.h EOSQLExpression.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -91,8 +91,10 @@ GDL2ACCESS_EXPORT NSString *EOBindVariableColumnKey;
qualifier: (EOQualifier *)qualifier qualifier: (EOQualifier *)qualifier
entity: (EOEntity *)entity; 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 + (EOSQLExpression *)deleteStatementWithQualifier: (EOQualifier *)qualifier
entity: entity; entity: (id)entity;
+ (EOSQLExpression *)selectStatementForAttributes: (NSArray *)attributes + (EOSQLExpression *)selectStatementForAttributes: (NSArray *)attributes
lock: (BOOL)yn lock: (BOOL)yn
@ -101,7 +103,7 @@ GDL2ACCESS_EXPORT NSString *EOBindVariableColumnKey;
+ (id)sqlExpressionWithEntity: (EOEntity *)entity; + (id)sqlExpressionWithEntity: (EOEntity *)entity;
- initWithEntity: (EOEntity *)entity; - (id)initWithEntity: (EOEntity *)entity;
- (NSMutableDictionary *)aliasesByRelationshipPath; - (NSMutableDictionary *)aliasesByRelationshipPath;
- (EOEntity *)entity; - (EOEntity *)entity;
@ -112,7 +114,7 @@ GDL2ACCESS_EXPORT NSString *EOBindVariableColumnKey;
- (NSMutableString *)orderByString; - (NSMutableString *)orderByString;
- (NSString *)whereClauseString; - (NSString *)whereClauseString;
- (NSString *)statement; - (NSString *)statement;
- (void)setStatement:(NSString *)statement; - (void)setStatement: (NSString *)statement;
- (NSString *)lockClause; - (NSString *)lockClause;
- (NSString *)tableListWithRootEntity: (EOEntity *)entity; - (NSString *)tableListWithRootEntity: (EOEntity *)entity;
@ -175,9 +177,7 @@ GDL2ACCESS_EXPORT NSString *EOBindVariableColumnKey;
value: (NSString *)value; value: (NSString *)value;
+ (NSString *)formatStringValue: (NSString *)string; + (NSString *)formatStringValue: (NSString *)string;
+ (NSString *)formatValue: (id)value forAttribute: (EOAttribute *)attribute; + (NSString *)formatValue: (id)value forAttribute: (EOAttribute *)attribute;
+ (NSString *)formatSQLString: (NSString *)sqlString + (NSString *)formatSQLString: (NSString *)sqlString
format: (NSString *)format; format: (NSString *)format;
@ -199,15 +199,10 @@ GDL2ACCESS_EXPORT NSString *EOBindVariableColumnKey;
- (BOOL)useAliases; - (BOOL)useAliases;
- (NSString *)sqlStringForSchemaObjectName: (NSString *)name; - (NSString *)sqlStringForSchemaObjectName: (NSString *)name;
- (NSString *)sqlStringForAttributeNamed: (NSString *)name; - (NSString *)sqlStringForAttributeNamed: (NSString *)name;
- (NSString *)sqlStringForSelector: (SEL)selector value: (id)value; - (NSString *)sqlStringForSelector: (SEL)selector value: (id)value;
- (NSString *)sqlStringForValue: (id)value attributeNamed: (NSString *)string; - (NSString *)sqlStringForValue: (id)value attributeNamed: (NSString *)string;
- (NSString *)sqlStringForAttribute: (EOAttribute *)attribute;
- (NSString *)sqlStringForAttribute: (EOAttribute *)anAttribute;
- (NSString *)sqlStringForAttributePath: (NSArray *)path; - (NSString *)sqlStringForAttributePath: (NSArray *)path;
- (void)appendItem: (NSString *)itemString - (void)appendItem: (NSString *)itemString
@ -219,17 +214,15 @@ GDL2ACCESS_EXPORT NSString *EOBindVariableColumnKey;
- (NSMutableDictionary *)bindVariableDictionaryForAttribute: (EOAttribute *)attribute - (NSMutableDictionary *)bindVariableDictionaryForAttribute: (EOAttribute *)attribute
value: value; value: (id)value;
- (BOOL)shouldUseBindVariableForAttribute: (EOAttribute *)att; - (BOOL)shouldUseBindVariableForAttribute: (EOAttribute *)att;
- (BOOL)mustUseBindVariableForAttribute: (EOAttribute *)att; - (BOOL)mustUseBindVariableForAttribute: (EOAttribute *)att;
+ (BOOL)useBindVariables; + (BOOL)useBindVariables;
+ (void)setUseBindVariables: (BOOL)yn; + (void)setUseBindVariables: (BOOL)yn;
- (NSArray *)bindVariableDictionaries; - (NSArray *)bindVariableDictionaries;
- (void)addBindVariableDictionary: (NSMutableDictionary *)binding; - (void)addBindVariableDictionary: (NSMutableDictionary *)binding;
@end @end

18
EOAccess/EOSQLExpressionPriv.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOSQLExpression.h EOSQLExpression.h
Copyright (C) 2002 Free Software Foundation, Inc. Copyright (C) 2002 Free Software Foundation, Inc.
@ -37,15 +37,15 @@
@interface EOSQLExpression (EOSQLExpressionPrivate) @interface EOSQLExpression (EOSQLExpressionPrivate)
- (EOEntity *)_rootEntityForExpression; - (EOEntity *)_rootEntityForExpression;
- (id) _aliasForRelationshipPath: (id)param0; - (id)_aliasForRelationshipPath: (id)param0;
- (id) _flattenRelPath: (id)param0 - (id)_flattenRelPath: (id)param0
entity: (id)param1; entity: (id)param1;
- (NSString*) _sqlStringForJoinSemantic: (EOJoinSemantic)joinSemantic - (NSString *)_sqlStringForJoinSemantic: (EOJoinSemantic)joinSemantic
matchSemantic: (int)param1; matchSemantic: (int)param1;
- (id) _aliasForRelatedAttribute: (id)param0 - (id)_aliasForRelatedAttribute: (id)param0
relationshipPath: (id)param1; relationshipPath: (id)param1;
- (id) _entityForRelationshipPath: (id)param0 - (id)_entityForRelationshipPath: (id)param0
origin: (id)param1; origin: (id)param1;
@end @end

11
EOAccess/EOSQLQualifier.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOSQLQualifier.h EOSQLQualifier.h
Copyright (C) 2000-2002 Free Software Foundation, Inc. Copyright (C) 2000-2002 Free Software Foundation, Inc.
@ -51,7 +51,8 @@
- (NSString *)sqlStringForSQLExpression: (EOSQLExpression *)sqlExpression; - (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; - (EOQualifier *)schemaBasedQualifierWithRootEntity: (EOEntity *)entity;
@end @end
@ -69,9 +70,6 @@
@end @end
//
// Finally, declare the EOSQLQualifier class.
//
@interface EOSQLQualifier : EOQualifier <EOQualifierSQLGeneration> @interface EOSQLQualifier : EOQualifier <EOQualifierSQLGeneration>
{ {
EOEntity *_entity; EOEntity *_entity;
@ -87,12 +85,11 @@
- (id)initWithEntity: (EOEntity *)entity - (id)initWithEntity: (EOEntity *)entity
qualifierFormat: (NSString *)qualifierFormat, ...; qualifierFormat: (NSString *)qualifierFormat, ...;
// This is the designated initializer for EOSQLQualifier.
@end @end
@interface NSString (NSStringSQLExpression) @interface NSString (NSStringSQLExpression)
- (NSString *) valueForSQLExpression: (EOSQLExpression *)sqlExpression; - (NSString *)valueForSQLExpression: (EOSQLExpression *)sqlExpression;
@end @end
#endif #endif

14
EOAccess/EOStoredProcedure.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOStoredProcedure.h EOStoredProcedure.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -54,7 +54,7 @@
+ (EOStoredProcedure *)storedProcedureWithPropertyList: (NSDictionary *)propertyList + (EOStoredProcedure *)storedProcedureWithPropertyList: (NSDictionary *)propertyList
owner: (id)owner; owner: (id)owner;
- (EOStoredProcedure *)initWithName:(NSString *)name; - (EOStoredProcedure *)initWithName: (NSString *)name;
- (NSString *)name; - (NSString *)name;
@ -66,14 +66,14 @@
- (NSDictionary *)userInfo; - (NSDictionary *)userInfo;
- (void)setName:(NSString *)name; - (void)setName: (NSString *)name;
- (void)setExternalName:(NSString *)name; - (void)setExternalName: (NSString *)name;
- (void)setArguments:(NSArray *)arguments; - (void)setArguments: (NSArray *)arguments;
- (void)setUserInfo:(NSDictionary *)dictionary; - (void)setUserInfo: (NSDictionary *)dictionary;
@end @end
@interface EOStoredProcedure(EOModelBeautifier) @interface EOStoredProcedure (EOModelBeautifier)
- (void)beautifyName; - (void)beautifyName;

106
EOAccess/EOUtilities.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOUtilities.h EOUtilities.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -49,67 +49,67 @@ GDL2ACCESS_EXPORT NSString *EOMoreThanOneException;
@interface EOEditingContext (EOUtilities) @interface EOEditingContext (EOUtilities)
- (NSArray*)objectsForEntityNamed: (NSString*)name; - (NSArray *)objectsForEntityNamed: (NSString *)name;
- (NSArray*)objectsOfClass: (Class)classObject; - (NSArray *)objectsOfClass: (Class)classObject;
- (NSArray*)objectsWithFetchSpecificationNamed: (NSString*)fetchSpecName - (NSArray *)objectsWithFetchSpecificationNamed: (NSString *)fetchSpecName
entityNamed: (NSString*)entityName entityNamed: (NSString *)entityName
bindings: (NSDictionary*)bindings; bindings: (NSDictionary *)bindings;
- (NSArray*)objectsForEntityNamed: (NSString*)name - (NSArray *)objectsForEntityNamed: (NSString *)name
qualifierFormat: (NSString*)format, ...; qualifierFormat: (NSString *)format, ...;
- (NSArray*)objectsMatchingValue: (id)value - (NSArray *)objectsMatchingValue: (id)value
forKey: (NSString*)key forKey: (NSString *)key
entityNamed: (NSString*)name; entityNamed: (NSString *)name;
- (NSArray*)objectsMatchingValues: (NSDictionary*)values - (NSArray *)objectsMatchingValues: (NSDictionary *)values
entityNamed: (NSString*)name; entityNamed: (NSString *)name;
- (id)objectWithFetchSpecificationNamed: (NSString*)fetchSpecName - (id)objectWithFetchSpecificationNamed: (NSString *)fetchSpecName
entityNamed: (NSString*)entityName entityNamed: (NSString *)entityName
bindings: (NSDictionary*)bindings; bindings: (NSDictionary *)bindings;
- (id)objectForEntityNamed: (NSString*)name - (id)objectForEntityNamed: (NSString *)name
qualifierFormat: (NSString*)format, ...; qualifierFormat: (NSString *)format, ...;
- (id)objectMatchingValue: (id)value - (id)objectMatchingValue: (id)value
forKey: (NSString*)key forKey: (NSString *)key
entityNamed: (NSString*)name; entityNamed: (NSString *)name;
- (id)objectMatchingValues: (NSDictionary*)values - (id)objectMatchingValues: (NSDictionary *)values
entityNamed: (NSString*)name; entityNamed: (NSString *)name;
- (id)objectWithPrimaryKeyValue: (id)value - (id)objectWithPrimaryKeyValue: (id)value
entityNamed: (NSString*)name; entityNamed: (NSString *)name;
- (id)objectWithPrimaryKey: (NSDictionary*)pkDict - (id)objectWithPrimaryKey: (NSDictionary *)pkDict
entityNamed: (NSString*)name; entityNamed: (NSString *)name;
- (NSArray*)rawRowsForEntityNamed: (NSString*)name - (NSArray *)rawRowsForEntityNamed: (NSString *)name
qualifierFormat: (NSString*)format, ...; qualifierFormat: (NSString *)format, ...;
- (NSArray*)rawRowsMatchingValue: (id)value - (NSArray *)rawRowsMatchingValue: (id)value
forKey: (NSString*)key forKey: (NSString *)key
entityNamed: (NSString*)name; entityNamed: (NSString *)name;
- (NSArray*)rawRowsMatchingValues: (NSDictionary*)values - (NSArray *)rawRowsMatchingValues: (NSDictionary *)values
entityNamed: (NSString*)name; entityNamed: (NSString *)name;
- (NSArray*)rawRowsWithSQL: (NSString*)sqlString - (NSArray *)rawRowsWithSQL: (NSString *)sqlString
modelNamed: (NSString*)name; modelNamed: (NSString *)name;
- (NSArray*)rawRowsWithStoredProcedureNamed: (NSString*)name - (NSArray *)rawRowsWithStoredProcedureNamed: (NSString *)name
arguments: (NSDictionary*)args; arguments: (NSDictionary *)args;
- (NSDictionary*)executeStoredProcedureNamed: (NSString*)name - (NSDictionary *)executeStoredProcedureNamed: (NSString *)name
arguments: (NSDictionary*)args; arguments: (NSDictionary *)args;
- (id)objectFromRawRow: (NSDictionary*)row - (id)objectFromRawRow: (NSDictionary *)row
entityNamed: (NSString*)name; entityNamed: (NSString *)name;
- (EODatabaseContext*)databaseContextForModelNamed: (NSString*)name; - (EODatabaseContext *)databaseContextForModelNamed: (NSString *)name;
- (void)connectWithModelNamed: (NSString*)name - (void)connectWithModelNamed: (NSString *)name
connectionDictionaryOverrides: (NSDictionary*)overrides; connectionDictionaryOverrides: (NSDictionary *)overrides;
- (id)createAndInsertInstanceOfEntityNamed: (NSString *)entityName; - (id)createAndInsertInstanceOfEntityNamed: (NSString *)entityName;
- (NSDictionary*)primaryKeyForObject: (id)object; - (NSDictionary *)primaryKeyForObject: (id)object;
- (NSDictionary*)destinationKeyForSourceObject: (id)object - (NSDictionary *)destinationKeyForSourceObject: (id)object
relationshipNamed: (NSString*)name; relationshipNamed: (NSString *)name;
- (id)localInstanceOfObject: (id)object; - (id)localInstanceOfObject: (id)object;
- (NSArray*)localInstancesOfObjects: (NSArray*)objects; - (NSArray *)localInstancesOfObjects: (NSArray *)objects;
- (EOModelGroup*)modelGroup; - (EOModelGroup *)modelGroup;
- (EOEntity*)entityNamed: (NSString*)name; - (EOEntity *)entityNamed: (NSString *)name;
- (EOEntity*)entityForClass: (Class)classObject; - (EOEntity *)entityForClass: (Class)classObject;
- (EOEntity*)entityForObject: (id)obj; - (EOEntity *)entityForObject: (id)obj;
@end @end
@ -124,8 +124,8 @@ connectionDictionaryOverrides: (NSDictionary*)overrides;
@interface EOObjectStoreCoordinator (EOModelGroup) @interface EOObjectStoreCoordinator (EOModelGroup)
- (id) modelGroup; - (id)modelGroup;
- (void) setModelGroup: (EOModelGroup*)modelGroup; - (void)setModelGroup: (EOModelGroup *)modelGroup;
@end @end

8
EOControl/EOArrayDataSource.h
View file

@ -1,4 +1,4 @@
/** /* -*-objc-*-
EOArrayDataSource.h EOArrayDataSource.h
Copyright (C) 2003 Free Software Foundation, Inc. Copyright (C) 2003 Free Software Foundation, Inc.
@ -42,10 +42,10 @@
EOClassDescription *_classDescription; EOClassDescription *_classDescription;
} }
- (id) initWithClassDescription: (EOClassDescription *)classDescription - (id)initWithClassDescription: (EOClassDescription *)classDescription
editingContext: (EOEditingContext *)context; editingContext: (EOEditingContext *)context;
- (void) setArray: (NSArray *)array; - (void)setArray: (NSArray *)array;
@end @end

68
EOControl/EOCheapArray.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOCheapArray.h EOCheapArray.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -43,17 +43,17 @@
unsigned int _refcount; unsigned int _refcount;
} }
- (id) initWithArray: (id)array; - (id)initWithArray: (id)array;
- (id) initWithObjects: (id*)objects - (id)initWithObjects: (id *)objects
count: (unsigned int)count; count: (unsigned int)count;
- (void) dealloc; - (void)dealloc;
- (void) release; - (void)release;
- (unsigned int) retainCount; - (unsigned int)retainCount;
- (id) retain; - (id)retain;
- (id) objectAtIndex: (unsigned int)index; - (id)objectAtIndex: (unsigned int)index;
//- (id) copyWithZone: (NSZone*)zone; //- (id)copyWithZone: (NSZone *)zone;
- (unsigned int) count; - (unsigned int)count;
//- (BOOL) containsObject: (id)obejct; //- (BOOL)containsObject: (id)obejct;
@end @end
@ -67,28 +67,28 @@
id _immutableCopy; id _immutableCopy;
} }
- (id) initWithCapacity: (unsigned int)capacity; - (id)initWithCapacity: (unsigned int)capacity;
- (id) initWithObjects: (id*)objects - (id)initWithObjects: (id *)objects
count: (unsigned int)count; count: (unsigned int)count;
- (id) initWithArray: (NSArray*)array; - (id)initWithArray: (NSArray *)array;
- (void) dealloc; - (void)dealloc;
- (id) shallowCopy; - (id)shallowCopy;
- (void) _setCopy: (id)param0; - (void)_setCopy: (id)param0;
- (void) _mutate; - (void)_mutate;
- (unsigned int) count; - (unsigned int)count;
- (id) objectAtIndex: (unsigned int)index; - (id)objectAtIndex: (unsigned int)index;
- (void) addObject: (id)object; - (void)addObject: (id)object;
- (void) insertObject: (id)object - (void)insertObject: (id)object
atIndex: (unsigned int)index; atIndex: (unsigned int)index;
- (void) removeLastObject; - (void)removeLastObject;
- (void) removeObjectAtIndex: (unsigned int)index; - (void)removeObjectAtIndex: (unsigned int)index;
- (void) replaceObjectAtIndex: (unsigned int)index - (void)replaceObjectAtIndex: (unsigned int)index
withObject: (id)object; withObject: (id)object;
//- (BOOL) containsObject: (id)object; //- (BOOL)containsObject: (id)object;
//- (unsigned int) indexOfObjectIdenticalTo: (id)object; //- (unsigned int)indexOfObjectIdenticalTo: (id)object;
//- (void) removeAllObjects; //- (void)removeAllObjects;
- (void) exchangeObjectAtIndex: (unsigned int)index1 - (void)exchangeObjectAtIndex: (unsigned int)index1
withObjectAtIndex: (unsigned int)index2; withObjectAtIndex: (unsigned int)index2;
@end @end

54
EOControl/EOClassDescription.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOClassDescription.h EOClassDescription.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -35,6 +35,7 @@
#include <Foundation/Foundation.h> #include <Foundation/Foundation.h>
#endif #endif
#include <EOControl/EODefines.h>
@class NSDictionary; @class NSDictionary;
@class NSFormatter; @class NSFormatter;
@ -65,7 +66,9 @@ typedef enum
+ (void)setClassDelegate: (id)delegate; + (void)setClassDelegate: (id)delegate;
+ (id)classDelegate; + (id)classDelegate;
// Must be implemented by subclasses. /*
* Subclass responsibility.
*/
- (NSString *)entityName; - (NSString *)entityName;
- (id)createInstanceWithEditingContext: (EOEditingContext *)editingContext - (id)createInstanceWithEditingContext: (EOEditingContext *)editingContext
@ -86,10 +89,10 @@ fromFetchInEditingContext: (EOEditingContext *)editingContext;
- (NSArray *)toManyRelationshipKeys; - (NSArray *)toManyRelationshipKeys;
/** returns a new autoreleased mutable dictionary to store properties **/ /** returns a new autoreleased mutable dictionary to store properties **/
- (NSMutableDictionary*) dictionaryForInstanceProperties; - (NSMutableDictionary *)dictionaryForInstanceProperties;
- (EORelationship *)relationshipNamed: (NSString *)relationshipName; - (EORelationship *)relationshipNamed: (NSString *)relationshipName;
- (EORelationship *)anyRelationshipNamed: (NSString *)relationshipNamed; - (EORelationship *)anyRelationshipNamed: (NSString *)relationshipName;
- (NSString *)inverseForRelationshipKey: (NSString *)relationshipKey; - (NSString *)inverseForRelationshipKey: (NSString *)relationshipKey;
@ -103,7 +106,7 @@ fromFetchInEditingContext: (EOEditingContext *)editingContext;
- (NSString *)displayNameForKey: (NSString *)key; - (NSString *)displayNameForKey: (NSString *)key;
- (NSString *)userPresentableDescriptionForObject: (id)anObject; - (NSString *)userPresentableDescriptionForObject: (id)object;
- (NSException *)validateValue: (id *)valueP forKey: (NSString *)key; - (NSException *)validateValue: (id *)valueP forKey: (NSString *)key;
@ -116,9 +119,9 @@ fromFetchInEditingContext: (EOEditingContext *)editingContext;
@interface NSObject (EOInitialization) @interface NSObject (EOInitialization)
- initWithEditingContext: (EOEditingContext *)ec - (id)initWithEditingContext: (EOEditingContext *)editingContext
classDescription: (EOClassDescription *)classDesc classDescription: (EOClassDescription *)classDescription
globalID: (EOGlobalID *)globalID; globalID: (EOGlobalID *)globalID;
@end @end
@ -149,12 +152,9 @@ fromFetchInEditingContext: (EOEditingContext *)editingContext;
@end @end
// Notifications: GDL2CONTROL_EXPORT NSString *EOClassDescriptionNeededNotification;
GDL2CONTROL_EXPORT NSString *EOClassDescriptionNeededForClassNotification;
extern NSString *EOClassDescriptionNeededNotification; GDL2CONTROL_EXPORT NSString *EOClassDescriptionNeededForEntityNameNotification;
extern NSString *EOClassDescriptionNeededForClassNotification;
extern NSString *EOClassDescriptionNeededForEntityNameNotification;
@interface NSArray (EOShallowCopy) @interface NSArray (EOShallowCopy)
@ -187,21 +187,25 @@ extern NSString *EOClassDescriptionNeededForEntityNameNotification;
@interface NSObject (EOKeyRelationshipManipulation) @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)addObject: (id)object
- (void)removeObject: object toBothSidesOfRelationshipWithKey: (NSString *)key;
- (void)removeObject: (id)object
fromBothSidesOfRelationshipWithKey: (NSString *)key; fromBothSidesOfRelationshipWithKey: (NSString *)key;
@end @end
// Validation exceptions (with name EOValidationException) /*
extern NSString *EOValidationException; * Validation exceptions (with name EOValidationException)
extern NSString *EOAdditionalExceptionsKey; */
extern NSString *EOValidatedObjectUserInfoKey; GDL2CONTROL_EXPORT NSString *EOValidationException;
extern NSString *EOValidatedPropertyUserInfoKey; GDL2CONTROL_EXPORT NSString *EOAdditionalExceptionsKey;
GDL2CONTROL_EXPORT NSString *EOValidatedObjectUserInfoKey;
GDL2CONTROL_EXPORT NSString *EOValidatedPropertyUserInfoKey;
@interface NSException (EOValidationError) @interface NSException (EOValidationError)
@ -214,7 +218,7 @@ extern NSString *EOValidatedPropertyUserInfoKey;
@interface NSObject (EOClassDescriptionClassDelegate) @interface NSObject (EOClassDescriptionClassDelegate)
- (BOOL)shouldPropagateDeleteForObject: (id)object - (BOOL)shouldPropagateDeleteForObject: (id)object
inEditingContext: (EOEditingContext *)ec inEditingContext: (EOEditingContext *)editingContext
forRelationshipKey: (NSString *)key; forRelationshipKey: (NSString *)key;
@end @end
@ -230,7 +234,7 @@ extern NSString *EOValidatedPropertyUserInfoKey;
@end @end
@interface NSObject (_EOEditingContext) @interface NSObject (_EOEditingContext)
- (EOEditingContext*)editingContext; - (EOEditingContext *)editingContext;
@end @end
#endif #endif

13
EOControl/EODataSource.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EODataSource.h EODataSource.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -44,23 +44,18 @@
@interface EODataSource : NSObject @interface EODataSource : NSObject
- (id)createObject; - (id)createObject;
- (void)insertObject: (id)object;
- (void)insertObject: object; - (void)deleteObject: (id)object;
- (void)deleteObject: object;
- (NSArray *)fetchObjects; - (NSArray *)fetchObjects;
- (EOEditingContext *)editingContext; - (EOEditingContext *)editingContext;
- (void)qualifyWithRelationshipKey: (NSString *)key ofObject: sourceObject; - (void)qualifyWithRelationshipKey: (NSString *)key ofObject: (id)sourceObject;
- (EODataSource *)dataSourceQualifiedByKey: (NSString *)key; - (EODataSource *)dataSourceQualifiedByKey: (NSString *)key;
- (EOClassDescription *)classDescriptionForObjects; - (EOClassDescription *)classDescriptionForObjects;
- (NSArray *)qualifierBindingKeys; - (NSArray *)qualifierBindingKeys;
- (void)setQualifierBindings: (NSDictionary *)bindings; - (void)setQualifierBindings: (NSDictionary *)bindings;
- (NSDictionary *)qualifierBindings; - (NSDictionary *)qualifierBindings;

5
EOControl/EODebug.h
View file

@ -1,4 +1,5 @@
/* debug.h - debug /* -*-objc-*-
debug.h - debug
Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@sbuilders.com> Written by: Manuel Guesdon <mguesdon@sbuilders.com>
@ -273,7 +274,7 @@ GDL2CONTROL_EXPORT void EOFLogAssertGood_(const char* file,int line,
#endif #endif
#ifndef NSEmitTODO #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
#endif // _EODebug_h__ #endif // _EODebug_h__

2
EOControl/EODefines.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EODefines.h EODefines.h
Copyright (C) 2003 Free Software Foundation, Inc. Copyright (C) 2003 Free Software Foundation, Inc.

20
EOControl/EODeprecated.h
View file

@ -1,4 +1,4 @@
/** /** -*-objc-*-
EODeprecated.h EODeprecated.h
Copyright (C) 2003 Free Software Foundation, Inc. Copyright (C) 2003 Free Software Foundation, Inc.
@ -39,32 +39,32 @@
@interface NSObject (EODeprecated) @interface NSObject (EODeprecated)
/** Deprecated. GDL2 doesn't cache key bindungs.*/ /** Deprecated. GDL2 doesn't cache key bindungs.*/
+ (void) flushClassKeyBindings; + (void)flushClassKeyBindings;
@end @end
@interface EOClassDescription (EODeprecated) @interface EOClassDescription (EODeprecated)
/** Deprecated. Use +setClassDelegate. */ /** Deprecated. Use +setClassDelegate. */
+ (void) setDelegate:(id)delegate; + (void)setDelegate: (id)delegate;
/** Deprecated. Use +classDelegate. */ /** Deprecated. Use +classDelegate. */
+ (id) delegate; + (id)delegate;
@end @end
/** Deprecated. Use NSUndoManager. */ /** Deprecated. Use NSUndoManager. */
@interface EOUndoManager : NSUndoManager @interface EOUndoManager : NSUndoManager
/** Deprecated. Use -removeAllActionsWithTarget:. */ /** Deprecated. Use -removeAllActionsWithTarget:. */
- (void) forgetAllWithTarget: (id)param0; - (void)forgetAllWithTarget: (id)param0;
/** Deprecated. Use -removeAllActionsWithTarget:. */ /** Deprecated. Use -removeAllActionsWithTarget:. */
- (void) forgetAll; - (void)forgetAll;
/** Deprecated. Use -registerUndoWithTarget:selector:object:. */ /** Deprecated. Use -registerUndoWithTarget:selector:object:. */
- (void) registerUndoWithTarget: (id)param0 - (void)registerUndoWithTarget: (id)param0
selector: (SEL)param1 selector: (SEL)param1
arg: (id)param2; arg: (id)param2;
/** Deprecated. Use -enableUndoRegistration. */ /** Deprecated. Use -enableUndoRegistration. */
- (void) reenableUndoRegistration; - (void)reenableUndoRegistration;
@end @end

18
EOControl/EODetailDataSource.h
View file

@ -1,5 +1,5 @@
/* /* -*-objc-*-
EODetailDataSource.m EODetailDataSource.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -44,13 +44,13 @@
+ (EODetailDataSource *)detailDataSourceWithMasterDataSource: (EODataSource *)master + (EODetailDataSource *)detailDataSourceWithMasterDataSource: (EODataSource *)master
detailKey: (NSString *)detailKey; detailKey: (NSString *)detailKey;
- initWithMasterClassDescription: (EOClassDescription *)masterClassDescription - (id)initWithMasterClassDescription: (EOClassDescription *)masterClassDescription
detailKey: (NSString *)detailKey; detailKey: (NSString *)detailKey;
- initWithMasterDataSource: (EODataSource *)master - (id)initWithMasterDataSource: (EODataSource *)master
detailKey: (NSString *)detailKey; detailKey: (NSString *)detailKey;
- (id) initWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver; - (id)initWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver;
- (EODataSource *)masterDataSource; - (EODataSource *)masterDataSource;
@ -59,9 +59,9 @@
- (EOClassDescription *)classDescriptionForObjects; - (EOClassDescription *)classDescriptionForObjects;
- (void)qualifyWithRelationshipKey: (NSString *)key - (void)qualifyWithRelationshipKey: (NSString *)key
ofObject: masterObject; ofObject: (id)masterObject;
- (NSString *)detailKey; - (NSString *)detailKey;
- (void)setDetailKey:(NSString *)detailKey; - (void)setDetailKey: (NSString *)detailKey;
- (id)masterObject; - (id)masterObject;
- (EOEditingContext *)editingContext; - (EOEditingContext *)editingContext;

96
EOControl/EOEditingContext.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOEditingContext.h EOEditingContext.h
Copyright (C) 2000-2002 Free Software Foundation, Inc. Copyright (C) 2000-2002 Free Software Foundation, Inc.
@ -37,6 +37,8 @@
#include <EOControl/EOObjectStore.h> #include <EOControl/EOObjectStore.h>
#include <EOControl/EOObserver.h> #include <EOControl/EOObserver.h>
#include <EOControl/EODefines.h>
@class NSArray; @class NSArray;
@class NSMutableArray; @class NSMutableArray;
@ -70,9 +72,9 @@
unsigned registeredForCallback:1; unsigned registeredForCallback:1;
unsigned propagatesDeletesAtEndOfEvent:1; unsigned propagatesDeletesAtEndOfEvent:1;
unsigned ignoreChangeNotification:1; unsigned ignoreChangeNotification:1;
unsigned exhaustiveValidation:1;// unsigned stopsValidation:1; unsigned exhaustiveValidation:1; /* unsigned stopsValidation:1; */
unsigned autoLocking:1; unsigned autoLocking:1;
unsigned processingChanges:1;// unsigned savingChanges:1; unsigned processingChanges:1; /* unsigned savingChanges:1; */
unsigned skipInvalidateOnDealloc:1; unsigned skipInvalidateOnDealloc:1;
unsigned useCommittedSnapshot:1; unsigned useCommittedSnapshot:1;
unsigned registeredUndoTransactionID:1; unsigned registeredUndoTransactionID:1;
@ -100,30 +102,27 @@
+ (void)setInstancesRetainRegisteredObjects: (BOOL)flag; + (void)setInstancesRetainRegisteredObjects: (BOOL)flag;
+ (BOOL)instancesRetainRegisteredObjects; + (BOOL)instancesRetainRegisteredObjects;
- initWithParentObjectStore:(EOObjectStore *)parentObjectStore; - (id)initWithParentObjectStore: (EOObjectStore *)parentObjectStore;
- (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpecification; - (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpecification;
- (void)insertObject: (id)object; - (void)insertObject: (id)object;
- (void)insertObject: object - (void)insertObject: (id)object
withGlobalID: (EOGlobalID *)gid; withGlobalID: (EOGlobalID *)gid;
- (void)_insertObject: (id)object - (void)_insertObject: (id)object
withGlobalID: (EOGlobalID *)gid; withGlobalID: (EOGlobalID *)gid;
-(void)setLevelsOfUndo:(int)levels; -(void)setLevelsOfUndo: (int)levels;
- (void)deleteObject: (id)object; - (void)deleteObject: (id)object;
- (void)lockObject: (id)object; - (void)lockObject: (id)object;
- (BOOL)hasChanges; - (BOOL)hasChanges;
- (void)saveChanges; - (void)saveChanges;
- (void)revert; - (void)revert;
- (id)objectForGlobalID: (EOGlobalID *)globalID; - (id)objectForGlobalID: (EOGlobalID *)globalID;
- (EOGlobalID *)globalIDForObject: object; - (EOGlobalID *)globalIDForObject: (id)object;
- (void)setDelegate: (id)delegate; - (void)setDelegate: (id)delegate;
- (id)delegate; - (id)delegate;
@ -136,7 +135,7 @@
- (void)setUndoManager: (NSUndoManager *)undoManager; - (void)setUndoManager: (NSUndoManager *)undoManager;
- (NSUndoManager *)undoManager; - (NSUndoManager *)undoManager;
- (void) _observeUndoManagerNotifications; - (void)_observeUndoManagerNotifications;
- (void)objectWillChange: (id)object; - (void)objectWillChange: (id)object;
@ -145,7 +144,7 @@
- (void)forgetObject: (id)object; - (void)forgetObject: (id)object;
- (void) registerUndoForModifiedObject: (id)object; - (void)registerUndoForModifiedObject: (id)object;
- (NSArray *)registeredObjects; - (NSArray *)registeredObjects;
@ -153,19 +152,19 @@
- (NSArray *)insertedObjects; - (NSArray *)insertedObjects;
- (NSArray *)deletedObjects; - (NSArray *)deletedObjects;
- (void) _processDeletedObjects; - (void)_processDeletedObjects;
- (void) _processOwnedObjectsUsingChangeTable: (NSHashTable*)changeTable - (void)_processOwnedObjectsUsingChangeTable: (NSHashTable *)changeTable
deleteTable: (NSHashTable*)deleteTable; deleteTable: (NSHashTable *)deleteTable;
- (void) propagatesDeletesUsingTable: (NSHashTable*)deleteTable; - (void)propagatesDeletesUsingTable: (NSHashTable *)deleteTable;
- (void) validateDeletesUsingTable: (NSHashTable*)deleteTable; - (void)validateDeletesUsingTable: (NSHashTable *)deleteTable;
- (BOOL) validateTable: (NSHashTable*)table - (BOOL)validateTable: (NSHashTable *)table
withSelector: (SEL)sel withSelector: (SEL)sel
exceptionArray: (NSMutableArray**)exceptionArray exceptionArray: (NSMutableArray**)exceptionArray
continueAfterFailure: (BOOL)continueAfterFailure; continueAfterFailure: (BOOL)continueAfterFailure;
- (void)processRecentChanges; - (void)processRecentChanges;
- (void) _registerClearStateWithUndoManager; - (void)_registerClearStateWithUndoManager;
- (BOOL)propagatesDeletesAtEndOfEvent; - (BOOL)propagatesDeletesAtEndOfEvent;
- (void)setPropagatesDeletesAtEndOfEvent: (BOOL)propagatesDeletesAtEndOfEvent; - (void)setPropagatesDeletesAtEndOfEvent: (BOOL)propagatesDeletesAtEndOfEvent;
@ -229,7 +228,7 @@ modified state of the object.**/
relationshipName: (NSString *)name relationshipName: (NSString *)name
editingContext: (EOEditingContext *)context; editingContext: (EOEditingContext *)context;
- (void)refaultObject: object - (void)refaultObject: (id)object
withGlobalID: (EOGlobalID *)globalID withGlobalID: (EOGlobalID *)globalID
editingContext: (EOEditingContext *)context; editingContext: (EOEditingContext *)context;
@ -244,18 +243,17 @@ modified state of the object.**/
- (BOOL)isObjectLockedWithGlobalID: (EOGlobalID *)gid - (BOOL)isObjectLockedWithGlobalID: (EOGlobalID *)gid
editingContext: (EOEditingContext *)context; editingContext: (EOEditingContext *)context;
- (void) clearOriginalSnapshotForObject: (id)object; - (void)clearOriginalSnapshotForObject: (id)object;
@end @end
// used with NSRunLoop's performSelector:target:argument:order:modes: /* To be used with NSRunLoop's performSelector:target:argument:order:modes: */
enum { enum {
EOEditingContextFlushChangesRunLoopOrdering = 300000 EOEditingContextFlushChangesRunLoopOrdering = 300000
}; };
extern NSString *EOObjectsChangedInEditingContextNotification; GDL2CONTROL_EXPORT NSString *EOObjectsChangedInEditingContextNotification;
GDL2CONTROL_EXPORT NSString *EOEditingContextDidSaveChangesNotification;
extern NSString *EOEditingContextDidSaveChangesNotification;
@interface NSObject (EOEditingContext) @interface NSObject (EOEditingContext)
@ -264,9 +262,9 @@ extern NSString *EOEditingContextDidSaveChangesNotification;
@end @end
// /*
// Delegation methods * Methods implemented by the delegate.
// */
@interface NSObject (EOEditingContextDelegation) @interface NSObject (EOEditingContextDelegation)
- (BOOL)editingContext: (EOEditingContext *)editingContext - (BOOL)editingContext: (EOEditingContext *)editingContext
@ -285,16 +283,16 @@ shouldInvalidateObject: (id)object
- (NSArray *)editingContext: (EOEditingContext *)editingContext - (NSArray *)editingContext: (EOEditingContext *)editingContext
shouldFetchObjectsDescribedByFetchSpecification: (EOFetchSpecification *)fetchSpecification; shouldFetchObjectsDescribedByFetchSpecification: (EOFetchSpecification *)fetchSpecification;
- (BOOL) editingContext: (EOEditingContext *)editingContext - (BOOL)editingContext: (EOEditingContext *)editingContext
shouldMergeChangedObject: (id)object; shouldMergeChangedObject: (id)object;
- (void)didMergeChangedObjectsInEditingContext: (EOEditingContext *)editingContext; - (void)didMergeChangedObjectsInEditingContext: (EOEditingContext *)editingContext;
@end @end
// /*
// EOEditors informal protocol * Informal protocol for EOEditors.
// */
@interface NSObject (EOEditors) @interface NSObject (EOEditors)
- (BOOL)editorHasChangesForEditingContext: (EOEditingContext *)editingContext; - (BOOL)editorHasChangesForEditingContext: (EOEditingContext *)editingContext;
@ -303,9 +301,9 @@ shouldMergeChangedObject: (id)object;
@end @end
// /*
// EOMessageHandler informal protocol * Informal protocol for EOMessageHandlers.
// */
@interface NSObject (EOMessageHandlers) @interface NSObject (EOMessageHandlers)
- (void)editingContext: (EOEditingContext *)editingContext - (void)editingContext: (EOEditingContext *)editingContext
@ -349,26 +347,30 @@ shouldContinueFetchingWithCurrentObjectCount: (unsigned)count
- (void)undo: (id)sender; - (void)undo: (id)sender;
- (void)redo: (id)sender; - (void)redo: (id)sender;
//Private /*
-(NSString*)objectsDescription; * Private
-(NSString*)unprocessedDescription; */
-(NSString *)objectsDescription;
-(NSString *)unprocessedDescription;
@end @end
@interface EOEditingContext(EOMultiThreaded) <NSLocking> @interface EOEditingContext (EOMultiThreaded) <NSLocking>
+ (void)setEOFMultiThreadedEnabled: (BOOL)flag; + (void)setEOFMultiThreadedEnabled: (BOOL)flag;
- (void)lock; - (void)lock;
- (void)unlock; - (void)unlock;
- (BOOL) tryLock; - (BOOL)tryLock;
@end @end
// Informations /*
@interface EOEditingContext(EOEditingContextInfo) * Information
*/
@interface EOEditingContext (EOEditingContextInfo)
- (NSDictionary*)unprocessedInfo; - (NSDictionary *)unprocessedInfo;
- (NSDictionary*)pendingInfo; - (NSDictionary *)pendingInfo;
@end @end

25
EOControl/EOFault.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOFault.h EOFault.h
Copyright (C) 1996-2000 Free Software Foundation, Inc. Copyright (C) 1996-2000 Free Software Foundation, Inc.
@ -88,11 +88,11 @@
- (Class)superclass; - (Class)superclass;
- (Class)class; - (Class)class;
- (BOOL)isKindOfClass: (Class)aclass; - (BOOL)isKindOfClass: (Class)aClass;
- (BOOL)isMemberOfClass: (Class)aclass; - (BOOL)isMemberOfClass: (Class)aClass;
- (BOOL)conformsToProtocol: (Protocol *)protocol; - (BOOL)conformsToProtocol: (Protocol *)protocol;
- (BOOL)respondsToSelector: (SEL)sel; - (BOOL)respondsToSelector: (SEL)sel;
- (NSMethodSignature *)methodSignatureForSelector: (SEL)aSelector; - (NSMethodSignature *)methodSignatureForSelector: (SEL)selector;
- (id)retain; - (id)retain;
- (void)release; - (void)release;
@ -110,7 +110,7 @@
- (void)dealloc; - (void)dealloc;
- (NSZone *)zone; - (NSZone *)zone;
- (BOOL)isProxy; // Always NO. - (BOOL)isProxy;
- (id)self; - (id)self;
@ -118,8 +118,8 @@
- (void)doesNotRecognizeSelector: (SEL)sel; - (void)doesNotRecognizeSelector: (SEL)sel;
- (void)forwardInvocation: (NSInvocation *)invocation; - (void)forwardInvocation: (NSInvocation *)invocation;
- gcSetNextObject: (id)anObject; - (id)gcSetNextObject: (id)object;
- gcSetPreviousObject: (id)anObject; - (id)gcSetPreviousObject: (id)object;
- (id)gcNextObject; - (id)gcNextObject;
- (id)gcPreviousObject; - (id)gcPreviousObject;
- (BOOL)gcAlreadyVisited; - (BOOL)gcAlreadyVisited;
@ -137,8 +137,9 @@
{ {
gcInfo gc; gcInfo gc;
Class _targetClass; // the first 8 bytes of Class _targetClass; /* Cached class of original object. */
void *_extraData; // the faulted object void *_extraData; /* Cached memory contents of original object
overwritten by fault handler reference. */
unsigned _extraRefCount; unsigned _extraRefCount;
@ -155,7 +156,7 @@
- (BOOL)decrementExtraRefCountWasZero; - (BOOL)decrementExtraRefCountWasZero;
- (unsigned)extraRefCount; - (unsigned)extraRefCount;
- (NSString *)descriptionForObject: object; - (NSString *)descriptionForObject: (id)object;
- (Class)classForFault: (id)fault; - (Class)classForFault: (id)fault;
@ -174,8 +175,8 @@
// Garbage Collector // Garbage Collector
- gcSetNextObject: (id)anObject; - (id)gcSetNextObject: (id)object;
- gcSetPreviousObject: (id)anObject; - (id)gcSetPreviousObject: (id)object;
- (id)gcNextObject; - (id)gcNextObject;
- (id)gcPreviousObject; - (id)gcPreviousObject;
- (BOOL)gcAlreadyVisited; - (BOOL)gcAlreadyVisited;

35
EOControl/EOFetchSpecification.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOFetchSpecification.h EOFetchSpecification.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -33,6 +33,7 @@
#include <Foundation/Foundation.h> #include <Foundation/Foundation.h>
#endif #endif
#include <EOControl/EODefines.h>
@class NSArray; @class NSArray;
@class NSDictionary; @class NSDictionary;
@ -60,20 +61,18 @@
unsigned refreshesRefetchedObjects:1; unsigned refreshesRefetchedObjects:1;
unsigned promptsAfterFetchLimit:1; unsigned promptsAfterFetchLimit:1;
unsigned allVariablesRequiredFromBindings:1; unsigned allVariablesRequiredFromBindings:1;
unsigned :26; //padding unsigned reserved:26;
}_flags; }_flags;
} }
+ (EOFetchSpecification *)fetchSpecification; + (EOFetchSpecification *)fetchSpecification;
- init; - (id)initWithEntityName: (NSString *)entityName
qualifier: (EOQualifier *)qualifier
- initWithEntityName: (NSString *)entityName sortOrderings: (NSArray *)sortOrderings
qualifier: (EOQualifier *)qualifier usesDistinct: (BOOL)usesDistinct
sortOrderings: (NSArray *)sortOrderings isDeep: (BOOL)isDeep
usesDistinct: (BOOL)usesDistinct hints: (NSDictionary *)hints;
isDeep: (BOOL)isDeep
hints: (NSDictionary *)hints;
- (EOFetchSpecification *)fetchSpecificationByApplyingBindings: (id)bindings; - (EOFetchSpecification *)fetchSpecificationByApplyingBindings: (id)bindings;
@ -98,10 +97,10 @@
sortOrderings: (NSArray *)sortOrderings sortOrderings: (NSArray *)sortOrderings
usesDistinct: (BOOL)usesDistinct; usesDistinct: (BOOL)usesDistinct;
- copyWithZone:(NSZone *)zone; - (id)copyWithZone: (NSZone *)zone;
- (id) initWithKeyValueUnarchiver: (EOKeyValueUnarchiver*)unarchiver; - (id)initWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver;
- (void) encodeWithKeyValueArchiver: (EOKeyValueArchiver*)archiver; - (void)encodeWithKeyValueArchiver: (EOKeyValueArchiver *)archiver;
- (void)setEntityName: (NSString *)entityName; - (void)setEntityName: (NSString *)entityName;
- (NSString *)entityName; - (NSString *)entityName;
@ -154,13 +153,9 @@
@end @end
GDL2CONTROL_EXPORT NSString *EOPrefetchingRelationshipHintKey;
GDL2CONTROL_EXPORT NSString *EOFetchLimitHintKey;
extern NSString *EOPrefetchingRelationshipHintKey; GDL2CONTROL_EXPORT NSString *EOPromptsAfterFetchLimitHintKey;
extern NSString *EOFetchLimitHintKey;
extern NSString *EOPromptsAfterFetchLimitHintKey;
#endif #endif

27
EOControl/EOGenericRecord.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOGenericRecord.h EOGenericRecord.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -49,28 +49,23 @@
EOMutableKnownKeyDictionary *dictionary; EOMutableKnownKeyDictionary *dictionary;
} }
// Initializing new instances /* Initializing new instances. */
- initWithEditingContext: (EOEditingContext *)context - (id)initWithEditingContext: (EOEditingContext *)context
classDescription: (EOClassDescription *)classDesc classDescription: (EOClassDescription *)classDesc
globalID: (EOGlobalID *)globalID; globalID: (EOGlobalID *)globalID;
#if !FOUNDATION_HAS_KVC + (void)eoCalculateAllSizeWith: (NSMutableDictionary *)dict;
- (id)valueForKey: (NSString *)key; - (unsigned int)eoCalculateSizeWith: (NSMutableDictionary *)dict;
- (void)takeValue: (id)value
forKey: (NSString *)key;
#endif
+ (void)eoCalculateAllSizeWith: (NSMutableDictionary*)dict;
- (unsigned int)eoCalculateSizeWith: (NSMutableDictionary*)dict;
+ (unsigned int)eoCalculateSizeWith: (NSMutableDictionary *)dict + (unsigned int)eoCalculateSizeWith: (NSMutableDictionary *)dict
forArray: (NSArray *)array; forArray: (NSArray *)array;
- (NSString *)debugDictionaryDescription; - (NSString *)debugDictionaryDescription;
/** should returns an array of property names to exclude from entity /** should return an array of property names
instanceDictionaryInitializer. to exclude from entity instanceDictionaryInitializer.
You can override this to exclude properties manually handled by derived object **/ You can override this to exclude properties manually
handled by derived object. **/
+ (NSArray *)_instanceDictionaryInitializerExcludedPropertyNames; + (NSArray *)_instanceDictionaryInitializerExcludedPropertyNames;
@end /* EOGenericRecord */ @end /* EOGenericRecord */

13
EOControl/EOGlobalID.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOGlobalID.h EOGlobalID.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -48,7 +48,8 @@
GDL2CONTROL_EXPORT NSString *EOGlobalIDChangedNotification; GDL2CONTROL_EXPORT NSString *EOGlobalIDChangedNotification;
@interface EOGlobalID : NSObject <NSCopying> @interface EOGlobalID : NSObject <NSCopying>
- (BOOL)isEqual:other;
- (BOOL)isEqual: (id)other;
- (unsigned)hash; - (unsigned)hash;
- (BOOL)isTemporary; - (BOOL)isTemporary;
@ -68,14 +69,12 @@ enum {
+ (EOTemporaryGlobalID *)temporaryGlobalID; + (EOTemporaryGlobalID *)temporaryGlobalID;
+ (void)assignGloballyUniqueBytes: (unsigned char *)buffer; + (void)assignGloballyUniqueBytes: (unsigned char *)buffer;
// < Sequence [2], ProcessID [2] , Time [4], IP Addr [4] > /* Sequence (2) - ProcessID (2) - Time (4) - IP (4) */
- init;
- (BOOL)isTemporary; - (BOOL)isTemporary;
- (void)encodeWithCoder: (NSCoder *)aCoder; - (void)encodeWithCoder: (NSCoder *)coder;
- (id)initWithCoder: (NSCoder *)aDecoder; - (id)initWithCoder: (NSCoder *)decoder;
@end @end

12
EOControl/EOKeyGlobalID.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOKeyGlobalID.h EOKeyGlobalID.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -49,14 +49,14 @@
- (unsigned)keyCount; - (unsigned)keyCount;
- (NSArray *)keyValuesArray; - (NSArray *)keyValuesArray;
- (BOOL)isEqual: other; - (BOOL)isEqual: (id)other;
- (unsigned)hash; - (unsigned)hash;
- (void)encodeWithCoder: (NSCoder *)aCoder; - (void)encodeWithCoder: (NSCoder *)coder;
- (id)initWithCoder: (NSCoder *)aDecoder; - (id)initWithCoder: (NSCoder *)decoder;
- (BOOL) isFinal; - (BOOL)isFinal;
- (NSString*)description; - (NSString *)description;
- (BOOL)areKeysAllNulls; - (BOOL)areKeysAllNulls;
@end @end

32
EOControl/EOKeyValueArchiver.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOKeyValueArchiver.h EOKeyValueArchiver.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -48,10 +48,6 @@
id _delegate; id _delegate;
} }
- (id) init;
- (void)dealloc;
- (void)encodeObject: (id)object - (void)encodeObject: (id)object
forKey: (NSString *)key; forKey: (NSString *)key;
@ -64,12 +60,12 @@
- (void)encodeInt: (int)intValue - (void)encodeInt: (int)intValue
forKey: (NSString *)key; forKey: (NSString *)key;
- (void) _encodeDictionary: (id)dictionary - (void)_encodeDictionary: (id)dictionary
forKey: (id)key; forKey: (id)key;
- (void) _encodeObjects: (id)objects - (void)_encodeObjects: (id)objects
forKey: (id)key; forKey: (id)key;
- (void) _encodeValue: (id)value - (void)_encodeValue: (id)value
forKey: (id)key; forKey: (id)key;
- (NSDictionary *)dictionary; - (NSDictionary *)dictionary;
@ -107,7 +103,7 @@ referenceToEncodeForObject: (id)object;
- (int)decodeIntForKey: (NSString *)key; - (int)decodeIntForKey: (NSString *)key;
- (BOOL) isThereValueForKey: (NSString *)key; - (BOOL)isThereValueForKey: (NSString *)key;
- (void)ensureObjectAwake: (id)object; - (void)ensureObjectAwake: (id)object;
@ -120,10 +116,10 @@ referenceToEncodeForObject: (id)object;
- (void)setDelegate: (id)delegate; - (void)setDelegate: (id)delegate;
- (id)delegate; - (id)delegate;
- (id) _findTypeForPropertyListDecoding: (id)param0; - (id)_findTypeForPropertyListDecoding: (id)param0;
- (id) _dictionaryForPropertyList: (NSDictionary*)propList; - (id)_dictionaryForPropertyList: (NSDictionary *)propList;
- (id) _objectsForPropertyList: (NSArray*)propList; - (id)_objectsForPropertyList: (NSArray *)propList;
- (id) _objectForPropertyList: (NSDictionary*)propList; - (id)_objectForPropertyList: (NSDictionary *)propList;
@end @end
@ -136,13 +132,13 @@ objectForReference: (id)keyPath;
@protocol EOKeyValueArchiving @protocol EOKeyValueArchiving
- (id) initWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver; - (id)initWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver;
- (void)encodeWithKeyValueArchiver: (EOKeyValueArchiver *)archiver; - (void)encodeWithKeyValueArchiver: (EOKeyValueArchiver *)archiver;
@end @end
@interface NSObject(EOKeyValueArchivingAwakeMethods) @interface NSObject(EOKeyValueArchivingAwakeMethods)
- (void)finishInitializationWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver; - (void)finishInitializationWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver;

16
EOControl/EOKeyValueCoding.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOKeyValueCoding.h EOKeyValueCoding.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -158,7 +158,7 @@
- (id)valueForKey: (NSString *)key; - (id)valueForKey: (NSString *)key;
- (id)storedValueForKey: (NSString *)key; - (id)storedValueForKey: (NSString *)key;
- (id)valueForKeyPath: (NSString *)keyPath; - (id)valueForKeyPath: (NSString *)keyPath;
- (id)storedValueForKeyPath: (NSString*)keyPath; - (id)storedValueForKeyPath: (NSString *)keyPath;
@end @end
@ -168,18 +168,18 @@
* See documentation or source file for details on how it differs. * See documentation or source file for details on how it differs.
*/ */
- (void)takeValue: (id)value - (void)takeValue: (id)value
forKey: (NSString*)key; forKey: (NSString *)key;
@end @end
@interface NSObject (EOKVCGDL2Additions) @interface NSObject (EOKVCGDL2Additions)
/* These are hooks for EOGenericRecord KVC implementaion. */ /* These are hooks for EOGenericRecord KVC implementaion. */
- (void)smartTakeValue: (id)anObject - (void)smartTakeValue: (id)object
forKey: (NSString *)aKey; forKey: (NSString *)key;
- (void)smartTakeValue: (id)anObject - (void)smartTakeValue: (id)object
forKeyPath: (NSString *)aKeyPath; forKeyPath: (NSString *)keyPath;
- (void)takeStoredValue: value - (void)takeStoredValue: (id)value
forKeyPath: (NSString *)key; forKeyPath: (NSString *)key;
- (id)storedValueForKeyPath: (NSString *)key; - (id)storedValueForKeyPath: (NSString *)key;

2
EOControl/EOKeyValueCodingBase.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOKeyValueCodingBase.h EOKeyValueCodingBase.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.

136
EOControl/EOMutableKnownKeyDictionary.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOMultipleKnownKeyDictionary.h EOMultipleKnownKeyDictionary.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -52,27 +52,27 @@
NSString **_keys; NSString **_keys;
} }
+ (EOMKKDInitializer*)initializerFromKeyArray:(NSArray*)keys; + (EOMKKDInitializer *)initializerFromKeyArray: (NSArray *)keys;
+ (id)newWithKeyArray: (NSArray*)keys; + (id)newWithKeyArray: (NSArray *)keys;
+ (id)newWithKeyArray: (NSArray*)keys + (id)newWithKeyArray: (NSArray *)keys
zone: (NSZone*)zone; zone: (NSZone *)zone;
- (id)initWithKeys: (NSArray*)keys; - (id)initWithKeys: (NSArray *)keys;
- (void) dealloc; - (void)dealloc;
- (NSString*)description; - (NSString *)description;
- (unsigned int) count; - (unsigned int)count;
- (void) setObject: (id)object - (void)setObject: (id)object
forIndex: (unsigned int)index forIndex: (unsigned int)index
dictionary: (NSMutableDictionary*)dictionary; dictionary: (NSMutableDictionary *)dictionary;
- (id) objectForIndex: (unsigned int)index - (id)objectForIndex: (unsigned int)index
dictionary: (NSDictionary*)dictionary; dictionary: (NSDictionary *)dictionary;
- (unsigned int) indexForKey: (id)key; - (unsigned int)indexForKey: (id)key;
- (id) arrayMappingForKeys: (id)keys; - (id)arrayMappingForKeys: (id)keys;
- (id) subsetMappingForSourceDictionaryInitializer: (EOMKKDInitializer*)initialize - (id)subsetMappingForSourceDictionaryInitializer: (EOMKKDInitializer *)init
sourceKeys: (NSArray*)sourceKeys sourceKeys: (NSArray *)sourceKeys
destinationKeys: (NSArray*)destinationKeys; destinationKeys: (NSArray *)destinationKeys;
- (id) subsetMappingForSourceDictionaryInitializer: (id)param0; - (id)subsetMappingForSourceDictionaryInitializer: (id)param0;
- (id*) keys; - (id *)keys;
- (BOOL)hasKey: (id)key; - (BOOL)hasKey: (id)key;
@end @end
@ -87,10 +87,10 @@
NSString **_keys; NSString **_keys;
} }
- (id) initWithTarget: (EOMutableKnownKeyDictionary*)target; - (id)initWithTarget: (EOMutableKnownKeyDictionary *)target;
- (void) dealloc; - (void)dealloc;
- (NSString*)description; - (NSString *)description;
- (id) nextObject; - (id)nextObject;
@end @end
@ -103,11 +103,11 @@
} }
+(id)newInstanceWithKeyCount: (unsigned int)keyCount +(id)newInstanceWithKeyCount: (unsigned int)keyCount
sourceDescription: (EOMKKDInitializer*)source sourceDescription: (EOMKKDInitializer *)source
destinationDescription: (EOMKKDInitializer*)destination destinationDescription: (EOMKKDInitializer *)destination
zone: (NSZone*)zone; zone: (NSZone *)zone;
- (void) dealloc; - (void)dealloc;
- (NSString*)description; - (NSString *)description;
@end @end
@ -118,10 +118,10 @@
int _destinationOffsetForArrayIndex[1]; int _destinationOffsetForArrayIndex[1];
} }
+ (id)newInstanceWithKeyCount: (unsigned int)keyCount + (id)newInstanceWithKeyCount: (unsigned int)keyCount
destinationDescription: (EOMKKDInitializer*)destination destinationDescription: (EOMKKDInitializer *)destination
zone: (NSZone*)zone; zone: (NSZone *)zone;
- (void) dealloc; - (void)dealloc;
- (NSString*)description; - (NSString *)description;
@end @end
@ -135,43 +135,43 @@
+ (id)dictionaryFromDictionary: (NSDictionary *)dict + (id)dictionaryFromDictionary: (NSDictionary *)dict
subsetMapping: (EOMKKDSubsetMapping *)subsetMapping; subsetMapping: (EOMKKDSubsetMapping *)subsetMapping;
+ (id)newDictionaryFromDictionary: (NSDictionary*)dict + (id)newDictionaryFromDictionary: (NSDictionary *)dict
subsetMapping: (EOMKKDSubsetMapping*)subsetMapping subsetMapping: (EOMKKDSubsetMapping *)subsetMapping
zone: (NSZone*)zone; zone: (NSZone *)zone;
+ (id)newDictionaryWithObjects: (id*)objects + (id)newDictionaryWithObjects: (id *)objects
arrayMapping: (id)mapping arrayMapping: (id)mapping
zone: (NSZone*)zone; zone: (NSZone *)zone;
+ (id)newWithInitializer: (EOMKKDInitializer*)initializer + (id)newWithInitializer: (EOMKKDInitializer *)initializer
objects: (id*)objects objects: (id *)objects
zone: (NSZone*)zone; zone: (NSZone *)zone;
+ (id)dictionaryWithObjects: (NSArray*)objects + (id)dictionaryWithObjects: (NSArray *)objects
forKeys: (NSArray*)keys; forKeys: (NSArray *)keys;
+ (EOMKKDInitializer*)initializerFromKeyArray: (NSArray*)keys; + (EOMKKDInitializer *)initializerFromKeyArray: (NSArray *)keys;
+ (id) dictionaryWithInitializer: (EOMKKDInitializer*)initializer; + (id)dictionaryWithInitializer: (EOMKKDInitializer *)initializer;
+ (id)newWithInitializer: (EOMKKDInitializer*)initializer; + (id)newWithInitializer: (EOMKKDInitializer *)initializer;
+ (id)newWithInitializer: (EOMKKDInitializer*)initializer + (id)newWithInitializer: (EOMKKDInitializer *)initializer
zone: (NSZone*)zone; zone: (NSZone *)zone;
+ (id) dictionaryWithInitializer: (EOMKKDInitializer*)initializer; + (id)dictionaryWithInitializer: (EOMKKDInitializer *)initializer;
- (id)initWithInitializer: (EOMKKDInitializer*)initializer; - (id)initWithInitializer: (EOMKKDInitializer *)initializer;
- (id) initWithInitializer: (EOMKKDInitializer*)initializer - (id)initWithInitializer: (EOMKKDInitializer *)initializer
objects: (id*)objects; objects: (id *)objects;
- (id) initWithObjects: (id*)objects - (id)initWithObjects: (id *)objects
forKeys: (id*)keys forKeys: (id *)keys
count: (unsigned int)count; count: (unsigned int)count;
- (void) dealloc; - (void)dealloc;
- (unsigned int) count; - (unsigned int)count;
- (id) objectForKey: (id)key; - (id)objectForKey: (id)key;
- (void) setObject: (id)object - (void)setObject: (id)object
forKey: (NSString*)key; forKey: (NSString *)key;
- (void) removeObjectForKey: (NSString*)key; - (void)removeObjectForKey: (NSString *)key;
- (BOOL) containsObjectsNotIdenticalTo: (id)object; - (BOOL)containsObjectsNotIdenticalTo: (id)object;
- (void) addEntriesFromDictionary: (NSDictionary*)dictionary; - (void)addEntriesFromDictionary: (NSDictionary *)dictionary;
- (NSEnumerator*) keyEnumerator; - (NSEnumerator *)keyEnumerator;
- (EOMKKDInitializer*) eoMKKDInitializer; - (EOMKKDInitializer *)eoMKKDInitializer;
- (NSMutableDictionary*)extraData; - (NSMutableDictionary *)extraData;
- (BOOL)hasKey:(id)key; - (BOOL)hasKey: (id)key;
- (NSString *)debugDescription; - (NSString *)debugDescription;
@end @end

62
EOControl/EONSAddOns.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EONSAddOns.h EONSAddOns.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -50,35 +50,35 @@ GDL2CONTROL_EXPORT BOOL
GSUseStrictWO451Compatibility(NSString *key); GSUseStrictWO451Compatibility(NSString *key);
@interface NSObject (NSObjectPerformingSelector) @interface NSObject (NSObjectPerformingSelector)
- (NSArray*)resultsOfPerformingSelector: (SEL)sel - (NSArray *)resultsOfPerformingSelector: (SEL)sel
withEachObjectInArray: (NSArray*)array; withEachObjectInArray: (NSArray *)array;
- (NSArray*)resultsOfPerformingSelector: (SEL)sel - (NSArray *)resultsOfPerformingSelector: (SEL)sel
withEachObjectInArray: (NSArray*)array withEachObjectInArray: (NSArray *)array
defaultResult: (id)defaultResult; defaultResult: (id)defaultResult;
@end @end
@interface NSArray (NSArrayPerformingSelector) @interface NSArray (NSArrayPerformingSelector)
- (id)firstObject; - (id)firstObject;
- (NSArray*)resultsOfPerformingSelector: (SEL)sel; - (NSArray *)resultsOfPerformingSelector: (SEL)sel;
- (NSArray*)resultsOfPerformingSelector: (SEL)sel - (NSArray *)resultsOfPerformingSelector: (SEL)sel
defaultResult: (id)defaultResult; defaultResult: (id)defaultResult;
- (NSArray*)resultsOfPerformingSelector: (SEL)sel - (NSArray *)resultsOfPerformingSelector: (SEL)sel
withObject: (id)obj1; withObject: (id)obj1;
- (NSArray*)resultsOfPerformingSelector: (SEL)sel - (NSArray *)resultsOfPerformingSelector: (SEL)sel
withObject: (id)obj1 withObject: (id)obj1
defaultResult: (id)defaultResult; defaultResult: (id)defaultResult;
- (NSArray*)resultsOfPerformingSelector: (SEL)sel - (NSArray *)resultsOfPerformingSelector: (SEL)sel
withObject: (id)obj1 withObject: (id)obj1
withObject: (id)obj2; withObject: (id)obj2;
- (NSArray*)resultsOfPerformingSelector: (SEL)sel - (NSArray *)resultsOfPerformingSelector: (SEL)sel
withObject: (id)obj1 withObject: (id)obj1
withObject: (id)obj2 withObject: (id)obj2
defaultResult: (id)defaultResult; defaultResult: (id)defaultResult;
- (NSArray*)arrayExcludingObjectsInArray: (NSArray*)array; - (NSArray *)arrayExcludingObjectsInArray: (NSArray *)array;
- (NSArray*)arrayExcludingObject: (id)object; - (NSArray *)arrayExcludingObject: (id)object;
- (NSArray*)arrayByReplacingObject: (id)object1 - (NSArray *)arrayByReplacingObject: (id)object1
withObject: (id)object2; withObject: (id)object2;
- (BOOL)containsIdenticalObjectsWithArray: (NSArray*)array; - (BOOL)containsIdenticalObjectsWithArray: (NSArray *)array;
@end @end
@ -109,14 +109,14 @@ GSUseStrictWO451Compatibility(NSString *key);
@interface NSObject (PerformSelect3) @interface NSObject (PerformSelect3)
/** /**
* Causes the receiver to execute the method implementation corresponding * Causes the receiver to execute the method implementation corresponding
* to aSelector and returns the result.<br /> * to selector and returns the result.<br />
* The method must be one which takes three arguments and returns an object. * The method must be one which takes three arguments and returns an object.
* <br />Raises NSInvalidArgumentException if given a null selector. * <br />Raises NSInvalidArgumentException if given a null selector.
*/ */
- (id) performSelector: (SEL)aSelector - (id)performSelector: (SEL)selector
withObject: (id) object1 withObject: (id)object1
withObject: (id) object2 withObject: (id)object2
withObject: (id) object3; withObject: (id)object3;
@end @end
#endif /* __EONSAddOns_h__ */ #endif /* __EONSAddOns_h__ */

2
EOControl/EONull.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EONull.h EONull.h
Copyright (C) 1996-2002, 2003 Free Software Foundation, Inc. Copyright (C) 1996-2002, 2003 Free Software Foundation, Inc.

10
EOControl/EOObjectStore.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOObjectStore.h EOObjectStore.h
Copyright (C) 2000, 2003 Free Software Foundation, Inc. Copyright (C) 2000, 2003 Free Software Foundation, Inc.
@ -65,13 +65,13 @@
relationshipName: (NSString *)name relationshipName: (NSString *)name
editingContext: (EOEditingContext *)context; editingContext: (EOEditingContext *)context;
- (void)refaultObject: object - (void)refaultObject: (id)object
withGlobalID: (EOGlobalID *)globalID withGlobalID: (EOGlobalID *)globalID
editingContext: (EOEditingContext *)context; editingContext: (EOEditingContext *)context;
- (void)saveChangesInEditingContext: (EOEditingContext *)context; - (void)saveChangesInEditingContext: (EOEditingContext *)context;
- (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpecification - (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpec
editingContext: (EOEditingContext *)context; editingContext: (EOEditingContext *)context;
- (BOOL)isObjectLockedWithGlobalID: (EOGlobalID *)gid - (BOOL)isObjectLockedWithGlobalID: (EOGlobalID *)gid
@ -83,8 +83,8 @@
- (void)invalidateAllObjects; - (void)invalidateAllObjects;
- (void)invalidateObjectsWithGlobalIDs: (NSArray *)globalIDs; - (void)invalidateObjectsWithGlobalIDs: (NSArray *)globalIDs;
- (id) propertiesForObjectWithGlobalID: (EOGlobalID *)gid - (id)propertiesForObjectWithGlobalID: (EOGlobalID *)gid
editingContext: (EOEditingContext *)context; editingContext: (EOEditingContext *)context;
@end @end

31
EOControl/EOObjectStoreCoordinator.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOObjectStoreCoordinator.h EOObjectStoreCoordinator.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -29,6 +29,8 @@
#include <EOControl/EOObjectStore.h> #include <EOControl/EOObjectStore.h>
#include <EOControl/EODefines.h>
@class NSArray; @class NSArray;
@class NSMutableArray; @class NSMutableArray;
@ -40,27 +42,25 @@
@class EOModelGroup; @class EOModelGroup;
@interface EOObjectStoreCoordinator:EOObjectStore @interface EOObjectStoreCoordinator : EOObjectStore
{ {
NSMutableArray *_stores; NSMutableArray *_stores;
NSDictionary *_userInfo; NSDictionary *_userInfo;
} }
- init;
- (void)addCooperatingObjectStore: (EOCooperatingObjectStore *)store; - (void)addCooperatingObjectStore: (EOCooperatingObjectStore *)store;
- (void)removeCooperatingObjectStore: (EOCooperatingObjectStore *)store; - (void)removeCooperatingObjectStore: (EOCooperatingObjectStore *)store;
- (NSArray *)cooperatingObjectStores; - (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 *)objectStoreForGlobalID: (EOGlobalID *)gloablID;
- (EOCooperatingObjectStore *)objectStoreForObject: object; - (EOCooperatingObjectStore *)objectStoreForObject: (id)object;
- (EOCooperatingObjectStore *)objectStoreForFetchSpecification: (EOFetchSpecification *)fetchSpecification; - (EOCooperatingObjectStore *)objectStoreForFetchSpecification: (EOFetchSpecification *)fetchSpecification;
@ -73,14 +73,14 @@
@end @end
// Notifications: /* Notifications */
extern NSString *EOCooperatingObjectStoreWasAdded; GDL2CONTROL_EXPORT NSString *EOCooperatingObjectStoreWasAdded;
extern NSString *EOCooperatingObjectStoreWasRemoved; GDL2CONTROL_EXPORT NSString *EOCooperatingObjectStoreWasRemoved;
extern NSString *EOCooperatingObjectStoreNeeded; GDL2CONTROL_EXPORT NSString *EOCooperatingObjectStoreNeeded;
@interface EOCooperatingObjectStore:EOObjectStore @interface EOCooperatingObjectStore : EOObjectStore
- (BOOL)ownsGlobalID: (EOGlobalID *)globalID; - (BOOL)ownsGlobalID: (EOGlobalID *)globalID;
@ -90,18 +90,19 @@ extern NSString *EOCooperatingObjectStoreNeeded;
- (BOOL)handlesFetchSpecification: (EOFetchSpecification *)fetchSpecification; - (BOOL)handlesFetchSpecification: (EOFetchSpecification *)fetchSpecification;
- (void)prepareForSaveWithCoordinator: (EOObjectStoreCoordinator *)coordinator editingContext:(EOEditingContext *)context; - (void)prepareForSaveWithCoordinator: (EOObjectStoreCoordinator *)coordinator
editingContext: (EOEditingContext *)context;
- (void)recordChangesInEditingContext; - (void)recordChangesInEditingContext;
- (void)recordUpdateForObject:object changes: (NSDictionary *)changes; - (void)recordUpdateForObject: (id)object changes: (NSDictionary *)changes;
- (void)performChanges; - (void)performChanges;
- (void)commitChanges; - (void)commitChanges;
- (void)rollbackChanges; - (void)rollbackChanges;
- (NSDictionary *)valuesForKeys: (NSArray *)keys object: object; - (NSDictionary *)valuesForKeys: (NSArray *)keys object: (id)object;
@end @end

19
EOControl/EOObserver.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOObserver.h EOObserver.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -44,6 +44,7 @@
@end @end
@protocol EOObserving <NSObject> @protocol EOObserving <NSObject>
- (void)objectWillChange: (id)subject; - (void)objectWillChange: (id)subject;
@end @end
@ -90,7 +91,7 @@ typedef enum {
@interface EODelayedObserver : NSObject <EOObserving> @interface EODelayedObserver : NSObject <EOObserving>
{ {
@public @public
EODelayedObserver *_next; // linked list. Nil if not on list. EODelayedObserver *_next; /* Linked List. */
} }
- (void)objectWillChange: (id)subject; - (void)objectWillChange: (id)subject;
@ -99,14 +100,13 @@ typedef enum {
- (EODelayedObserverQueue *)observerQueue; - (EODelayedObserverQueue *)observerQueue;
// Must be implemented by subclasses - (void)subjectChanged; /* Subclass responsibility. */
- (void)subjectChanged;
- (void)discardPendingNotification; - (void)discardPendingNotification;
@end @end
// used with NSRunLoop's performSelector:target:argument:order:modes: /* To be used with NSRunLoop's performSelector:target:argument:order:modes: */
enum enum
{ {
EOFlushDelayedObserversRunLoopOrdering = 400000 EOFlushDelayedObserversRunLoopOrdering = 400000
@ -115,7 +115,8 @@ enum
@interface EODelayedObserverQueue : NSObject @interface EODelayedObserverQueue : NSObject
{ {
EODelayedObserver *_queue[EOObserverNumberOfPriorities]; // lists for each priority /* Lists per priority. */
EODelayedObserver *_queue[EOObserverNumberOfPriorities];
unsigned _highestNonEmptyQueue; unsigned _highestNonEmptyQueue;
BOOL _haveEntryInNotificationQueue; BOOL _haveEntryInNotificationQueue;
NSArray *_modes; NSArray *_modes;
@ -141,9 +142,9 @@ enum
EOObserverPriority _priority; EOObserverPriority _priority;
} }
- initWithTarget: (id)target - (id)initWithTarget: (id)target
action: (SEL)action action: (SEL)action
priority: (EOObserverPriority)priority; priority: (EOObserverPriority)priority;
@end @end

54
EOControl/EOQualifier.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOQualifier.h EOQualifier.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -35,6 +35,8 @@
#include <EOControl/EOKeyValueArchiver.h> #include <EOControl/EOKeyValueArchiver.h>
#include <EOControl/EODefines.h>
@class NSArray; @class NSArray;
@class NSDictionary; @class NSDictionary;
@class NSString; @class NSString;
@ -47,8 +49,6 @@
@interface EOQualifier : NSObject <NSCopying> @interface EOQualifier : NSObject <NSCopying>
{
}
+ (EOQualifier *)qualifierWithQualifierFormat: (NSString *)qualifierFormat, ...; + (EOQualifier *)qualifierWithQualifierFormat: (NSString *)qualifierFormat, ...;
@ -95,7 +95,7 @@
@protocol EOQualifierEvaluation @protocol EOQualifierEvaluation
- (BOOL)evaluateWithObject: object; - (BOOL)evaluateWithObject: (id)object;
@end @end
@ -126,40 +126,40 @@
#define EOQualifierOperatorCaseInsensitiveLike @selector(isCaseInsensitiveLike:) #define EOQualifierOperatorCaseInsensitiveLike @selector(isCaseInsensitiveLike:)
@interface EOKeyValueQualifier:EOQualifier <EOQualifierEvaluation> @interface EOKeyValueQualifier : EOQualifier <EOQualifierEvaluation>
{ {
SEL _selector; SEL _selector;
NSString *_key; NSString *_key;
id _value; id _value;
} }
+ (EOKeyValueQualifier*)qualifierWithKey: (NSString *)key + (EOKeyValueQualifier *)qualifierWithKey: (NSString *)key
operatorSelector: (SEL)selector operatorSelector: (SEL)selector
value: (id)value; value: (id)value;
- (id) initWithKey: (NSString *)key - (id)initWithKey: (NSString *)key
operatorSelector: (SEL)selector operatorSelector: (SEL)selector
value: (id)value; value: (id)value;
- (SEL)selector; - (SEL)selector;
- (NSString *)key; - (NSString *)key;
- (id)value; - (id)value;
@end @end
@interface EOKeyComparisonQualifier:EOQualifier <EOQualifierEvaluation> @interface EOKeyComparisonQualifier : EOQualifier <EOQualifierEvaluation>
{ {
SEL _selector; SEL _selector;
NSString *_leftKey; NSString *_leftKey;
NSString *_rightKey; NSString *_rightKey;
} }
+ (EOQualifier*)qualifierWithLeftKey: (NSString *)leftKey + (EOQualifier *)qualifierWithLeftKey: (NSString *)leftKey
operatorSelector: (SEL)selector operatorSelector: (SEL)selector
rightKey: (id)rightKey; rightKey: (id)rightKey;
- initWithLeftKey: (NSString *)leftKey - (id)initWithLeftKey: (NSString *)leftKey
operatorSelector: (SEL)selector operatorSelector: (SEL)selector
rightKey: (id)rightKey; rightKey: (id)rightKey;
- (SEL)selector; - (SEL)selector;
- (NSString *)leftKey; - (NSString *)leftKey;
- (NSString *)rightKey; - (NSString *)rightKey;
@ -175,15 +175,15 @@
+ (EOQualifier *)qualifierWithQualifierArray: (NSArray *)array; + (EOQualifier *)qualifierWithQualifierArray: (NSArray *)array;
+ (EOQualifier *)qualifierWithQualifiers: (EOQualifier *)qualifiers, ...; + (EOQualifier *)qualifierWithQualifiers: (EOQualifier *)qualifiers, ...;
- initWithQualifiers: (EOQualifier *)qualifiers, ...; - (id)initWithQualifiers: (EOQualifier *)qualifiers, ...;
- initWithQualifierArray: (NSArray *)array; - (id)initWithQualifierArray: (NSArray *)array;
- (NSArray *)qualifiers; - (NSArray *)qualifiers;
@end @end
@interface EOOrQualifier:EOQualifier <EOQualifierEvaluation> @interface EOOrQualifier : EOQualifier <EOQualifierEvaluation>
{ {
NSArray *_qualifiers; NSArray *_qualifiers;
} }
@ -191,31 +191,31 @@
+ (EOQualifier *)qualifierWithQualifierArray: (NSArray *)array; + (EOQualifier *)qualifierWithQualifierArray: (NSArray *)array;
+ (EOQualifier *)qualifierWithQualifiers: (EOQualifier *)qualifiers, ...; + (EOQualifier *)qualifierWithQualifiers: (EOQualifier *)qualifiers, ...;
- initWithQualifiers: (EOQualifier *)qualifiers, ...; - (id)initWithQualifiers: (EOQualifier *)qualifiers, ...;
- initWithQualifierArray: (NSArray *)array; - (id)initWithQualifierArray: (NSArray *)array;
- (NSArray *)qualifiers; - (NSArray *)qualifiers;
@end @end
@interface EONotQualifier:EOQualifier <EOQualifierEvaluation> @interface EONotQualifier : EOQualifier <EOQualifierEvaluation>
{ {
EOQualifier *_qualifier; EOQualifier *_qualifier;
} }
+ (EOQualifier *)qualifierWithQualifier: (EOQualifier *)qualifier; + (EOQualifier *)qualifierWithQualifier: (EOQualifier *)qualifier;
- initWithQualifier: (EOQualifier *)qualifier; - (id)initWithQualifier: (EOQualifier *)qualifier;
- (EOQualifier *)qualifier; - (EOQualifier *)qualifier;
@end @end
extern NSString *EOQualifierVariableSubstitutionException; GDL2CONTROL_EXPORT NSString *EOQualifierVariableSubstitutionException;
@interface EOQualifierVariable:NSObject <NSCoding, EOKeyValueArchiving> @interface EOQualifierVariable : NSObject <NSCoding, EOKeyValueArchiving>
{ {
NSString *_key; NSString *_key;
} }

6
EOControl/EOSortOrdering.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOSortOrdering.h EOSortOrdering.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -26,7 +26,7 @@
#ifndef __EOSortOrdering_h__ #ifndef __EOSortOrdering_h__
#define __EOSortOrdering_h__ #define __EOSortOrdering_h__
/* WO45 OK */
#ifdef GNUSTEP #ifdef GNUSTEP
#include <Foundation/NSObject.h> #include <Foundation/NSObject.h>
@ -47,7 +47,7 @@
+ (EOSortOrdering *)sortOrderingWithKey: (NSString *)key + (EOSortOrdering *)sortOrderingWithKey: (NSString *)key
selector: (SEL)selector; selector: (SEL)selector;
- initWithKey: (NSString *)key selector: (SEL)selector; - (id)initWithKey: (NSString *)key selector: (SEL)selector;
- (NSString *)key; - (NSString *)key;
- (SEL)selector; - (SEL)selector;

14
EOControl/EOUndoManager.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOUndoManager.h EOUndoManager.h
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000 Free Software Foundation, Inc.
@ -36,12 +36,12 @@
@interface EOUndoManager : NSUndoManager @interface EOUndoManager : NSUndoManager
- (void) forgetAllWithTarget: (id)param0; - (void)forgetAllWithTarget: (id)param0;
- (void) forgetAll; - (void)forgetAll;
- (void) registerUndoWithTarget: (id)param0 - (void)registerUndoWithTarget: (id)param0
selector: (SEL)param1 selector: (SEL)param1
arg: (id)param2; arg: (id)param2;
- (void) reenableUndoRegistration; - (void)reenableUndoRegistration;
@end @end

4
EOModeler/EOModelExtensions.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOModelExtensions.h EOModelExtensions.h
Copyright (C) 2001 Free Software Foundation, Inc. Copyright (C) 2001 Free Software Foundation, Inc.
@ -76,7 +76,7 @@
@interface NSMutableAttributedString (_EOModelerErrorConstruction) @interface NSMutableAttributedString (_EOModelerErrorConstruction)
+ (NSMutableAttributedString *)mutableAttributedStringWithBoldSubstitutionsWithFormat:(NSString *)format, ...; + (NSMutableAttributedString *)mutableAttributedStringWithBoldSubstitutionsWithFormat: (NSString *)format, ...;
@end @end

2
Tools/EOAttribute+GSDoc.h
View file

@ -1,4 +1,4 @@
/* /* -*-objc-*-
EOAttribute+GSDoc.h <title></title> EOAttribute+GSDoc.h <title></title>
Copyright (C) 2000-2002 Free Software Foundation, Inc. Copyright (C) 2000-2002 Free Software Foundation, Inc.

2
Tools/EOEntity+GSDoc.h
View file

@ -1,4 +1,4 @@
/** /* -*-objc-*-
EOEntity+GSDoc.h <title></title> EOEntity+GSDoc.h <title></title>
Copyright (C) 2000-2002 Free Software Foundation, Inc. Copyright (C) 2000-2002 Free Software Foundation, Inc.

2
Tools/EOJoin+GSDoc.h
View file

@ -1,4 +1,4 @@
/** /* -*-objc-*-
EOJoin+GSDoc.h <title>EOJoin+GSDoc</title> EOJoin+GSDoc.h <title>EOJoin+GSDoc</title>
Copyright (C) 2000-2002 Free Software Foundation, Inc. Copyright (C) 2000-2002 Free Software Foundation, Inc.

2
Tools/EOModel+GSDoc.h
View file

@ -1,4 +1,4 @@
/** /* -*-objc-*-
EOModel+GSDoc.h <title></title> EOModel+GSDoc.h <title></title>
Copyright (C) 2000-2002 Free Software Foundation, Inc. Copyright (C) 2000-2002 Free Software Foundation, Inc.

2
Tools/EORelationship+GSDoc.h
View file

@ -1,4 +1,4 @@
/** /* -*-objc-*-
EORelationship+GSDoc.h <title></title> EORelationship+GSDoc.h <title></title>
Copyright (C) 2000-2002 Free Software Foundation, Inc. Copyright (C) 2000-2002 Free Software Foundation, Inc.

2
Tools/NSArray+GSDoc.h
View file

@ -1,4 +1,4 @@
/** /* -*-objc-*-
NSArray+GSDoc.h <title></title> NSArray+GSDoc.h <title></title>
Copyright (C) 2000-2002 Free Software Foundation, Inc. Copyright (C) 2000-2002 Free Software Foundation, Inc.

2
Tools/NSDictionary+GSDoc.h
View file

@ -1,4 +1,4 @@
/** /* -*-objc-*-
NSDictionary+GSDoc.h <title></title> NSDictionary+GSDoc.h <title></title>
Copyright (C) 2000-2002 Free Software Foundation, Inc. Copyright (C) 2000-2002 Free Software Foundation, Inc.