gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-04-22 22:20:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update for latest base library

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@29852 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2010-03-05 10:52:41 +00:00
parent 84f574ff04
commit bb91ba25e5
2 changed files with 8 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2010-03-05 Richard Frith-Macdonald <rfm@gnu.org>
* GormCore/GormFunctions.m: update for latest base library.
2010-02-24 17:55-EST Gregory John Casamento <greg.casamento@gmail.com>
* Palettes/2Controls/ControlsPalette.tiff

85
GormCore/GormFunctions.m
View file

@ -349,59 +349,11 @@ NSString *formatOutlet(NSString *outlet)
*/
NSArray *_GSObjCMethodNamesForClass(Class class, BOOL collect)
{
NSMutableSet *set;
NSArray *array;
GSMethodList methods;
if (class == nil)
{
return nil;
}
/*
* Add names to a set so methods declared in superclasses
* and then overridden do not appear more than once.
*/
set = [[NSMutableSet alloc] initWithCapacity: 32];
while (class != nil)
{
void *iterator = 0;
while ((methods = class_nextMethodList(class, &iterator)))
{
int i;
for (i = 0; i < methods->method_count; i++)
{
GSMethod method = &methods->method_list[i];
if (method->method_name != 0)
{
NSString *name;
const char *cName;
cName = GSNameFromSelector(method->method_name);
name = [[NSString alloc] initWithUTF8String: cName];
[set addObject: name];
RELEASE(name);
}
}
}
// if we should collect all of the superclass methods, then iterate
// up the chain.
if(collect)
{
class = class->super_class;
}
else
{
class = nil;
}
}
array = [set allObjects];
RELEASE(set);
return array;
return GSObjCMethodNames((id)&class, collect);
}
/**
@ -412,40 +364,11 @@ NSArray *_GSObjCMethodNamesForClass(Class class, BOOL collect)
*/
NSArray *_GSObjCVariableNames(Class class, BOOL collect)
{
NSMutableArray *array;
struct objc_ivar_list *ivars;
array = [NSMutableArray arrayWithCapacity: 16];
while (class != nil)
if (class == nil)
{
ivars = class->ivars;
if (ivars != 0)
{
int i;
for (i = 0; i < ivars->ivar_count; i++)
{
NSString *name;
name = [[NSString alloc] initWithUTF8String:
ivars->ivar_list[i].ivar_name];
[array addObject: name];
RELEASE(name);
}
}
// if we should collect all of the superclass methods, then iterate
// up the chain.
if(collect)
{
class = class->super_class;
}
else
{
class = nil;
}
return nil;
}
return array;
return GSObjCVariableNames((id)&class, collect);
}