From 94949123edffa349e0e42dac64943c6737299922 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Fri, 4 Jan 2008 12:01:29 -0800 Subject: [PATCH] Refactoring _registerController --- English.lproj/Debugger.nib/classes.nib | 4 ++-- English.lproj/Debugger.nib/keyedobjects.nib | Bin 17617 -> 17629 bytes Source/DebuggerWindowController.h | 2 +- Source/DebuggerWindowController.m | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/English.lproj/Debugger.nib/classes.nib b/English.lproj/Debugger.nib/classes.nib index b249ad1..97f1b0d 100644 --- a/English.lproj/Debugger.nib/classes.nib +++ b/English.lproj/Debugger.nib/classes.nib @@ -28,8 +28,6 @@ NSTextField _reconnectButton NSButton - _registerController - NSTreeController _registerView NSOutlineView _runButton @@ -46,6 +44,8 @@ NSButton _stepOverButton NSButton + registerController + NSTreeController stackController NSArrayController diff --git a/English.lproj/Debugger.nib/keyedobjects.nib b/English.lproj/Debugger.nib/keyedobjects.nib index 00dfa60dbd5e002ddb48b31a8979d5c4a595f4f3..39c23c2d7bb3dc15de15e1aa4c73fa06d7d82383 100644 GIT binary patch delta 4024 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 delta 3921 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 diff --git a/Source/DebuggerWindowController.h b/Source/DebuggerWindowController.h index 5d0276a..36c41c8 100644 --- a/Source/DebuggerWindowController.h +++ b/Source/DebuggerWindowController.h @@ -25,7 +25,7 @@ IBOutlet NSArrayController *stackController; NSArray *stack; - IBOutlet NSTreeController *_registerController; + IBOutlet NSTreeController *registerController; IBOutlet NSOutlineView *_registerView; NSMutableArray *_expandedRegisters; diff --git a/Source/DebuggerWindowController.m b/Source/DebuggerWindowController.m index 3c96f27..ef170c6 100644 --- a/Source/DebuggerWindowController.m +++ b/Source/DebuggerWindowController.m @@ -153,8 +153,8 @@ // sh!t when used with NSTreeController. http://www.cocoadev.com/index.pl?NSTreeControllerBugOrDeveloperError // was the inspiration for this fix (below) but the author says that inserting does not work too well, but // that's okay for us as we just need to replace the entire thing. - [_registerController setContent:nil]; - [_registerController setContent:[[elm rootElement] children]]; + [registerController setContent:nil]; + [registerController setContent:[[elm rootElement] children]]; for (int i = 0; i < [_registerView numberOfRows]; i++) { @@ -296,10 +296,10 @@ NSIndexPath *masterPath = [node indexPath]; for (int i = 0; i < [children count]; i++) { - [_registerController insertObject:[children objectAtIndex:i] atArrangedObjectIndexPath:[masterPath indexPathByAddingIndex:i]]; + [registerController insertObject:[children objectAtIndex:i] atArrangedObjectIndexPath:[masterPath indexPathByAddingIndex:i]]; } - [_registerController rearrangeObjects]; + [registerController rearrangeObjects]; } @end -- 2.22.5