gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove all while loops and replace with FOR_IN

Browse source
This commit is contained in:
Gregory John Casamento 2020-07-14 05:38:31 -04:00
parent c10330384b
commit 33901987e7
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Source/GSStoryboardTransform.m
View file

@ -406,26 +406,25 @@
NSXMLElement *objects = (NSXMLElement *)[appNode parent];
NSArray *appConsArr = [appNode nodesForXPath: @"connections" error: NULL];
NSXMLNode *appCons = [appConsArr objectAtIndex: 0];
if (appCons != nil)
{
[appCons detach];
}
NSArray *appChildren = [appNode children];
NSEnumerator *ace = [appChildren objectEnumerator];
NSXMLElement *ae = nil;
// Assign application scene...
ASSIGN(_applicationSceneId, sceneId);
[_controllerMap setObject: _applicationSceneId
forKey: APPLICATION];
// Move all application children to objects...
while ((ae = [ace nextObject]) != nil)
NSArray *appChildren = [appNode children];
FOR_IN(NSXMLElement*, ae, appChildren)
{
[ae detach];
[objects addChild: ae];
}
END_FOR_IN(appChildren);
// Remove the appNode
[appNode detach];
@ -535,20 +534,18 @@
NSXMLNode *attr = [ce attributeForName: @"id"];
controllerId = [attr stringValue];
NSEnumerator *windowControllerEnum = [windowControllers objectEnumerator];
NSXMLElement *o = nil;
while ((o = [windowControllerEnum nextObject]) != nil)
FOR_IN(NSXMLElement*, o, windowControllers)
{
NSXMLElement *objects = (NSXMLElement *)[o parent];
NSArray *windows = [o nodesForXPath: @"//window" error: NULL];
NSEnumerator *windowEn = [windows objectEnumerator];
NSXMLNode *w = nil;
while ((w = [windowEn nextObject]) != nil)
FOR_IN(NSXMLNode*, w, windows)
{
[w detach];
[objects addChild: w];
}
END_FOR_IN(windows);
}
END_FOR_IN(windowControllers);
}
if ([viewControllers count] > 0)