removed some c99-isms

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@25876 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Riccardo Mottola 2008-01-06 00:18:42 +00:00
parent 1ce306e181
commit 11fd9e5214
2 changed files with 18 additions and 8 deletions

View file

@ -1,5 +1,6 @@
2008-01-04 Riccardo Mottola <riccardo@kaffe.org>
* GormCore/GormGormWrapperLoader.m: removed some c99-isms
* GormCore/GormNibWrapperLoader.m: removed some c99-isms
2008-01-04 18:38-EST Gregory John Casamento <greg_casamento@yahoo.com>

View file

@ -94,6 +94,13 @@
if ([super loadFileWrapper: wrapper withDocument: doc])
{
GormClassManager *classManager = [document classManager];
id docFilesOwner;
NSMapTable objects;
NSArray *objs;
NSEnumerator *en;
id o;
NSMapTable *classes;
NSArray *classKeys;
key = nil;
fileWrappers = [wrapper fileWrappers];
@ -170,11 +177,11 @@
}
nibFilesOwner = [container objectForName: @"File's Owner"];
id docFilesOwner = [document filesOwner];
NSMapTable objects = [container names];
NSArray *objs = NSAllMapTableKeys(objects);
NSEnumerator *en = [objs objectEnumerator];
id o = nil;
docFilesOwner = [document filesOwner];
objects = [container names];
objs = NSAllMapTableKeys(objects);
en = [objs objectEnumerator];
o = nil;
//
// set the current class on the File's owner...
@ -233,8 +240,8 @@
//
// Add custom classes...
//
NSMapTable *classes = [container classes];
NSArray *classKeys = NSAllMapTableKeys(classes);
classes = [container classes];
classKeys = NSAllMapTableKeys(classes);
en = [classKeys objectEnumerator];
while((o = [en nextObject]) != nil)
{
@ -346,12 +353,14 @@
if([obj isKindOfClass: [NSWindowTemplate class]])
{
GormClassManager *classManager = [document classManager];
Class clz ;
NSString *className = [obj className];
if([classManager isCustomClass: className])
{
className = [classManager nonCustomSuperClassOf: className];
}
Class clz = [unarchiver classForClassName: className];
clz = [unarchiver classForClassName: className];
[obj setBaseWindowClass: clz];
}
else if([obj respondsToSelector: @selector(setTarget:)] &&