diff --git a/ChangeLog b/ChangeLog index 0dd3752..672cf91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-11-25 Richard Frith-macdonald + + Tagged all files as 'with-extensions' + Committed new versions of very many files with dependency on the + obsolete extensions library removed. gdl2 should now only need + the base library (or perhaps MacOS-X foundation plus a port of the + Additions library from the base library package, when someone wants + to do the port). + 2002-11-24 Richard Frith-macdonald * EOAdaptors/Makefile.postamble: New file to clean configure diff --git a/EOAccess/EOAccess.h b/EOAccess/EOAccess.h index 4f5dbc0..7b6f257 100644 --- a/EOAccess/EOAccess.h +++ b/EOAccess/EOAccess.h @@ -27,8 +27,6 @@ #ifndef __EOAccess_h__ #define __EOAccess_h__ -#import - #import #import #import diff --git a/EOAccess/EOAdaptor.m b/EOAccess/EOAdaptor.m index 2b16b2a..41c6245 100644 --- a/EOAccess/EOAdaptor.m +++ b/EOAccess/EOAdaptor.m @@ -52,9 +52,7 @@ static char rcsId[] = "$Id$"; #import #import #import - -#import -#import +#import #import #import diff --git a/EOAccess/EOAdaptorChannel.h b/EOAccess/EOAdaptorChannel.h index 78bcc67..e090c99 100644 --- a/EOAccess/EOAdaptorChannel.h +++ b/EOAccess/EOAdaptorChannel.h @@ -27,7 +27,7 @@ #ifndef __EOAdaptorChannel_h__ #define __EOAdaptorChannel_h__ -#import +#import #import diff --git a/EOAccess/EOAdaptorChannel.m b/EOAccess/EOAdaptorChannel.m index 9579850..b4456a3 100644 --- a/EOAccess/EOAdaptorChannel.m +++ b/EOAccess/EOAdaptorChannel.m @@ -37,9 +37,7 @@ static char rcsId[] = "$Id$"; #import #import - -#import -#import +#import #import #import diff --git a/EOAccess/EOAdaptorOperation.m b/EOAccess/EOAdaptorOperation.m index 999fd19..24d2028 100644 --- a/EOAccess/EOAdaptorOperation.m +++ b/EOAccess/EOAdaptorOperation.m @@ -34,8 +34,7 @@ static char rcsId[] = "$Id$"; #import - -#import +#import #import #import diff --git a/EOAccess/EOAttribute.h b/EOAccess/EOAttribute.h index 6e9cce0..e9091a5 100644 --- a/EOAccess/EOAttribute.h +++ b/EOAccess/EOAttribute.h @@ -30,10 +30,9 @@ #import #import #import +#import -#import -#import -#import +#include #import diff --git a/EOAccess/EOAttribute.m b/EOAccess/EOAttribute.m index a082d61..63fc4db 100644 --- a/EOAccess/EOAttribute.m +++ b/EOAccess/EOAttribute.m @@ -41,8 +41,7 @@ static char rcsId[] = "$Id$"; #import #import #import -#import -#import +#import #import #import diff --git a/EOAccess/EODatabase.m b/EOAccess/EODatabase.m index 127f117..0786f55 100644 --- a/EOAccess/EODatabase.m +++ b/EOAccess/EODatabase.m @@ -42,9 +42,6 @@ static char rcsId[] = "$Id$"; #import #import -#import -#import - #import #import #import diff --git a/EOAccess/EODatabaseContext.m b/EOAccess/EODatabaseContext.m index d9b5e45..89b89b2 100644 --- a/EOAccess/EODatabaseContext.m +++ b/EOAccess/EODatabaseContext.m @@ -47,9 +47,6 @@ static char rcsId[] = "$Id$"; #import #import -#import -#import - #import #import #import @@ -5196,6 +5193,7 @@ Raises an exception is the adaptor is unable to perform the operations. EOFLOGObjectLevelArgs(@"EODatabaseContext", @"** 4"); } +@end @implementation EODatabaseContext (EODatabaseContextPrivate) diff --git a/EOAccess/EODatabaseOperation.m b/EOAccess/EODatabaseOperation.m index 7be1642..d79891f 100644 --- a/EOAccess/EODatabaseOperation.m +++ b/EOAccess/EODatabaseOperation.m @@ -35,7 +35,7 @@ static char rcsId[] = "$Id$"; #import -#import +#import #import #import diff --git a/EOAccess/EOEntity.h b/EOAccess/EOEntity.h index 6efc828..f226eb2 100644 --- a/EOAccess/EOEntity.h +++ b/EOAccess/EOEntity.h @@ -28,14 +28,11 @@ #define __EOEntity_h__ #import -#import -#import -#import -#import +#import #import #import - +#include @class EOModel; @class EOAttribute; diff --git a/EOAccess/EOEntity.m b/EOAccess/EOEntity.m index a80cda6..615418d 100644 --- a/EOAccess/EOEntity.m +++ b/EOAccess/EOEntity.m @@ -39,10 +39,9 @@ static char rcsId[] = "$Id$"; #import #import +#import -#import -#import -#import +#include #import #import @@ -1029,7 +1028,7 @@ NSString *EONextPrimaryKeyProcedureOperation = @"EONextPrimaryKeyProcedureOperat return _classProperties; } -- (NSArray *)primaryKeyAttributes +- (NSArray*)primaryKeyAttributes { //OK if (_flags.primaryKeyAttributesIsLazy) @@ -1069,7 +1068,7 @@ NSString *EONextPrimaryKeyProcedureOperation = @"EONextPrimaryKeyProcedureOperat DESTROY(primaryKeyAttributes); - [primaryKeyAttributes sortUsingSelector: @selector(eoCompareOnName:)]; //Very important to have always the same order. + [_primaryKeyAttributes sortUsingSelector: @selector(eoCompareOnName:)]; //Very important to have always the same order. [self _setIsEdited]; //To Clean Buffers } else @@ -3678,6 +3677,8 @@ toDestinationAttributeInLastComponentOfRelationshipPath: (NSString*)path return [self notImplemented: _cmd]; //TODO } +@end + @implementation EOEntity (EOEntityPrivateXX) - (EOExpressionArray*) _parseDescription: (NSString*)description diff --git a/EOAccess/EOExpressionArray.h b/EOAccess/EOExpressionArray.h index 8c43d27..7d20d87 100644 --- a/EOAccess/EOExpressionArray.h +++ b/EOAccess/EOExpressionArray.h @@ -28,7 +28,7 @@ #define __EOExpressionArray_h__ #import -#import +#include @class EOAttribute; @class EOEntity; diff --git a/EOAccess/EOExpressionArray.m b/EOAccess/EOExpressionArray.m index 954cba2..0e204e9 100644 --- a/EOAccess/EOExpressionArray.m +++ b/EOAccess/EOExpressionArray.m @@ -41,11 +41,9 @@ static char rcsId[] = "$Id$"; #import #import #import +#import -#import -#import -#import -#import +#include #import #import diff --git a/EOAccess/EOJoin.h b/EOAccess/EOJoin.h index 71bb77a..ceb16db 100644 --- a/EOAccess/EOJoin.h +++ b/EOAccess/EOJoin.h @@ -27,9 +27,7 @@ #ifndef __EOJoin_h__ #define __EOJoin_h__ -#import -#import - +#include @class EOEntity; @class EOAttribute; diff --git a/EOAccess/EOModel.h b/EOAccess/EOModel.h index 24eec44..975a500 100644 --- a/EOAccess/EOModel.h +++ b/EOAccess/EOModel.h @@ -28,9 +28,7 @@ #define __EOModel_h__ #import -#import -#import -#import +#include #import diff --git a/EOAccess/EOModel.m b/EOAccess/EOModel.m index 9be300d..7d45ec3 100644 --- a/EOAccess/EOModel.m +++ b/EOAccess/EOModel.m @@ -41,8 +41,7 @@ static char rcsId[] = "$Id$"; #import #import -#import -#import +#import #import #import diff --git a/EOAccess/EOModelGroup.h b/EOAccess/EOModelGroup.h index df52a7f..8deecba 100644 --- a/EOAccess/EOModelGroup.h +++ b/EOAccess/EOModelGroup.h @@ -27,8 +27,7 @@ #ifndef __EOModelGroup_h__ #define __EOModelGroup_h__ -#import -#import +#include @class EOModel; diff --git a/EOAccess/EORelationship.h b/EOAccess/EORelationship.h index 1b1d341..e25ead7 100644 --- a/EOAccess/EORelationship.h +++ b/EOAccess/EORelationship.h @@ -29,8 +29,7 @@ #import -#import -#import +#include #import #import diff --git a/EOAccess/EORelationship.m b/EOAccess/EORelationship.m index f3e530e..724e36f 100644 --- a/EOAccess/EORelationship.m +++ b/EOAccess/EORelationship.m @@ -41,8 +41,7 @@ static char rcsId[] = "$Id$"; #import #import -#import -#import +#import #import #import @@ -1533,17 +1532,16 @@ relationships. Nil if none" **/ } else { - [_joins autorelease]; - _joins = [_joins arrayByRemovingObject: join]; + GCMutableArray *ma = [_joins mutableCopy]; + GCArray *a = _joins; + + [ma removeObject: join]; + _joins = ma; + [a release]; EOFLOGObjectLevelArgs(@"EORelationship", @"XXjoins %p class%@", _joins, [_joins class]); - [_joins retain]; - /* _joins = [[_joins autorelease] mutableCopy]; - [(GCMutableArray *)_joins removeObject:join]; - _joins = [[_joins autorelease] copy]; - */ /*NO: will be recomputed _sourceAttributes = [[_sourceAttributes autorelease] mutableCopy]; [(GCMutableArray *)_sourceAttributes diff --git a/EOAccess/EOSQLExpression.m b/EOAccess/EOSQLExpression.m index 8d66720..89269b4 100644 --- a/EOAccess/EOSQLExpression.m +++ b/EOAccess/EOSQLExpression.m @@ -45,10 +45,7 @@ static char rcsId[] = "$Id$"; #import #import -#import -#import -#import -#import +#import #import #import diff --git a/EOAccess/EOSQLQualifier.m b/EOAccess/EOSQLQualifier.m index 1ed82e6..ed74e32 100644 --- a/EOAccess/EOSQLQualifier.m +++ b/EOAccess/EOSQLQualifier.m @@ -40,10 +40,7 @@ static char rcsId[] = "$Id$"; #import #import -#import -#import -#import -#import +#import #import diff --git a/EOAccess/EOStoredProcedure.h b/EOAccess/EOStoredProcedure.h index 355e00f..01f0d49 100644 --- a/EOAccess/EOStoredProcedure.h +++ b/EOAccess/EOStoredProcedure.h @@ -28,7 +28,7 @@ #define __EOStoredProcedure_h__ #import -#import +#import #import @class EOModel; diff --git a/EOAccess/EOStoredProcedure.m b/EOAccess/EOStoredProcedure.m index a450b53..3fcb98f 100644 --- a/EOAccess/EOStoredProcedure.m +++ b/EOAccess/EOStoredProcedure.m @@ -33,7 +33,7 @@ static char rcsId[] = "$Id$"; -#import +#include #import #import diff --git a/EOAccess/GNUmakefile b/EOAccess/GNUmakefile index 9e8ff3e..82f886d 100644 --- a/EOAccess/GNUmakefile +++ b/EOAccess/GNUmakefile @@ -34,7 +34,7 @@ include ../Version # The library to be compiled LIBRARY_NAME=libgnustep-db2 -LIBRARIES_DEPEND_UPON=-lgnustep-base -lFoundationExt -lgnustep-db2control +LIBRARIES_DEPEND_UPON=-lgnustep-base -lgnustep-db2control # The C source files to be compiled libgnustep-db2_C_FILES = diff --git a/EOControl/EOAndQualifier.m b/EOControl/EOAndQualifier.m index a9801c1..9043ca0 100644 --- a/EOControl/EOAndQualifier.m +++ b/EOControl/EOAndQualifier.m @@ -44,7 +44,6 @@ static char rcsId[] = "$Id$"; #import #import - @implementation EOAndQualifier + (EOQualifier *)qualifierWithQualifierArray: (NSArray *)array diff --git a/EOControl/EOControl.h b/EOControl/EOControl.h index e3bc293..5c2c9a5 100644 --- a/EOControl/EOControl.h +++ b/EOControl/EOControl.h @@ -46,6 +46,7 @@ #import #import #import +#include #endif /* __EOControl_h__ */ diff --git a/EOControl/EOFault.h b/EOControl/EOFault.h index 6051520..04ca35b 100644 --- a/EOControl/EOFault.h +++ b/EOControl/EOFault.h @@ -32,6 +32,8 @@ #include +#include + @class EOFaultHandler; /* @@ -122,18 +124,14 @@ @interface EOFaultHandler : NSObject { + gcInfo gc; + Class _targetClass; // the first 8 bytes of void *_extraData; // the faulted object unsigned _extraRefCount; BOOL gcEnabled; - id gcNextObject; - id gcPreviousObject; - struct { - unsigned gcVisited:1; - unsigned refCount:31; - } gcFlags; @public int gcCountainedObjectRefCount; } diff --git a/EOControl/EOFault.m b/EOControl/EOFault.m index 6079e2c..6d465c1 100644 --- a/EOControl/EOFault.m +++ b/EOControl/EOFault.m @@ -47,9 +47,8 @@ static char rcsId[] = "$Id$"; #import #import -#import -#import -#import +#include +#include #import #import diff --git a/EOControl/EOFaultHandler.m b/EOControl/EOFaultHandler.m index 042b9ed..cf07bae 100644 --- a/EOControl/EOFaultHandler.m +++ b/EOControl/EOFaultHandler.m @@ -40,9 +40,8 @@ static char rcsId[] = "$Id$"; #import #import -#import -#import -#import +#import +#include #import #import @@ -51,9 +50,7 @@ BOOL __isGCEnabled(Class class_) { Class gcObjectClass = [GCObject class]; - if ([class_ conformsToProtocol: @protocol(GarbageCollecting)]) - return YES; - else if ([class_ instancesRespondToSelector: @selector(gcIncrementRefCount)]) + if ([class_ instancesRespondToSelector: @selector(gcIncrementRefCount)]) return YES; else { @@ -69,8 +66,6 @@ BOOL __isGCEnabled(Class class_) return YES; else if ([class instancesRespondToSelector: @selector(gcNextObject)]) return YES; - else if ([class conformsToProtocol: @protocol(GarbageCollecting )]) - return YES; } } @@ -234,7 +229,7 @@ BOOL __isGCEnabled(Class class_) { id newObject = [super allocWithZone: zone_]; - ((EOFaultHandler *)newObject)->gcFlags.refCount = 0; + ((EOFaultHandler *)newObject)->gc.flags.refCount = 0; return newObject; } @@ -244,7 +239,7 @@ BOOL __isGCEnabled(Class class_) { if (gcEnabled) { - gcFlags.refCount++; + gc.flags.refCount++; return self; } else @@ -257,7 +252,7 @@ BOOL __isGCEnabled(Class class_) { if (gcEnabled) { - return gcFlags.refCount; + return gc.flags.refCount; } else { @@ -268,7 +263,7 @@ BOOL __isGCEnabled(Class class_) - gcSetNextObject: (id)anObject { if (gcEnabled) - gcNextObject = anObject; + gc.next = anObject; return self; } @@ -276,7 +271,7 @@ BOOL __isGCEnabled(Class class_) - gcSetPreviousObject: (id)anObject { if (gcEnabled) - gcPreviousObject = anObject; + gc.previous = anObject; return self; } @@ -284,7 +279,7 @@ BOOL __isGCEnabled(Class class_) - (id)gcNextObject { if (gcEnabled) - return gcNextObject; + return gc.next; return nil; } @@ -292,7 +287,7 @@ BOOL __isGCEnabled(Class class_) - (id)gcPreviousObject { if (gcEnabled) - return gcPreviousObject; + return gc.previous; return nil; } @@ -300,7 +295,7 @@ BOOL __isGCEnabled(Class class_) - (BOOL)gcAlreadyVisited { if (gcEnabled) - return gcFlags.gcVisited; + return gc.flags.visited; return YES; } @@ -308,7 +303,7 @@ BOOL __isGCEnabled(Class class_) - (void)gcSetVisited: (BOOL)flag { if (gcEnabled) - gcFlags.gcVisited = flag; + gc.flags.visited = flag; } - (void)gcDecrementRefCountOfContainedObjects @@ -325,11 +320,11 @@ BOOL __isGCEnabled(Class class_) { if (gcEnabled) { - if (gcFlags.gcVisited) + if (gc.flags.visited) return NO; gcCountainedObjectRefCount++; - gcFlags.gcVisited = YES; + gc.flags.visited = YES; return YES; } @@ -345,14 +340,14 @@ BOOL __isGCEnabled(Class class_) - (void)gcIncrementRefCount { if (gcEnabled); - //gcFlags.refCount++; + //gc.flags.refCount++; // faultReferences++; } - (void)gcDecrementRefCount { if(gcEnabled); - //gcFlags.refCount--; + //gc.flags.refCount--; // faultReferences--; } @@ -362,10 +357,12 @@ BOOL __isGCEnabled(Class class_) if (gcEnabled) { [fault gcIncrementRefCount]; - [fault gcSetNextObject:[self gcNextObject]]; - [fault gcSetPreviousObject:[self gcPreviousObject]]; - while(gcCountainedObjectRefCount-- > 0) - [fault gcIncrementRefCountOfContainedObjects]; + fault->gc.next = gc.next; + fault->gc.previous = gc.previous; + while (gcCountainedObjectRefCount-- > 0) + { + [fault gcIncrementRefCountOfContainedObjects]; + } }; return NO; } diff --git a/EOControl/EOKeyComparisonQualifier.m b/EOControl/EOKeyComparisonQualifier.m index 8e30505..8417a87 100644 --- a/EOControl/EOKeyComparisonQualifier.m +++ b/EOControl/EOKeyComparisonQualifier.m @@ -41,7 +41,6 @@ static char rcsId[] = "$Id$"; #import #import - @implementation EOKeyComparisonQualifier + (EOQualifier *)qualifierWithLeftKey: (NSString *)leftKey diff --git a/EOControl/EOKeyValueCoding.m b/EOControl/EOKeyValueCoding.m index 3868f1e..19333c2 100644 --- a/EOControl/EOKeyValueCoding.m +++ b/EOControl/EOKeyValueCoding.m @@ -52,9 +52,8 @@ static char rcsId[] = "$Id$"; #import #import -#import -#import -#import +#include +#include #import #import diff --git a/EOControl/EOKeyValueCodingBase.m b/EOControl/EOKeyValueCodingBase.m index 6f9cb6f..d457173 100644 --- a/EOControl/EOKeyValueCodingBase.m +++ b/EOControl/EOKeyValueCodingBase.m @@ -49,9 +49,8 @@ static char rcsId[] = "$Id$"; #import #import -#import -#import -#import +#include +#include #include "config.h" @@ -555,12 +554,12 @@ static GetKeyValueBinding *newGetBinding(NSString *key, id instance) { if (count == 1) { - Strcpy(iname, ckey); + strcpy(iname, ckey); } else { - Strcpy(iname, "get"); - Strcat(iname, ckey); + strcpy(iname, "get"); + strcat(iname, ckey); iname[3] = islower(iname[3]) ? toupper(iname[3]) : iname[3]; } @@ -658,7 +657,7 @@ static GetKeyValueBinding *newGetBinding(NSString *key, id instance) // NSDebugFLog(@"class=%@",NSStringFromClass(class)); for (i = 0;!fptr && class->ivars && i < class->ivars->ivar_count; i++) { - if (!Strcmp(testKey, class->ivars->ivar_list[i].ivar_name)) + if (!strcmp(testKey, class->ivars->ivar_list[i].ivar_name)) { // NSDebugFLog(@"Found"); switch (*objc_skip_type_qualifiers(class->ivars->ivar_list[i].ivar_type)) @@ -728,8 +727,8 @@ static GetKeyValueBinding *newGetBinding(NSString *key, id instance) if (fptr) { - KeyValueMethod* mkey = Malloc(sizeof(KeyValueMethod)); - GetKeyValueBinding* bin = Malloc(sizeof(GetKeyValueBinding)); + KeyValueMethod* mkey = NSZoneMalloc(NSDefaultMallocZone(), sizeof(KeyValueMethod)); + GetKeyValueBinding* bin = NSZoneMalloc(NSDefaultMallocZone(), sizeof(GetKeyValueBinding)); mkey->key = [key copy]; mkey->class = [instance class]; @@ -776,13 +775,13 @@ static GetKeyValueBinding *newGetStoredBinding(NSString *key, id instance) { if(count == 1) { - Strcpy(iname, "_"); - Strcat(iname, ckey); + strcpy(iname, "_"); + strcat(iname, ckey); } else { - Strcpy(iname, "_get"); - Strcat(iname, ckey); + strcpy(iname, "_get"); + strcat(iname, ckey); iname[4] = islower(iname[4]) ? toupper(iname[4]) : iname[4]; } @@ -856,19 +855,19 @@ static GetKeyValueBinding *newGetStoredBinding(NSString *key, id instance) // Make ivar from name if(count == 1) { - Strcpy(iname, "_"); - Strcat(iname, ckey); + strcpy(iname, "_"); + strcat(iname, ckey); } else { - Strcpy(iname, ckey); + strcpy(iname, ckey); } while (class) { for (i = 0; class->ivars && i < class->ivars->ivar_count; i++) { - if (!Strcmp(iname, class->ivars->ivar_list[i].ivar_name)) + if (!strcmp(iname, class->ivars->ivar_list[i].ivar_name)) { switch (*objc_skip_type_qualifiers(class->ivars->ivar_list[i].ivar_type)) { @@ -934,12 +933,12 @@ static GetKeyValueBinding *newGetStoredBinding(NSString *key, id instance) { if (count == 1) { - Strcpy(iname, ckey); + strcpy(iname, ckey); } else { - Strcpy(iname, "get"); - Strcat(iname, ckey); + strcpy(iname, "get"); + strcat(iname, ckey); iname[3] = islower(iname[3]) ? toupper(iname[3]) : iname[3]; } @@ -1003,8 +1002,8 @@ static GetKeyValueBinding *newGetStoredBinding(NSString *key, id instance) // Make binding and insert into map if (fptr) { - KeyValueMethod* mkey = Malloc(sizeof(KeyValueMethod)); - GetKeyValueBinding* bin = Malloc(sizeof(GetKeyValueBinding)); + KeyValueMethod* mkey = NSZoneMalloc(NSDefaultMallocZone(), sizeof(KeyValueMethod)); + GetKeyValueBinding* bin = NSZoneMalloc(NSDefaultMallocZone(), sizeof(GetKeyValueBinding)); mkey->key = [key copy]; mkey->class = [instance class]; @@ -1039,12 +1038,12 @@ static SetKeyValueBinding *newSetBinding(NSString *key, id instance, id value) const char *ckey = [key cString]; SEL sel; struct objc_method *mth; - char sname[Strlen(ckey)+7]; + char sname[strlen(ckey)+7]; // Make sel from name - Strcpy(sname, "set"); - Strcat(sname, ckey); - Strcat(sname, ":"); + strcpy(sname, "set"); + strcat(sname, ckey); + strcat(sname, ":"); sname[3] = islower(sname[3]) ? toupper(sname[3]) : sname[3]; sel = sel_get_any_uid(sname); @@ -1146,7 +1145,7 @@ static SetKeyValueBinding *newSetBinding(NSString *key, id instance, id value) !fptr && class->ivars && i < class->ivars->ivar_count; i++) { - if (!Strcmp(testKey, class->ivars->ivar_list[i].ivar_name)) + if (!strcmp(testKey, class->ivars->ivar_list[i].ivar_name)) { // NSDebugFLog(@"Found"); @@ -1218,8 +1217,8 @@ static SetKeyValueBinding *newSetBinding(NSString *key, id instance, id value) if (fptr) { - KeyValueMethod *mkey = Malloc(sizeof(KeyValueMethod)); - SetKeyValueBinding *bin = Malloc(sizeof(SetKeyValueBinding)); + KeyValueMethod *mkey = NSZoneMalloc(NSDefaultMallocZone(), sizeof(KeyValueMethod)); + SetKeyValueBinding *bin = NSZoneMalloc(NSDefaultMallocZone(), sizeof(SetKeyValueBinding)); mkey->key = [key copy]; mkey->class = [instance class]; @@ -1251,18 +1250,18 @@ static SetKeyValueBinding *newSetStoredBinding(NSString *key, id instance, id va { Class class = [instance class]; const char* ckey = [key cString]; - char iname[Strlen(ckey) + 2]; + char iname[strlen(ckey) + 2]; int i; // Make ivar from name - Strcpy(iname, "_"); - Strcat(iname, ckey); + strcpy(iname, "_"); + strcat(iname, ckey); while (class) { for (i = 0; class->ivars && i < class->ivars->ivar_count; i++) { - if (!Strcmp(iname, class->ivars->ivar_list[i].ivar_name)) + if (!strcmp(iname, class->ivars->ivar_list[i].ivar_name)) { switch (*objc_skip_type_qualifiers(class->ivars->ivar_list[i].ivar_type)) { @@ -1327,12 +1326,12 @@ static SetKeyValueBinding *newSetStoredBinding(NSString *key, id instance, id va const char* ckey = [key cString]; SEL sel; struct objc_method* mth; - char sname[Strlen(ckey) + 7]; + char sname[strlen(ckey) + 7]; // Make sel from name - Strcpy(sname, "_set"); - Strcat(sname, ckey); - Strcat(sname, ":"); + strcpy(sname, "_set"); + strcat(sname, ckey); + strcat(sname, ":"); sname[3] = islower(sname[3]) ? toupper(sname[3]) : sname[3]; sel = sel_get_any_uid(sname); @@ -1409,7 +1408,7 @@ static SetKeyValueBinding *newSetStoredBinding(NSString *key, id instance, id va { for (i = 0; class->ivars && i < class->ivars->ivar_count; i++) { - if (!Strcmp(ckey, class->ivars->ivar_list[i].ivar_name)) + if (!strcmp(ckey, class->ivars->ivar_list[i].ivar_name)) { switch (*objc_skip_type_qualifiers(class->ivars->ivar_list[i].ivar_type)) { @@ -1474,12 +1473,12 @@ static SetKeyValueBinding *newSetStoredBinding(NSString *key, id instance, id va const char* ckey = [key cString]; SEL sel; struct objc_method* mth; - char sname[Strlen(ckey) + 7]; + char sname[strlen(ckey) + 7]; // Make sel from name - Strcpy(sname, "set"); - Strcat(sname, ckey); - Strcat(sname, ":"); + strcpy(sname, "set"); + strcat(sname, ckey); + strcat(sname, ":"); sname[3] = islower(sname[3]) ? toupper(sname[3]) : sname[3]; sel = sel_get_any_uid(sname); @@ -1551,8 +1550,8 @@ static SetKeyValueBinding *newSetStoredBinding(NSString *key, id instance, id va // Make binding and insert into map if (fptr) { - KeyValueMethod* mkey = Malloc(sizeof(KeyValueMethod)); - SetKeyValueBinding* bin = Malloc(sizeof(SetKeyValueBinding)); + KeyValueMethod* mkey = NSZoneMalloc(NSDefaultMallocZone(), sizeof(KeyValueMethod)); + SetKeyValueBinding* bin = NSZoneMalloc(NSDefaultMallocZone(), sizeof(SetKeyValueBinding)); mkey->key = [key copy]; mkey->class = [instance class]; @@ -1595,12 +1594,12 @@ static void mapRetainNothing(NSMapTable *table, KeyValueMethod *map) static void keyValueMapKeyRelease(NSMapTable *table, KeyValueMethod *map) { [map->key release]; - Free(map); + NSZoneFree(NSDefaultMallocZone(), map); } static void keyValueMapValRelease(NSMapTable *table, void *map) { - Free(map); + NSZoneFree(NSDefaultMallocZone(), map); } static NSString *keyValueMapDescribe(NSMapTable *table, KeyValueMethod *map) diff --git a/EOControl/EOKeyValueQualifier.m b/EOControl/EOKeyValueQualifier.m index 3ce91fc..18f07f5 100644 --- a/EOControl/EOKeyValueQualifier.m +++ b/EOControl/EOKeyValueQualifier.m @@ -45,7 +45,6 @@ static char rcsId[] = "$Id$"; #import #import - @implementation EOKeyValueQualifier + (EOKeyValueQualifier *)qualifierWithKey: (NSString *)key diff --git a/EOControl/EOMutableKnownKeyDictionary.h b/EOControl/EOMutableKnownKeyDictionary.h index 1a93941..ce04f32 100644 --- a/EOControl/EOMutableKnownKeyDictionary.h +++ b/EOControl/EOMutableKnownKeyDictionary.h @@ -28,9 +28,7 @@ #define __EOMultipleKnownKeyDictionary_h__ #import -#import -#import -#import +#include @class EOMutableKnownKeyDictionary; diff --git a/EOControl/EONotQualifier.m b/EOControl/EONotQualifier.m index 8295974..a3f1e3f 100644 --- a/EOControl/EONotQualifier.m +++ b/EOControl/EONotQualifier.m @@ -39,7 +39,6 @@ static char rcsId[] = "$Id$"; #import - @implementation EONotQualifier + (EOQualifier *)qualifierWithQualifier: (EOQualifier *)qualifier diff --git a/EOControl/EOOrQualifier.m b/EOControl/EOOrQualifier.m index b25a3ee..6e3c00f 100644 --- a/EOControl/EOOrQualifier.m +++ b/EOControl/EOOrQualifier.m @@ -41,7 +41,6 @@ static char rcsId[] = "$Id$"; #import #import - @implementation EOOrQualifier + (EOQualifier *)qualifierWithQualifierArray: (NSArray *)array diff --git a/EOControl/EOQualifier.m b/EOControl/EOQualifier.m index be7d1d0..c4ce819 100644 --- a/EOControl/EOQualifier.m +++ b/EOControl/EOQualifier.m @@ -40,10 +40,7 @@ static char rcsId[] = "$Id$"; #import #import -#import -#import -#import -#import +#import #import #import diff --git a/EOControl/GNUmakefile b/EOControl/GNUmakefile index 0221e7b..9040a2f 100644 --- a/EOControl/GNUmakefile +++ b/EOControl/GNUmakefile @@ -34,7 +34,7 @@ include ../Version # The library to be compiled LIBRARY_NAME=libgnustep-db2control -libgnustep-db2control_LIBRARIES_DEPEND_UPON = -lgnustep-base -lFoundationExt +libgnustep-db2control_LIBRARIES_DEPEND_UPON = -lgnustep-base # The C source files to be compiled libgnustep-db2control_C_FILES = @@ -95,7 +95,9 @@ EODataSource.h \ EODetailDataSource.h \ EOUndoManager.h \ EODebug.h \ -EOControl.h +EOControl.h \ +GCObject.h + gdl2control_AUTOGSDOC_HEADERS = $(libgnustep-db2control_HEADER_FILES) gdl2control_AUTOGSDOC_SOURCE = $(libgnustep-db2control_OBJC_FILES) diff --git a/EOModeler/GNUmakefile b/EOModeler/GNUmakefile index a789cbf..66e28b7 100644 --- a/EOModeler/GNUmakefile +++ b/EOModeler/GNUmakefile @@ -34,7 +34,7 @@ include ../Version # The library to be compiled LIBRARY_NAME=libgnustep-db2modeler -libgnustep-db2modeler_LIBRARIES_DEPEND_UPON = -lgnustep-base -lFoundationExt +libgnustep-db2modeler_LIBRARIES_DEPEND_UPON = -lgnustep-base # The C source files to be compiled libgnustep-db2modeler_C_FILES = diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile index fc851b8..c361979 100644 --- a/Tools/GNUmakefile +++ b/Tools/GNUmakefile @@ -34,7 +34,7 @@ include ../Version # The library to be compiled TOOL_NAME=gdlgsdoc -LIBRARIES_DEPEND_UPON=-lgnustep-base -lFoundationExt -lgnustep-db2control -lgnustep-db2 +LIBRARIES_DEPEND_UPON=-lgnustep-base -lgnustep-db2control -lgnustep-db2 # The C source files to be compiled gdlgsdoc_C_FILES = diff --git a/gdl2.make.in b/gdl2.make.in index db8ef7a..92c6541 100644 --- a/gdl2.make.in +++ b/gdl2.make.in @@ -42,8 +42,4 @@ else AUXILIARY_TOOL_LIBS += -lgnustep-db2 -lgnustep-db2control endif - -# We depend upon the Foundation Extensions Library -include $(GNUSTEP_MAKEFILES)/extensions.make - endif