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

Some cleanup

Browse source
This commit is contained in:
Gregory John Casamento 2023-12-14 12:54:53 -05:00
parent 67fcd40ecf
commit 68f37e4626
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Plugins/Xib/GormXibWrapperLoader.h
View file

@ -31,8 +31,8 @@
@interface GormXibWrapperLoader : GormWrapperLoader @interface GormXibWrapperLoader : GormWrapperLoader
{ {
IBObjectContainer *container; IBObjectContainer *_container;
id nibFilesOwner; id _nibFilesOwner;
} }
@end @end

18
Plugins/Xib/GormXibWrapperLoader.m
View file

@ -162,8 +162,8 @@
// //
// decode // decode
// //
container = [u decodeObjectForKey: @"IBDocument.Objects"]; _container = [u decodeObjectForKey: @"IBDocument.Objects"];
if (container == nil || [container isKindOfClass: [IBObjectContainer class]] == NO) if (_container == nil || [_container isKindOfClass: [IBObjectContainer class]] == NO)
{ {
result = NO; result = NO;
} }
@ -175,7 +175,7 @@
id xibFontManager = nil; id xibFontManager = nil;
rootObjects = [u decodeObjectForKey: @"IBDocument.RootObjects"]; rootObjects = [u decodeObjectForKey: @"IBDocument.RootObjects"];
nibFilesOwner = [rootObjects objectAtIndex: 0]; _nibFilesOwner = [rootObjects objectAtIndex: 0];
xibFirstResponder = [rootObjects objectAtIndex: 1]; xibFirstResponder = [rootObjects objectAtIndex: 1];
docFilesOwner = [doc filesOwner]; docFilesOwner = [doc filesOwner];
// xibFontManager = [self _findFontManager: rootObjects]; // xibFontManager = [self _findFontManager: rootObjects];
@ -183,9 +183,9 @@
// //
// set the current class on the File's owner... // set the current class on the File's owner...
// //
if ([nibFilesOwner isKindOfClass: [GormObjectProxy class]]) if ([_nibFilesOwner isKindOfClass: [GormObjectProxy class]])
{ {
[docFilesOwner setClassName: [nibFilesOwner className]]; [docFilesOwner setClassName: [_nibFilesOwner className]];
} }
// //
@ -199,7 +199,7 @@
NSString *objName = nil; NSString *objName = nil;
// skip the file's owner, it is handled above... // skip the file's owner, it is handled above...
if ((obj == nibFilesOwner) if ((obj == _nibFilesOwner)
|| (obj == xibFirstResponder) || (obj == xibFirstResponder)
|| (obj == xibFontManager)) || (obj == xibFontManager))
{ {
@ -332,7 +332,7 @@
/* /*
* add connections... * add connections...
*/ */
en = [container connectionRecordEnumerator]; en = [_container connectionRecordEnumerator];
while ((cr = [en nextObject]) != nil) while ((cr = [en nextObject]) != nil)
{ {
IBConnection *conn = [cr connection]; IBConnection *conn = [cr connection];
@ -449,14 +449,14 @@
if ([obj isKindOfClass: [NSWindowTemplate class]]) if ([obj isKindOfClass: [NSWindowTemplate class]])
{ {
GormClassManager *classManager = [document classManager]; GormClassManager *classManager = [document classManager];
Class clz; // Class clz;
NSString *className = [obj className]; NSString *className = [obj className];
if([classManager isCustomClass: className]) if([classManager isCustomClass: className])
{ {
className = [classManager nonCustomSuperClassOf: className]; className = [classManager nonCustomSuperClassOf: className];
} }
clz = [unarchiver classForClassName: className]; // clz = [unarchiver classForClassName: className];
} }
else if ([obj isKindOfClass: [NSMatrix class]]) else if ([obj isKindOfClass: [NSMatrix class]])
{ {