Remove dependency on the obsolete Extensions library.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@15102 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-11-25 20:01:43 +00:00
parent 025039b819
commit 9931b82a55
43 changed files with 130 additions and 173 deletions

View file

@ -1,3 +1,12 @@
2002-11-25 Richard Frith-macdonald <rfm@gnu.org>
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 <rfm@gnu.org>
* EOAdaptors/Makefile.postamble: New file to clean configure

View file

@ -27,8 +27,6 @@
#ifndef __EOAccess_h__
#define __EOAccess_h__
#import <extensions/objc-runtime.h>
#import <Foundation/NSArray.h>
#import <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSBundle.h>

View file

@ -52,9 +52,7 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSUtilities.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSProcessInfo.h>
#import <extensions/NSException.h>
#import <extensions/exceptions/GeneralExceptions.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOAdaptor.h>
#import <EOAccess/EOAdaptorPriv.h>

View file

@ -27,7 +27,7 @@
#ifndef __EOAdaptorChannel_h__
#define __EOAdaptorChannel_h__
#import <extensions/NSException.h>
#import <Foundation/NSException.h>
#import <EOControl/EOFetchSpecification.h>

View file

@ -37,9 +37,7 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSDate.h>
#import <Foundation/NSValue.h>
#import <extensions/NSException.h>
#import <extensions/exceptions/GeneralExceptions.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EOEntity.h>

View file

@ -34,8 +34,7 @@
static char rcsId[] = "$Id$";
#import <Foundation/NSObject.h>
#import <extensions/NSException.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EODatabaseOperation.h>

View file

@ -30,10 +30,9 @@
#import <Foundation/NSString.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSDate.h>
#import <Foundation/NSException.h>
#import <extensions/GCObject.h>
#import <extensions/GCArray.h>
#import <extensions/NSException.h>
#include <gnustep/base/GCObject.h>
#import <EOAccess/EOPropertyListEncoding.h>

View file

@ -41,8 +41,7 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSUtilities.h>
#import <Foundation/NSArchiver.h>
#import <Foundation/NSObjCRuntime.h>
#import <extensions/NSException.h>
#import <extensions/exceptions/GeneralExceptions.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EOModel.h>

View file

@ -42,9 +42,6 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSValue.h>
#import <Foundation/NSUtilities.h>
#import <extensions/NSException.h>
#import <extensions/exceptions/GeneralExceptions.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EOAccessFault.h>
#import <EOAccess/EOAdaptor.h>

View file

@ -47,9 +47,6 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSZone.h>
#import <Foundation/NSNotification.h>
#import <extensions/NSException.h>
#import <extensions/exceptions/GeneralExceptions.h>
#import <EOAccess/EOAdaptor.h>
#import <EOAccess/EOAdaptorContext.h>
#import <EOAccess/EOModel.h>
@ -5196,6 +5193,7 @@ Raises an exception is the adaptor is unable to perform the operations.
EOFLOGObjectLevelArgs(@"EODatabaseContext", @"** 4");
}
@end
@implementation EODatabaseContext (EODatabaseContextPrivate)

View file

@ -35,7 +35,7 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSObject.h>
#import <extensions/NSException.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EODatabaseOperation.h>

View file

@ -28,14 +28,11 @@
#define __EOEntity_h__
#import <Foundation/NSString.h>
#import <extensions/GCObject.h>
#import <extensions/GCArray.h>
#import <extensions/GCDictionary.h>
#import <extensions/NSException.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOPropertyListEncoding.h>
#import <EOControl/EOClassDescription.h>
#include <gnustep/base/GCObject.h>
@class EOModel;
@class EOAttribute;

View file

@ -39,10 +39,9 @@ static char rcsId[] = "$Id$";
#import <ctype.h>
#import <Foundation/Foundation.h>
#import <Foundation/NSException.h>
#import <extensions/GCArray.h>
#import <extensions/NSException.h>
#import <extensions/exceptions/GeneralExceptions.h>
#include <gnustep/base/GCObject.h>
#import <EOAccess/EOModel.h>
#import <EOAccess/EOEntity.h>
@ -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

View file

@ -28,7 +28,7 @@
#define __EOExpressionArray_h__
#import <Foundation/NSString.h>
#import <extensions/GCArray.h>
#include <gnustep/base/GCObject.h>
@class EOAttribute;
@class EOEntity;

View file

@ -41,11 +41,9 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSDate.h>
#import <Foundation/NSException.h>
#import <extensions/objc-runtime.h>
#import <extensions/NSException.h>
#import <extensions/GarbageCollector.h>
#import <extensions/exceptions/GeneralExceptions.h>
#include <gnustep/base/behavior.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EOEntity.h>

View file

@ -27,9 +27,7 @@
#ifndef __EOJoin_h__
#define __EOJoin_h__
#import <extensions/GCObject.h>
#import <extensions/GCArray.h>
#include <gnustep/base/GCObject.h>
@class EOEntity;
@class EOAttribute;

View file

@ -28,9 +28,7 @@
#define __EOModel_h__
#import <Foundation/NSString.h>
#import <extensions/GCObject.h>
#import <extensions/GCArray.h>
#import <extensions/GCDictionary.h>
#include <gnustep/base/GCObject.h>
#import <EOAccess/EOPropertyListEncoding.h>

View file

@ -41,8 +41,7 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSUtilities.h>
#import <Foundation/NSObjCRuntime.h>
#import <extensions/NSException.h>
#import <extensions/exceptions/GeneralExceptions.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOModel.h>
#import <EOAccess/EOEntity.h>

View file

@ -27,8 +27,7 @@
#ifndef __EOModelGroup_h__
#define __EOModelGroup_h__
#import <extensions/GCObject.h>
#import <EOControl/EOControl.h>
#include <EOControl/EOControl.h>
@class EOModel;

View file

@ -29,8 +29,7 @@
#import <Foundation/NSString.h>
#import <extensions/GCObject.h>
#import <extensions/GCArray.h>
#include <gnustep/base/GCObject.h>
#import <EOControl/EOClassDescription.h>
#import <EOControl/EOQualifier.h>

View file

@ -41,8 +41,7 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSArray.h>
#import <Foundation/NSUtilities.h>
#import <extensions/NSException.h>
#import <extensions/exceptions/GeneralExceptions.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOModel.h>
#import <EOAccess/EOAttribute.h>
@ -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

View file

@ -45,10 +45,7 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSUtilities.h>
#import <Foundation/NSException.h>
#import <extensions/NSException.h>
#import <extensions/DefaultScannerHandler.h>
#import <extensions/PrintfFormatScanner.h>
#import <extensions/exceptions/GeneralExceptions.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOEntity.h>
#import <EOAccess/EOAttribute.h>

View file

@ -40,10 +40,7 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSSet.h>
#import <Foundation/NSUtilities.h>
#import <extensions/NSException.h>
#import <extensions/DefaultScannerHandler.h>
#import <extensions/PrintfFormatScanner.h>
#import <extensions/exceptions/GeneralExceptions.h>
#import <Foundation/NSException.h>
#import <EOAccess/EOAccess.h>

View file

@ -28,7 +28,7 @@
#define __EOStoredProcedure_h__
#import <Foundation/Foundation.h>
#import <extensions/GCObject.h>
#import <gnustep/base/GCObject.h>
#import <EOAccess/EOPropertyListEncoding.h>
@class EOModel;

View file

@ -33,7 +33,7 @@
static char rcsId[] = "$Id$";
#import <extensions/GCArray.h>
#include <gnustep/base/GCObject.h>
#import <EOAccess/EOStoredProcedure.h>
#import <EOAccess/EOAttribute.h>

View file

@ -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 =

View file

@ -44,7 +44,6 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOQualifier.h>
#import <EOControl/EODebug.h>
@implementation EOAndQualifier
+ (EOQualifier *)qualifierWithQualifierArray: (NSArray *)array

View file

@ -46,6 +46,7 @@
#import <EOControl/EODetailDataSource.h>
#import <EOControl/EOObserver.h>
#import <EOControl/EODebug.h>
#include <gnustep/base/GCObject.h>
#endif /* __EOControl_h__ */

View file

@ -32,6 +32,8 @@
#include <Foundation/Foundation.h>
#include <gnustep/base/GCObject.h>
@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;
}

View file

@ -47,9 +47,8 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSString.h>
#import <Foundation/NSObjCRuntime.h>
#import <extensions/NSException.h>
#import <extensions/objc-runtime.h>
#import <extensions/exceptions/GeneralExceptions.h>
#include <Foundation/NSException.h>
#include <objc/objc-api.h>
#import <EOControl/EOControl.h>
#import <EOControl/EOFault.h>

View file

@ -40,9 +40,8 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSString.h>
#import <Foundation/NSObjCRuntime.h>
#import <extensions/NSException.h>
#import <extensions/exceptions/GeneralExceptions.h>
#import <extensions/GCObject.h>
#import <Foundation/NSException.h>
#include <gnustep/base/GCObject.h>
#import <EOControl/EOControl.h>
#import <EOControl/EOFault.h>
@ -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;
}

View file

@ -41,7 +41,6 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOKeyValueCoding.h>
#import <EOControl/EODebug.h>
@implementation EOKeyComparisonQualifier
+ (EOQualifier *)qualifierWithLeftKey: (NSString *)leftKey

View file

@ -52,9 +52,8 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSDecimalNumber.h>
#import <Foundation/NSDebug.h>
#import <extensions/NSException.h>
#import <extensions/exceptions/GeneralExceptions.h>
#import <extensions/objc-runtime.h>
#include <Foundation/NSException.h>
#include <objc/objc-api.h>
#import <EOControl/EOControl.h>
#import <EOControl/EOKeyValueCoding.h>

View file

@ -49,9 +49,8 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSDecimalNumber.h>
#import <Foundation/NSDebug.h>
#import <extensions/NSException.h>
#import <extensions/exceptions/GeneralExceptions.h>
#import <extensions/objc-runtime.h>
#include <Foundation/NSException.h>
#include <objc/objc-api.h>
#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)

View file

@ -45,7 +45,6 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOEditingContext.h>
#import <EOControl/EODebug.h>
@implementation EOKeyValueQualifier
+ (EOKeyValueQualifier *)qualifierWithKey: (NSString *)key

View file

@ -28,9 +28,7 @@
#define __EOMultipleKnownKeyDictionary_h__
#import <Foundation/Foundation.h>
#import <extensions/GCObject.h>
#import <extensions/GCArray.h>
#import <extensions/GCDictionary.h>
#include <gnustep/base/GCObject.h>
@class EOMutableKnownKeyDictionary;

View file

@ -39,7 +39,6 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOQualifier.h>
@implementation EONotQualifier
+ (EOQualifier *)qualifierWithQualifier: (EOQualifier *)qualifier

View file

@ -41,7 +41,6 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOControl.h>
#import <EOControl/EOQualifier.h>
@implementation EOOrQualifier
+ (EOQualifier *)qualifierWithQualifierArray: (NSArray *)array

View file

@ -40,10 +40,7 @@ static char rcsId[] = "$Id$";
#import <Foundation/NSSet.h>
#import <Foundation/NSUtilities.h>
#import <extensions/NSException.h>
#import <extensions/DefaultScannerHandler.h>
#import <extensions/PrintfFormatScanner.h>
#import <extensions/exceptions/GeneralExceptions.h>
#import <Foundation/NSException.h>
#import <EOControl/EOControl.h>
#import <EOControl/EOQualifier.h>

View file

@ -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)

View file

@ -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 =

View file

@ -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 =

View file

@ -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