Make the asterisk attached to the type, rather than the variable.
authorRobert Sesek <rsesek@bluestatic.org>
Sun, 10 May 2009 14:08:37 +0000 (10:08 -0400)
committerRobert Sesek <rsesek@bluestatic.org>
Sun, 10 May 2009 14:08:37 +0000 (10:08 -0400)
29 files changed:
Source/AppDelegate.h
Source/AppDelegate.m
Source/BSLineNumberView.h
Source/BSLineNumberView.m
Source/BSSourceView.h
Source/BSSourceView.m
Source/BSSourceViewTextView.h
Source/BSSplitView.m
Source/Breakpoint.h
Source/Breakpoint.m
Source/BreakpointController.h
Source/BreakpointController.m
Source/BreakpointManager.h
Source/BreakpointManager.m
Source/DebuggerController.h
Source/DebuggerController.m
Source/GDBpConnection.h
Source/GDBpConnection.m
Source/NSXMLElementAdditions.h
Source/NSXMLElementAdditions.m
Source/PreferencesController.h
Source/PreferencesController.m
Source/PreferencesPathsArrayController.m
Source/SocketWrapper.h
Source/SocketWrapper.m
Source/StackController.h
Source/StackController.m
Source/StackFrame.h
Source/StackFrame.m

index 0f43d76530a8540c02b4ff340704631e1baf256a..17637214d828fc110898cc2450d7123db0718b7f 100644 (file)
 
 @interface AppDelegate : NSObject
 {
-       IBOutlet DebuggerController *debugger;
-       IBOutlet BreakpointController *breakpoint;
-       PreferencesController *prefs;
+       IBOutlet DebuggerControllerdebugger;
+       IBOutlet BreakpointControllerbreakpoint;
+       PreferencesControllerprefs;
 }
 
-@property(readonly) DebuggerController *debugger;
-@property(readonly) BreakpointController *breakpoint;
+@property(readonly) DebuggerControllerdebugger;
+@property(readonly) BreakpointControllerbreakpoint;
 
 - (IBAction)showDebuggerWindow:(id)sender;
 - (IBAction)showInspectorWindow:(id)sender;
index 942234a3115e887d59c84ce862a0c387ddcbede5..b984a8c279e5111ea06035853ef34a965489fd87 100644 (file)
@@ -39,7 +39,7 @@
 {
        NSAutoreleasePool* pool = [NSAutoreleasePool new];
 
-       NSDictionary *dict = [[NSDictionary alloc] initWithObjectsAndKeys:
+       NSDictionarydict = [[NSDictionary alloc] initWithObjectsAndKeys:
                [NSNumber numberWithInt:9000], @"Port",
                @"macgdbp", @"IDEKey",
                [NSNumber numberWithBool:YES], @"BreakpointsWindowVisible",
index 1b52d4b05e072e4a1702638eb9ee61174c2fa4db..1a05efc7a687a9cd9e94295c80b19fa05c1708f9 100644 (file)
 
 @interface BSLineNumberView : NSView
 {
-       BSSourceView *sourceView;
+       BSSourceViewsourceView;
        NSRange lineNumberRange;
-       NSSet *markers;
+       NSSetmarkers;
 }
 
-@property(readwrite, assign) BSSourceView *sourceView;
+@property(readwrite, assign) BSSourceViewsourceView;
 @property(readonly) NSRange lineNumberRange;
-@property(readwrite, retain) NSSet *markers;
+@property(readwrite, retain) NSSetmarkers;
 
 @end
index 9931edc18dff881cf9e8e617f373a294ef7d3659..d0e132078454603ccdce44908eb7eaa88df35d86 100644 (file)
@@ -62,7 +62,7 @@
        [NSBezierPath strokeLineFromPoint:NSMakePoint(rect.origin.x, rect.size.height) toPoint:NSMakePoint(rect.origin.x + rect.size.width, rect.size.height)];
        
        // font attributes for the line number
-       NSDictionary *attrs = [NSDictionary dictionaryWithObjectsAndKeys:[NSFont fontWithName:@"Monaco" size:9.0], NSFontAttributeName, [NSColor grayColor], NSForegroundColorAttributeName, nil];
+       NSDictionaryattrs = [NSDictionary dictionaryWithObjectsAndKeys:[NSFont fontWithName:@"Monaco" size:9.0], NSFontAttributeName, [NSColor grayColor], NSForegroundColorAttributeName, nil];
        
        lineNumberRange = NSMakeRange(0, 0);
        
                {
                        lineNumberRange.location = (lineNumberRange.length == 0 ? line : lineNumberRange.location);
                        lineNumberRange.length++;
-                       NSString *num = [NSString stringWithFormat:@"%u", line];
+                       NSStringnum = [NSString stringWithFormat:@"%u", line];
                        NSSize strSize = [num sizeWithAttributes:attrs];
                        [num drawAtPoint:NSMakePoint([self frame].size.width - strSize.width - 3, fragRect.origin.y + ((fragRect.size.height - strSize.height) / 2)) withAttributes:attrs];
-                       Breakpoint *test = [[Breakpoint alloc] initWithLine:line inFile:[sourceView file]];
+                       Breakpointtest = [[Breakpoint alloc] initWithLine:line inFile:[sourceView file]];
                        if ([markers containsObject:test])
                        {
                                [self drawMarkerInRect:fragRect];
 /**
  * Handles the mouse down event (which is adding, deleting, and toggling breakpoints)
  */
-- (void)mouseDown:(NSEvent *)event
+- (void)mouseDown:(NSEvent*)event
 {
-       NSTextView *textView = [sourceView textView];
+       NSTextViewtextView = [sourceView textView];
        
        NSPoint clickLoc = [self convertPoint:[event locationInWindow] fromView:nil];
        
  */
 - (void)drawMarkerInRect:(NSRect)rect
 {
-       NSBezierPath *path = [NSBezierPath bezierPath];
+       NSBezierPathpath = [NSBezierPath bezierPath];
        
        [path moveToPoint:NSMakePoint(rect.origin.x + 2, rect.origin.y + 2)]; // initial origin
        [path lineToPoint:NSMakePoint(rect.size.width - 7, rect.origin.y + 2)]; // upper right
index 47e9b14d2c62e9544592422107c880c77dec89a4..9cea85bfa62a5cf10a6e169972a1ac38049429d8 100644 (file)
 
 @interface BSSourceView : NSView
 {
-       BSLineNumberView *numberView;
-       BSSourceViewTextView *textView;
-       NSScrollView *scrollView;
+       BSLineNumberViewnumberView;
+       BSSourceViewTextViewtextView;
+       NSScrollViewscrollView;
        
-       NSString *file;
+       NSStringfile;
        int markedLine;
        
        id delegate;
 }
 
-@property(readwrite, assign) BSLineNumberView *numberView;
-@property(readwrite, assign) BSSourceViewTextView *textView;
-@property(readwrite, assign) NSScrollView *scrollView;
-@property(readwrite, assign) NSString *file;
+@property(readwrite, assign) BSLineNumberViewnumberView;
+@property(readwrite, assign) BSSourceViewTextViewtextView;
+@property(readwrite, assign) NSScrollViewscrollView;
+@property(readwrite, assign) NSStringfile;
 @property(readwrite, assign) int markedLine;
 @property(readwrite, assign) id delegate;
 
-- (void)setFile:(NSString *)f;
-- (void)setString:(NSString *)source asFile:(NSString *)path;
+- (void)setFile:(NSString*)f;
+- (void)setString:(NSString*)source asFile:(NSString*)path;
 - (void)scrollToLine:(int)line;
 
 @end
 
 @interface NSObject (BSSourceViewDelegate)
-- (void)gutterClickedAtLine:(int)line forFile:(NSString *)file;
+- (void)gutterClickedAtLine:(int)line forFile:(NSString*)file;
 @end
index a18f119ae27072a09da87ba0c6be80c6ffd56743..73d082025f5a70d12b9d64b97a706a320797188a 100644 (file)
@@ -18,7 +18,7 @@
 
 @interface BSSourceView (Private)
 - (void)setupViews;
-- (void)errorHighlightingFile:(NSNotification *)notif;
+- (void)errorHighlightingFile:(NSNotification*)notif;
 @end
 
 @implementation BSSourceView
@@ -60,7 +60,7 @@
 /**
  * Sets the file name as well as the text of the source view
  */
-- (void)setFile:(NSString *)f
+- (void)setFile:(NSString*)f
 {
        if (file != f)
        {
@@ -77,9 +77,9 @@
        @try
        {
                // Attempt to use the PHP CLI to highlight the source file as HTML
-               NSPipe *outPipe = [NSPipe pipe];
-               NSPipe *errPipe = [NSPipe pipe];
-               NSTask *task = [[NSTask new] autorelease];
+               NSPipeoutPipe = [NSPipe pipe];
+               NSPipeerrPipe = [NSPipe pipe];
+               NSTasktask = [[NSTask new] autorelease];
                
                [task setLaunchPath:@"/usr/bin/php"]; // This is the path to the default Leopard PHP executable
                [task setArguments:[NSArray arrayWithObjects:@"-s", f, nil]];
                
                [[errPipe fileHandleForReading] readToEndOfFileInBackgroundAndNotify];
                
-               NSData *data               = [[outPipe fileHandleForReading] readDataToEndOfFile];
-               NSAttributedString *source = [[NSAttributedString alloc] initWithHTML:data documentAttributes:NULL];
+               NSDatadata               = [[outPipe fileHandleForReading] readDataToEndOfFile];
+               NSAttributedStringsource = [[NSAttributedString alloc] initWithHTML:data documentAttributes:NULL];
                [[textView textStorage] setAttributedString:source];
                [source release];
        }
-       @catch (NSException *exception)
+       @catch (NSExceptionexception)
        {
                // If the PHP executable is not available then the NSTask will throw an exception
                [textView setString:[NSString stringWithContentsOfFile:f]];
 /**
  * Sets the contents of the SourceView via a string rather than loading from a path
  */
-- (void)setString:(NSString *)source asFile:(NSString *)path
+- (void)setString:(NSString*)source asFile:(NSString*)path
 {
        // create the temp file
-       NSError *error = nil;
-       NSString *tmpPath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"MacGDBpHighlighter"];
+       NSErrorerror = nil;
+       NSStringtmpPath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"MacGDBpHighlighter"];
        [source writeToFile:tmpPath atomically:NO encoding:NSUTF8StringEncoding error:&error];
        if (error)
        {
 /**
  * If an error occurs in reading the highlighted PHP source, this will merely set the string
  */
-- (void)errorHighlightingFile:(NSNotification *)notif
+- (void)errorHighlightingFile:(NSNotification*)notif
 {
-       NSData *data = [[notif userInfo] objectForKey:NSFileHandleNotificationDataItem];
+       NSDatadata = [[notif userInfo] objectForKey:NSFileHandleNotificationDataItem];
        if ([data length] > 0) // there's something on stderr, so the PHP CLI failed
                [textView setString:[NSString stringWithContentsOfFile:file]];
 }
index de04120be321ab77dc8d82abae01c71efadc91e9..a0e1db0d91076d01ef421c4404d3dd3119dad687 100644 (file)
@@ -20,9 +20,9 @@
 
 @interface BSSourceViewTextView : NSTextView
 {
-       BSSourceView *sourceView;
+       BSSourceViewsourceView;
 }
 
-@property(readwrite, assign) BSSourceView *sourceView;
+@property(readwrite, assign) BSSourceViewsourceView;
 
 @end
index f0330c7d7bd0e5ec1fcd6d0fa2231ee20efe8a84..507bb8a8462cd6225fca4716efd452639f1214ad 100644 (file)
@@ -27,9 +27,9 @@
 - (void)drawDividerInRect:(NSRect)rect
 {
        // draw the gradient
-       NSColor *startColor = [NSColor colorWithDeviceRed:0.875 green:0.875 blue:0.875 alpha:1.0];
-       NSColor *endColor = [NSColor colorWithDeviceRed:0.812 green:0.812 blue:0.812 alpha:1.0];
-       NSGradient *gradient = [[NSGradient alloc] initWithStartingColor:startColor endingColor:endColor];
+       NSColorstartColor = [NSColor colorWithDeviceRed:0.875 green:0.875 blue:0.875 alpha:1.0];
+       NSColorendColor = [NSColor colorWithDeviceRed:0.812 green:0.812 blue:0.812 alpha:1.0];
+       NSGradientgradient = [[NSGradient alloc] initWithStartingColor:startColor endingColor:endColor];
        [gradient drawInRect:rect angle:([self isVertical] ? 0.0 : 90.0)];
        [gradient release];
        
@@ -39,7 +39,7 @@
        [NSBezierPath strokeRect:rect];
        
        // draw the dimple
-       NSImage *dimple = [NSImage imageNamed:@"dimple.png"];
+       NSImagedimple = [NSImage imageNamed:@"dimple.png"];
        NSSize dmpSize = [dimple size];
        NSPoint origin = NSMakePoint((rect.size.width / 2) + rect.origin.x - (dmpSize.width / 2), (rect.size.height / 2) + rect.origin.y + (dmpSize.height / 2));
        [dimple compositeToPoint:origin operation:NSCompositeSourceOver];
index 4d0073941d08722511c5225ac1215acde0001d23..d35da0fda78d1cd0680a5f44f059c79acfc97eca 100644 (file)
 
 @interface Breakpoint : NSObject
 {
-       NSString *file;
+       NSStringfile;
        int line;
        int debuggerId;
 }
 
-@property(readonly) NSString *file;
+@property(readonly) NSStringfile;
 @property(readonly) int line;
 @property(readwrite, assign) int debuggerId;
 
-- (id)initWithLine:(int)l inFile:(NSString *)f;
-- (id)initWithDictionary:(NSDictionary *)dict;
+- (id)initWithLine:(int)l inFile:(NSString*)f;
+- (id)initWithDictionary:(NSDictionary*)dict;
 
-- (NSString *)transformedPath;
+- (NSString*)transformedPath;
 
-- (NSDictionary *)dictionary;
+- (NSDictionary*)dictionary;
 
 @end
index 373030604a8deeb480698b6d87fc7e763630ba49..d094db97882541309da471e1820d445b4172f61e 100644 (file)
@@ -24,7 +24,7 @@
 /**
  * Initializes a breakpoint with a file and line
  */
-- (id)initWithLine:(int)l inFile:(NSString *)f
+- (id)initWithLine:(int)l inFile:(NSString*)f
 {
        if (self = [super init])
        {
@@ -46,7 +46,7 @@
 /**
  * Creates a Breakpoint from the values of an NSDictionary
  */
-- (id)initWithDictionary:(NSDictionary *)dict
+- (id)initWithDictionary:(NSDictionary*)dict
 {
        if (self = [super init])
        {
 /**
  * Returns the transformed path for the breakpoint, as Xdebug needs it
  */
-- (NSString *)transformedPath
+- (NSString*)transformedPath
 {
-       NSString *path = self.file;
+       NSStringpath = self.file;
        
-       NSMutableArray *transforms = [[NSUserDefaults standardUserDefaults] mutableArrayValueForKey:@"PathReplacements"];
+       NSMutableArraytransforms = [[NSUserDefaults standardUserDefaults] mutableArrayValueForKey:@"PathReplacements"];
        if (!transforms || [transforms count] < 1)
                return path;
        
-       for (NSDictionary *replacement in transforms)
+       for (NSDictionaryreplacement in transforms)
        {
                path = [path
                        stringByReplacingOccurrencesOfString:[replacement valueForKey:@"local"]
@@ -97,7 +97,7 @@
 /**
  * Returns an NSDictionary of the data so it can be stored in NSUserDefaults
  */
-- (NSDictionary *)dictionary
+- (NSDictionary*)dictionary
 {
        return [NSDictionary dictionaryWithObjectsAndKeys:file, @"file", [NSNumber numberWithInt:line], @"line", nil];
 }
 /**
  * Pretty-print
  */
-- (NSString *)description
+- (NSString*)description
 {
        return [NSString stringWithFormat:@"%@:%i", file, line];
 }
index 16e434833647b7ac4ec4be8c09938195f306ad4b..1c9d34e3cf545e5218410a1b7f79958705591f07 100644 (file)
 
 @interface BreakpointController : NSWindowController
 {
-       BreakpointManager *manager;
+       BreakpointManagermanager;
        
-       IBOutlet NSArrayController *arrayController;
-       IBOutlet BSSourceView *sourceView;
+       IBOutlet NSArrayControllerarrayController;
+       IBOutlet BSSourceViewsourceView;
 }
 
-@property(readonly) BSSourceView *sourceView;
-@property(readonly) NSArrayController *arrayController;
+@property(readonly) BSSourceViewsourceView;
+@property(readonly) NSArrayControllerarrayController;
 
 - (IBAction)addBreakpoint:(id)sender;
 - (IBAction)removeBreakpoint:(id)sender;
index 0b80f3a8521e5b732395eb32db88f5f74ec73ed3..b5af704099a0df592cf69412b011832eb0acf93d 100644 (file)
@@ -42,7 +42,7 @@
  */
 - (IBAction)addBreakpoint:(id)sender
 {
-       NSOpenPanel *panel = [NSOpenPanel openPanel];
+       NSOpenPanelpanel = [NSOpenPanel openPanel];
        
        if ([panel runModal] != NSOKButton)
        {
  */
 - (IBAction)removeBreakpoint:(id)sender
 {
-       NSArray *selection = [arrayController selectedObjects];
+       NSArrayselection = [arrayController selectedObjects];
        if ([selection count] < 1)
        {
                return;
        }
        
-       for (Breakpoint *bp in selection)
+       for (Breakpointbp in selection)
        {
                [manager removeBreakpointAt:[bp line] inFile:[bp file]];
        }
  * NSTableView delegate method that informs the controller that the stack selection did change and that
  * we should update the source viewer
  */
-- (void)tableViewSelectionDidChange:(NSNotification *)notif
+- (void)tableViewSelectionDidChange:(NSNotification*)notif
 {
-       NSArray *selection = [arrayController selectedObjects];
+       NSArrayselection = [arrayController selectedObjects];
        if ([selection count] < 1)
        {
                return;
        }
        
-       Breakpoint *bp = [selection objectAtIndex:0];
+       Breakpointbp = [selection objectAtIndex:0];
        [sourceView setFile:[bp file]];
        [sourceView scrollToLine:[bp line]];
        [[sourceView numberView] setMarkers:[NSSet setWithArray:[manager breakpointsForFile:[bp file]]]];
@@ -94,7 +94,7 @@
 /**
  * The gutter was clicked, which indicates that a breakpoint needs to be changed
  */
-- (void)gutterClickedAtLine:(int)line forFile:(NSString *)file
+- (void)gutterClickedAtLine:(int)line forFile:(NSString*)file
 {
        if ([manager hasBreakpointAt:line inFile:file])
        {
        }
        else
        {
-               Breakpoint *bp = [[Breakpoint alloc] initWithLine:line inFile:file];
+               Breakpointbp = [[Breakpoint alloc] initWithLine:line inFile:file];
                [manager addBreakpoint:bp];
                [bp release];
        }
index 11a37f02e25cb29835fe2b5a3df54d64be1fb1a6..d3c169476a7f0f93a55981e5b88c29846930ea65 100644 (file)
 
 @interface BreakpointManager : NSObject
 {
-       NSMutableArray *breakpoints;
-       NSMutableArray *savedBreakpoints;
+       NSMutableArraybreakpoints;
+       NSMutableArraysavedBreakpoints;
        
-       GDBpConnection *connection;
+       GDBpConnectionconnection;
 }
 
-@property(readwrite, assign) GDBpConnection *connection;
-@property(readonly) NSMutableArray *breakpoints;
+@property(readwrite, assign) GDBpConnectionconnection;
+@property(readonly) NSMutableArraybreakpoints;
 
-+ (BreakpointManager *)sharedManager;
-- (void)addBreakpoint:(Breakpoint *)bp;
-- (Breakpoint *)removeBreakpointAt:(int)line inFile:(NSString *)file;
-- (NSArray *)breakpointsForFile:(NSString *)file;
-- (BOOL)hasBreakpointAt:(int)line inFile:(NSString *)file;
++ (BreakpointManager*)sharedManager;
+- (void)addBreakpoint:(Breakpoint*)bp;
+- (Breakpoint*)removeBreakpointAt:(int)line inFile:(NSString*)file;
+- (NSArray*)breakpointsForFile:(NSString*)file;
+- (BOOL)hasBreakpointAt:(int)line inFile:(NSString*)file;
 
 @end
index 620a4cd679e360ea3e54a1eb4ab50a6446e99c34..38f4070e498cd35b96f34d1bd523b0866c7c2335 100644 (file)
@@ -18,7 +18,7 @@
 #import "AppDelegate.h"
 
 @interface BreakpointManager (Private)
-- (void)updateDisplaysForFile:(NSString *)file;
+- (void)updateDisplaysForFile:(NSString*)file;
 @end
 
 @implementation BreakpointManager
@@ -40,7 +40,7 @@
                savedBreakpoints = [[[NSUserDefaults standardUserDefaults] mutableArrayValueForKey:@"Breakpoints"] retain];
                if (savedBreakpoints)
                {
-                       for (NSDictionary *d in savedBreakpoints)
+                       for (NSDictionaryd in savedBreakpoints)
                        {
                                [breakpoints addObject:[[[Breakpoint alloc] initWithDictionary:d] autorelease]];
                        }
@@ -52,9 +52,9 @@
 /**
  * Returns the shared manager (singleton)
  */
-+ (BreakpointManager *)sharedManager
++ (BreakpointManager*)sharedManager
 {
-       static BreakpointManager *manager;
+       static BreakpointManagermanager;
        if (!manager)
        {
                manager = [[BreakpointManager alloc] init];
@@ -65,7 +65,7 @@
 /**
  * Registers a breakpoint at a given line
  */
-- (void)addBreakpoint:(Breakpoint *)bp;
+- (void)addBreakpoint:(Breakpoint*)bp;
 {
        if (![breakpoints containsObject:bp])
        {
@@ -82,9 +82,9 @@
 /**
  * Removes a breakpoint at a given line/file combination, or nil if nothing was removed
  */
-- (Breakpoint *)removeBreakpointAt:(int)line inFile:(NSString *)file
+- (Breakpoint*)removeBreakpointAt:(int)line inFile:(NSString*)file
 {
-       for (Breakpoint *b in breakpoints)
+       for (Breakpointb in breakpoints)
        {
                if ([b line] == line && [[b file] isEqualToString:file])
                {
 /**
  * Returns all the breakpoints for a given file
  */
-- (NSArray *)breakpointsForFile:(NSString *)file
+- (NSArray*)breakpointsForFile:(NSString*)file
 {
-       NSMutableArray *matches = [NSMutableArray array];
-       for (Breakpoint *b in breakpoints)
+       NSMutableArraymatches = [NSMutableArray array];
+       for (Breakpointb in breakpoints)
        {
                if ([[b file] isEqualToString:file])
                {
 /**
  * Checks to see if a given file has a breakpoint on a given line
  */
-- (BOOL)hasBreakpointAt:(int)line inFile:(NSString *)file
+- (BOOL)hasBreakpointAt:(int)line inFile:(NSString*)file
 {
        return [breakpoints containsObject:[[[Breakpoint alloc] initWithLine:line inFile:file] autorelease]];
 }
  * This marks BSSourceView needsDisplay, rearranges the objects in the breakpoints controller,
  * and sets the markers for the BSLineNumberView
  */
-- (void)updateDisplaysForFile:(NSString *)file
+- (void)updateDisplaysForFile:(NSString*)file
 {
-       AppDelegate *appDel = [NSApp delegate];
+       AppDelegateappDel = [NSApp delegate];
        [[[appDel breakpoint] arrayController] rearrangeObjects];
        [[[appDel breakpoint] sourceView] setNeedsDisplay:YES];
        [[[[appDel breakpoint] sourceView] numberView] setMarkers:[NSSet setWithArray:[self breakpointsForFile:file]]];
index f322dacfe38193c29cdf9a2d210650bd3172400a..50b032e78876f92b5db3d5d846e5badbdc845ea0 100644 (file)
 
 @interface DebuggerController : NSWindowController
 {
-       GDBpConnection *connection;
+       GDBpConnectionconnection;
        
-       StackController *stackController;
-       IBOutlet NSArrayController *stackArrayController;
+       StackControllerstackController;
+       IBOutlet NSArrayControllerstackArrayController;
        
-       IBOutlet NSTreeController *variablesTreeController;
-       IBOutlet NSOutlineView *variablesOutlineView;
-       NSMutableSet *expandedVariables;
-       NSXMLElement *selectedVariable;
+       IBOutlet NSTreeControllervariablesTreeController;
+       IBOutlet NSOutlineViewvariablesOutlineView;
+       NSMutableSetexpandedVariables;
+       NSXMLElementselectedVariable;
        
-       IBOutlet NSWindow *inspector;
+       IBOutlet NSWindowinspector;
        
-       IBOutlet NSTextField *statusmsg;
-       IBOutlet NSTextField *errormsg;
+       IBOutlet NSTextFieldstatusmsg;
+       IBOutlet NSTextFielderrormsg;
        
-       IBOutlet BSSourceView *sourceViewer;
+       IBOutlet BSSourceViewsourceViewer;
 }
 
-@property(readonly) GDBpConnection *connection;
-@property(readonly) BSSourceView *sourceViewer;
-@property(readonly) NSWindow *inspector;
+@property(readonly) GDBpConnectionconnection;
+@property(readonly) BSSourceViewsourceViewer;
+@property(readonly) NSWindowinspector;
 
 - (void)resetDisplays;
 
-- (void)setError:(NSString *)anError;
+- (void)setError:(NSString*)anError;
 
 - (void)startDebugger;
 
index ae4d434eb649711d673b307a9b9db0602b21dc91..e11b0eb0b5dab6e554d2da395051884c8f4bc202 100644 (file)
@@ -40,7 +40,7 @@
        {
                stackController = [[StackController alloc] init];
                
-               NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+               NSUserDefaultsdefaults = [NSUserDefaults standardUserDefaults];
                connection = [[GDBpConnection alloc] initWithPort:[defaults integerForKey:@"Port"] session:[defaults stringForKey:@"IDEKey"]];
                expandedVariables = [[NSMutableSet alloc] init];
                [[self window] makeKeyAndOrderFront:nil];
@@ -84,7 +84,7 @@
 /**
  * Called right before the window closes so that we can tell the socket to close down
  */
-- (void)windowWillClose:(NSNotification *)notif
+- (void)windowWillClose:(NSNotification*)notif
 {
        [[connection socket] close];
 }
 /**
  * Sets the status to be "Error" and then displays the error message
  */
-- (void)setError:(NSString *)anError
+- (void)setError:(NSString*)anError
 {
        [errormsg setStringValue:anError];
        [errormsg setHidden:NO];
 /**
  * Handles a GDBpConnection error
  */
-- (void)handleConnectionError:(NSNotification *)notif
+- (void)handleConnectionError:(NSNotification*)notif
 {
        [self setError:[[notif userInfo] valueForKey:@"NSString"]];
 }
  */
 - (IBAction)run:(id)sender
 {
-       NSArray *frames = [connection run];
+       NSArrayframes = [connection run];
        
        if ([connection isConnected] && frames != nil)
        {
        if ([[variablesTreeController selectedObjects] count] > 0)
                selectedVariable = [[variablesTreeController selectedObjects] objectAtIndex:0];
        
-       StackFrame *frame = [connection stepIn];
+       StackFrameframe = [connection stepIn];
        if ([frame isShiftedFrame:[stackController peek]])
                [stackController pop];
        [stackController push:frame];
        if ([[variablesTreeController selectedObjects] count] > 0)
                selectedVariable = [[variablesTreeController selectedObjects] objectAtIndex:0];
        
-       StackFrame *frame = [connection stepOut];
+       StackFrameframe = [connection stepOut];
        [stackController pop]; // frame we were out of
        [stackController pop]; // frame we are returning to
        [stackController push:frame];
        if ([[variablesTreeController selectedObjects] count] > 0)
                selectedVariable = [[variablesTreeController selectedObjects] objectAtIndex:0];
        
-       StackFrame *frame = [connection stepOver];
+       StackFrameframe = [connection stepOver];
        [stackController pop];
        [stackController push:frame];
        [self updateStackViewer];
  * NSTableView delegate method that informs the controller that the stack selection did change and that
  * we should update the source viewer
  */
-- (void)tableViewSelectionDidChange:(NSNotification *)notif
+- (void)tableViewSelectionDidChange:(NSNotification*)notif
 {
        [self updateSourceViewer];
        [self expandVariables];
 /**
  * Called whenver an item is expanded. This allows us to determine if we need to fetch deeper
  */
-- (void)outlineViewItemDidExpand:(NSNotification *)notif
+- (void)outlineViewItemDidExpand:(NSNotification*)notif
 {
-       NSTreeNode *node = [[notif userInfo] objectForKey:@"NSObject"];
+       NSTreeNodenode = [[notif userInfo] objectForKey:@"NSObject"];
        [expandedVariables addObject:[[node representedObject] fullname]];
 }
 
 /**
  * Called when an item was collapsed. This allows us to remove it from the list of expanded items
  */
-- (void)outlineViewItemDidCollapse:(NSNotification *)notif
+- (void)outlineViewItemDidCollapse:(NSNotification*)notif
 {
        [expandedVariables removeObject:[[[[notif userInfo] objectForKey:@"NSObject"] representedObject] fullname]];
 }
                return;
        
        // get the filename
-       NSString *filename = [selection valueForKey:@"filename"];
+       NSStringfilename = [selection valueForKey:@"filename"];
        filename = [[NSURL URLWithString:filename] path];
        if ([filename isEqualToString:@""])
                return;
        // replace the source if necessary
        if (![sourceViewer.file isEqualToString:filename])
        {
-               NSString *source = [selection valueForKey:@"source"];
+               NSStringsource = [selection valueForKey:@"source"];
                [sourceViewer setString:source asFile:filename];
                
-               NSSet *breakpoints = [NSSet setWithArray:[[BreakpointManager sharedManager] breakpointsForFile:filename]];
+               NSSetbreakpoints = [NSSet setWithArray:[[BreakpointManager sharedManager] breakpointsForFile:filename]];
                [[sourceViewer numberView] setMarkers:breakpoints];
        }
        
  */
 - (void)expandVariables
 {
-       NSString *selection = [selectedVariable fullname];
+       NSStringselection = [selectedVariable fullname];
        
        for (int i = 0; i < [variablesOutlineView numberOfRows]; i++)
        {
-               NSTreeNode *node = [variablesOutlineView itemAtRow:i];
-               NSString *fullname = [[node representedObject] fullname];
+               NSTreeNodenode = [variablesOutlineView itemAtRow:i];
+               NSStringfullname = [[node representedObject] fullname];
                
                // see if it needs expanding
                if ([expandedVariables containsObject:fullname])
 /**
  * The gutter was clicked, which indicates that a breakpoint needs to be changed
  */
-- (void)gutterClickedAtLine:(int)line forFile:(NSString *)file
+- (void)gutterClickedAtLine:(int)line forFile:(NSString*)file
 {
-       BreakpointManager *mngr = [BreakpointManager sharedManager];
+       BreakpointManagermngr = [BreakpointManager sharedManager];
        
        if ([mngr hasBreakpointAt:line inFile:file])
        {
        }
        else
        {
-               Breakpoint *bp = [[Breakpoint alloc] initWithLine:line inFile:file];
+               Breakpointbp = [[Breakpoint alloc] initWithLine:line inFile:file];
                [mngr addBreakpoint:bp];
                [bp release];
        }
index f334900b9fd866c296aaa27c822f4a558a70faa2..7d04448b23cff2381772a1e28c613e014016d754 100644 (file)
 #import "Breakpoint.h"
 #import "StackFrame.h"
 
-extern NSString *kErrorOccurredNotif;
+extern NSStringkErrorOccurredNotif;
 
 @interface GDBpConnection : NSObject
 {
        int port;
-       NSString *session;
+       NSStringsession;
        BOOL connected;
        
        /**
         * Human-readable status of the connection
         */
-       NSString *status;
+       NSStringstatus;
        
-       SocketWrapper *socket;
+       SocketWrappersocket;
 }
 
-@property(readonly, copy) NSString *status;
-@property(readonly) SocketWrapper *socket;
+@property(readonly, copy) NSStringstatus;
+@property(readonly) SocketWrappersocket;
 
 // initializer
-- (id)initWithPort:(int)aPort session:(NSString *)aSession;
+- (id)initWithPort:(int)aPort session:(NSString*)aSession;
 
 // getter
 - (int)port;
-- (NSString *)session;
-- (NSString *)remoteHost;
+- (NSString*)session;
+- (NSString*)remoteHost;
 - (BOOL)isConnected;
 
 // communication
 - (void)reconnect;
-- (NSArray *)run;
-- (StackFrame *)stepIn;
-- (StackFrame *)stepOut;
-- (StackFrame *)stepOver;
-- (void)addBreakpoint:(Breakpoint *)bp;
-- (void)removeBreakpoint:(Breakpoint *)bp;
+- (NSArray*)run;
+- (StackFrame*)stepIn;
+- (StackFrame*)stepOut;
+- (StackFrame*)stepOver;
+- (void)addBreakpoint:(Breakpoint*)bp;
+- (void)removeBreakpoint:(Breakpoint*)bp;
 
 // helpers
-- (NSArray *)getProperty:(NSString *)property;
+- (NSArray*)getProperty:(NSString*)property;
 
 @end
index 3a8425a0ea7967fadd5c730bd0eb29b2ece15bca..eb1a61274a47b8212d09590ec253161cbc026211 100644 (file)
 #import "GDBpConnection.h"
 #import "AppDelegate.h"
 
-NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
+NSStringkErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
 
 @interface GDBpConnection()
-@property(readwrite, copy) NSString *status;
+@property(readwrite, copy) NSStringstatus;
 
-- (NSString *)createCommand:(NSString *)cmd, ...;
-- (NSXMLDocument *)processData:(NSString *)data;
-- (StackFrame *)createStackFrame:(int)depth;
-- (StackFrame *)createCurrentStackFrame;
+- (NSString*)createCommand:(NSString*)cmd, ...;
+- (NSXMLDocument*)processData:(NSString*)data;
+- (StackFrame*)createStackFrame:(int)depth;
+- (StackFrame*)createCurrentStackFrame;
 - (void)updateStatus;
 @end
 
@@ -37,7 +37,7 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
  * Creates a new DebuggerConnection and initializes the socket from the given connection
  * paramters.
  */
-- (id)initWithPort:(int)aPort session:(NSString *)aSession;
+- (id)initWithPort:(int)aPort session:(NSString*)aSession;
 {
        if (self = [super init])
        {
@@ -78,7 +78,7 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
 /**
  * Gets the session name
  */
-- (NSString *)session
+- (NSString*)session
 {
        return session;
 }
@@ -86,7 +86,7 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
 /**
  * Returns the name of the remote host
  */
-- (NSString *)remoteHost
+- (NSString*)remoteHost
 {
        if (!connected)
        {
@@ -115,7 +115,7 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
        [self updateStatus];
        
        // register any breakpoints that exist offline
-       for (Breakpoint *bp in [[BreakpointManager sharedManager] breakpoints])
+       for (Breakpointbp in [[BreakpointManager sharedManager] breakpoints])
        {
                [self addBreakpoint:bp];
        }
@@ -126,7 +126,7 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
 /**
  * Receives errors from the SocketWrapper and updates the display
  */
-- (void)errorEncountered:(NSString *)error
+- (void)errorEncountered:(NSString*)error
 {
        [[NSNotificationCenter defaultCenter]
                postNotificationName:kErrorOccurredNotif
@@ -152,7 +152,7 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
 /**
  * Tells the debugger to continue running the script. Returns an NSArray of the new stack
  */
-- (NSArray *)run
+- (NSArray*)run
 {
        [socket send:[self createCommand:@"run"]];
        [socket receive];
@@ -164,14 +164,14 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
        
        // get the total stack depth
        [socket send:[self createCommand:@"stack_depth"]];
-       NSXMLDocument *doc = [self processData:[socket receive]];
+       NSXMLDocumentdoc = [self processData:[socket receive]];
        int depth = [[[[doc rootElement] attributeForName:@"depth"] stringValue] intValue];
        
        // get all stack frames
-       NSMutableArray *stack = [NSMutableArray arrayWithCapacity:depth];
+       NSMutableArraystack = [NSMutableArray arrayWithCapacity:depth];
        for (int i = 0; i < depth; i++)
        {
-               StackFrame *frame = [self createStackFrame:i];
+               StackFrameframe = [self createStackFrame:i];
                [stack insertObject:frame atIndex:i];
        }
        
@@ -181,7 +181,7 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
 /**
  * Tells the debugger to step into the current command.
  */
-- (StackFrame *)stepIn
+- (StackFrame*)stepIn
 {
        [socket send:[self createCommand:@"step_into"]];
        [socket receive];
@@ -197,7 +197,7 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
 /**
  * Tells the debugger to step out of the current context
  */
-- (StackFrame *)stepOut
+- (StackFrame*)stepOut
 {
        [socket send:[self createCommand:@"step_out"]];
        [socket receive];
@@ -213,7 +213,7 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
 /**
  * Tells the debugger to step over the current function
  */
-- (StackFrame *)stepOver
+- (StackFrame*)stepOver
 {
        [socket send:[self createCommand:@"step_over"]];
        [socket receive];
@@ -230,11 +230,11 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
  * Tells the debugger engine to get a specifc property. This also takes in the NSXMLElement
  * that requested it so that the child can be attached.
  */
-- (NSArray *)getProperty:(NSString *)property
+- (NSArray*)getProperty:(NSString*)property
 {
        [socket send:[self createCommand:[NSString stringWithFormat:@"property_get -n \"%@\"", property]]];
        
-       NSXMLDocument *doc = [self processData:[socket receive]];
+       NSXMLDocumentdoc = [self processData:[socket receive]];
        
        /*
         <response>
@@ -245,8 +245,8 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
         */
        
        // we now have to detach all the children so we can insert them into another document
-       NSXMLElement *parent = (NSXMLElement *)[[doc rootElement] childAtIndex:0];
-       NSArray *children = [parent children];
+       NSXMLElement* parent = (NSXMLElement*)[[doc rootElement] childAtIndex:0];
+       NSArraychildren = [parent children];
        [parent setChildren:nil];
        return children;
 }
@@ -256,23 +256,23 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
 /**
  * Send an add breakpoint command
  */
-- (void)addBreakpoint:(Breakpoint *)bp
+- (void)addBreakpoint:(Breakpoint*)bp
 {
        if (!connected)
        {
                return;
        }
        
-       NSString *cmd = [self createCommand:[NSString stringWithFormat:@"breakpoint_set -t line -f %@ -n %i", [bp transformedPath], [bp line]]];
+       NSStringcmd = [self createCommand:[NSString stringWithFormat:@"breakpoint_set -t line -f %@ -n %i", [bp transformedPath], [bp line]]];
        [socket send:cmd];
-       NSXMLDocument *info = [self processData:[socket receive]];
+       NSXMLDocumentinfo = [self processData:[socket receive]];
        [bp setDebuggerId:[[[[info rootElement] attributeForName:@"id"] stringValue] intValue]];
 }
 
 /**
  * Removes a breakpoint
  */
-- (void)removeBreakpoint:(Breakpoint *)bp
+- (void)removeBreakpoint:(Breakpoint*)bp
 {
        if (!connected)
        {
@@ -289,12 +289,12 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
  * Helper method to create a string command with the -i <session> automatically tacked on. Takes
  * a variable number of arguments and parses the given command with +[NSString stringWithFormat:]
  */
-- (NSString *)createCommand:(NSString *)cmd, ...
+- (NSString*)createCommand:(NSString*)cmd, ...
 {
        // collect varargs
        va_list argList;
        va_start(argList, cmd);
-       NSString *format = [[NSString alloc] initWithFormat:cmd arguments:argList]; // format the command
+       NSStringformat = [[NSString alloc] initWithFormat:cmd arguments:argList]; // format the command
        va_end(argList);
        
        return [NSString stringWithFormat:@"%@ -i %@", [format autorelease], session];
@@ -303,13 +303,13 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
 /**
  * Helper function to parse the NSData into an NSXMLDocument
  */
-- (NSXMLDocument *)processData:(NSString *)data
+- (NSXMLDocument*)processData:(NSString*)data
 {
        if (data == nil)
                return nil;
        
-       NSError *parseError = nil;
-       NSXMLDocument *doc = [[NSXMLDocument alloc] initWithXMLString:data options:0 error:&parseError];
+       NSErrorparseError = nil;
+       NSXMLDocumentdoc = [[NSXMLDocument alloc] initWithXMLString:data options:0 error:&parseError];
        if (parseError)
        {
                NSLog(@"Could not parse XML? --- %@", parseError);
@@ -319,7 +319,7 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
        }
        
        // check and see if there's an error
-       NSArray *error = [[doc rootElement] elementsForName:@"error"];
+       NSArrayerror = [[doc rootElement] elementsForName:@"error"];
        if ([error count] > 0)
        {
                NSLog(@"Xdebug error: %@", error);
@@ -333,39 +333,39 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
 /**
  * Generates a stack frame for the given depth
  */
-- (StackFrame *)createStackFrame:(int)stackDepth
+- (StackFrame*)createStackFrame:(int)stackDepth
 {
        // get the stack frame
        [socket send:[self createCommand:@"stack_get -d %d", stackDepth]];
-       NSXMLDocument *doc = [self processData:[socket receive]];
+       NSXMLDocumentdoc = [self processData:[socket receive]];
        if (doc == nil)
                return nil;
        
-       NSXMLElement *xmlframe = [[[doc rootElement] children] objectAtIndex:0];
+       NSXMLElementxmlframe = [[[doc rootElement] children] objectAtIndex:0];
        
        // get the names of all the contexts
        [socket send:[self createCommand:@"context_names -d 0"]];
-       NSXMLElement *contextNames = [[self processData:[socket receive]] rootElement];
-       NSMutableArray *variables = [NSMutableArray array];
-       for (NSXMLElement *context in [contextNames children])
+       NSXMLElementcontextNames = [[self processData:[socket receive]] rootElement];
+       NSMutableArrayvariables = [NSMutableArray array];
+       for (NSXMLElementcontext in [contextNames children])
        {
-               NSString *name = [[context attributeForName:@"name"] stringValue];
+               NSStringname = [[context attributeForName:@"name"] stringValue];
                int cid = [[[context attributeForName:@"id"] stringValue] intValue];
                
                // fetch the contexts
                [socket send:[self createCommand:[NSString stringWithFormat:@"context_get -d %d -c %d", stackDepth, cid]]];
-               NSArray *addVars = [[[self processData:[socket receive]] rootElement] children];
+               NSArrayaddVars = [[[self processData:[socket receive]] rootElement] children];
                if (addVars != nil && name != nil)
                        [variables addObjectsFromArray:addVars];
        }
        
        // get the source
-       NSString *filename = [[xmlframe attributeForName:@"filename"] stringValue];
+       NSStringfilename = [[xmlframe attributeForName:@"filename"] stringValue];
        [socket send:[self createCommand:[NSString stringWithFormat:@"source -f %@", filename]]];
-       NSString *source = [[[self processData:[socket receive]] rootElement] value]; // decode base64
+       NSStringsource = [[[self processData:[socket receive]] rootElement] value]; // decode base64
        
        // create stack frame
-       StackFrame *frame = [[StackFrame alloc]
+       StackFrameframe = [[StackFrame alloc]
                initWithIndex:stackDepth
                withFilename:filename
                withSource:source
@@ -380,7 +380,7 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
 /**
  * Creates a StackFrame based on the current position in the debugger
  */
-- (StackFrame *)createCurrentStackFrame
+- (StackFrame*)createCurrentStackFrame
 {
        return [self createStackFrame:0];
 }
@@ -391,7 +391,7 @@ NSString *kErrorOccurredNotif = @"GDBpConnection_ErrorOccured_Notification";
 - (void)updateStatus
 {
        [socket send:[self createCommand:@"status"]];
-       NSXMLDocument *doc = [self processData:[socket receive]];
+       NSXMLDocumentdoc = [self processData:[socket receive]];
        self.status = [[[[doc rootElement] attributeForName:@"status"] stringValue] capitalizedString];
        
        if (status == nil || [status isEqualToString:@"Stopped"] || [status isEqualToString:@"Stopping"])
index fddcd00c30b47690f57d19cfa50d6d5964526cf8..c021cd0e23047c1eb64bf2228244f2977f422619 100644 (file)
 
 @interface NSXMLElement (GDBpAdditions)
 
-- (NSString *)fullname;
-- (NSString *)variable;
+- (NSString*)fullname;
+- (NSString*)variable;
 - (BOOL)isLeaf;
-- (NSString *)value;
-- (NSString *)type;
-- (NSArray *)subnodes;
+- (NSString*)value;
+- (NSString*)type;
+- (NSArray*)subnodes;
 
 @end
index c4bd4a80ef470e70f3dba0286cc045532775e5a4..9642ae285a23d9d084e5fb956268d85c9db217fa 100644 (file)
@@ -23,7 +23,7 @@
 /**
  * Return's the property's full name
  */
-- (NSString *)fullname
+- (NSString*)fullname
 {
        return [[self attributeForName:@"fullname"] stringValue];
 }
@@ -31,7 +31,7 @@
 /**
  * Return's the property's name from the attributes list
  */
-- (NSString *)variable
+- (NSString*)variable
 {
        return [[self attributeForName:@"name"] stringValue];
 }
 /**
  * Override children so we can fetch more depth as needed
  */
-- (NSArray *)subnodes
+- (NSArray*)subnodes
 {
-       NSArray *children = [self children];
+       NSArraychildren = [self children];
        if (![self isLeaf] && [children count] < 1)
        {
-               return [[[(AppDelegate *)[NSApp delegate] debugger] connection] getProperty:[self fullname]];
+               return [[[(AppDelegate*)[NSApp delegate] debugger] connection] getProperty:[self fullname]];
        }
        return children;
 }
@@ -60,7 +60,7 @@
 /**
  * Returns the value of the property
  */
-- (NSString *)value
+- (NSString*)value
 {
        // not a leaf, so don't display any value
        if (![self isLeaf])
        // base64 encoded data
        if ([[[self attributeForName:@"encoding"] stringValue] isEqualToString:@"base64"])
        {
-               char *str = (char *)[[self stringValue] cStringUsingEncoding:NSASCIIStringEncoding];
+               char* str = (char*)[[self stringValue] cStringUsingEncoding:NSASCIIStringEncoding];
                int strlen = [[self stringValue] lengthOfBytesUsingEncoding:NSASCIIStringEncoding];
                
-               char *data;
+               chardata;
                size_t datalen;
                
                if (!base64_decode_alloc(str, strlen, &data, &datalen))
@@ -82,7 +82,7 @@
                        NSLog(@"error in converting %@ to base64", self);
                }
                
-               NSString *ret = [NSString stringWithCString:data length:datalen];
+               NSStringret = [NSString stringWithCString:data length:datalen];
                free(data);
                
                return ret;
 /**
  * Returns the type of variable this is
  */
-- (NSString *)type
+- (NSString*)type
 {
-       NSXMLNode *className = [self attributeForName:@"classname"];
-       NSString *type = [[self attributeForName:@"type"] stringValue];
+       NSXMLNodeclassName = [self attributeForName:@"classname"];
+       NSStringtype = [[self attributeForName:@"type"] stringValue];
        if (className != nil)
        {
                return [NSString stringWithFormat:@"%@ (%@)", [className stringValue], type];
index 989a0114b19ca86c2a858bb1ba12db7926d700ac..d820908c35db36f5a80b961a1c1513c9ce9e4f3b 100644 (file)
 
 @interface PreferencesController : NSWindowController
 {
-       IBOutlet NSToolbar *toolbar;
+       IBOutlet NSToolbartoolbar;
        
-       NSView *blankView;
+       NSViewblankView;
        
-       IBOutlet NSView *generalPreferencesView;
-       IBOutlet NSToolbarItem *generalPreferencesItem;
+       IBOutlet NSViewgeneralPreferencesView;
+       IBOutlet NSToolbarItemgeneralPreferencesItem;
        
-       IBOutlet NSView *pathsPreferencesView;
-       IBOutlet NSToolbarItem *pathsPreferencesItem;
+       IBOutlet NSViewpathsPreferencesView;
+       IBOutlet NSToolbarItempathsPreferencesItem;
 }
 
 - (void)showPreferencesWindow;
index d5125f2f9cb8d9c022efd60f78a9009a80b0ab8a..08fbc521d98f678d688fe559bfccdd3213a40124 100644 (file)
@@ -101,7 +101,7 @@ NSSize pathsSize;
 /**
  * Returns the selection names
  */
-- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
+- (NSArray*)toolbarSelectableItemIdentifiers:(NSToolbar*)toolbar
 {
        return [NSArray arrayWithObjects:
                [generalPreferencesItem itemIdentifier],
index f2b4e31434bab8f31aff44a5ed0a57cb2ce93aad..71c240f8290b6b9bacfa08594d6526e7a470c29e 100644 (file)
@@ -24,7 +24,7 @@
  */
 - (id)newObject
 {
-       NSMutableDictionary *obj = (NSMutableDictionary *)[super newObject];
+       NSMutableDictionary* obj = (NSMutableDictionary*)[super newObject];
        [obj setValue:@"Remote Path" forKey:@"remote"];
        [obj setValue:@"Local Path"     forKey:@"local"];
        return obj;
index 1d295f428e7418d3cc4ce463376adbf1c7044386..d9692deaee4eb29c19d477c76fb18b45e751ed8d 100644 (file)
 
 @interface SocketWrapper : NSObject
 {
-       GDBpConnection *connection;
+       GDBpConnectionconnection;
        
        int port;
        int sock;
-       NSString *hostname;
+       NSStringhostname;
        
        id delegate;
 }
 
-- (id)initWithConnection:(GDBpConnection *)cnx;
+- (id)initWithConnection:(GDBpConnection*)cnx;
 
 - (id)delegate;
 - (void)setDelegate:(id)aDelegate;
 
 - (void)connect;
 - (void)close;
-- (NSString *)receive;
-- (BOOL)send:(NSString *)data;
+- (NSString*)receive;
+- (BOOL)send:(NSString*)data;
 
-- (NSString *)remoteHost;
+- (NSString*)remoteHost;
 
 @end
 
 @interface NSObject (SocketWrapperDelegate)
 
 // error
-- (void)errorEncountered:(NSString *)error;
+- (void)errorEncountered:(NSString*)error;
 
 // connection components
 - (void)socketDidAccept:(id)obj;
index b37f99d769ef92c32d7879a13b834966e7ee1fde..bb91fcfde3c01eef6ba8753fcd451478a2df73ea 100644 (file)
@@ -22,9 +22,9 @@
 #include <unistd.h>
 
 @interface SocketWrapper ()
-@property (copy, readwrite, getter=remoteHost) NSString *hostname;
+@property (copy, readwrite, getter=remoteHost) NSStringhostname;
 
-- (void)error:(NSString *)msg;
+- (void)error:(NSString*)msg;
 @end
 
 @implementation SocketWrapper
@@ -33,7 +33,7 @@
 /**
  * Initializes the socket wrapper with a host and port
  */
-- (id)initWithConnection:(GDBpConnection *)cnx
+- (id)initWithConnection:(GDBpConnection*)cnx
 {
        if (self = [super init])
        {
@@ -70,7 +70,7 @@
 }
 
 /**
- * Sets the delegate but does *not* retain it
+ * Sets the delegate but doesnot* retain it
  */
 - (void)setDelegate:(id)aDelegate
 {
@@ -91,7 +91,7 @@
  */
 - (void)connect:(id)obj
 {
-       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+       NSAutoreleasePoolpool = [[NSAutoreleasePool alloc] init];
        
        // create an INET socket that we'll be listen()ing on
        int socketOpen = socket(PF_INET, SOCK_STREAM, 0);
        
        // bind the socket... and don't give up until we've tried for a while
        int tries = 0;
-       while (bind(socketOpen, (struct sockaddr *)&address, sizeof(address)) < 0)
+       while (bind(socketOpen, (struct sockaddr*)&address, sizeof(address)) < 0)
        {
                if (tries >= 5)
                {
        // accept a connection
        struct sockaddr_in remoteAddress;
        socklen_t remoteAddressLen = sizeof(remoteAddress);
-       sock = accept(socketOpen, (struct sockaddr *)&remoteAddress, &remoteAddressLen);
+       sock = accept(socketOpen, (struct sockaddr*)&remoteAddress, &remoteAddressLen);
        if (sock < 0)
        {
                close(socketOpen);
        
        struct sockaddr_in addr;
        socklen_t addrLength;
-       if (getpeername(sock, (struct sockaddr *)&addr, &addrLength) < 0)
+       if (getpeername(sock, (struct sockaddr*)&addr, &addrLength) < 0)
        {
                [self error:@"Could not get remote hostname."];
        }
-       char *name = inet_ntoa(addr.sin_addr);
+       charname = inet_ntoa(addr.sin_addr);
        [self setHostname:[NSString stringWithUTF8String:name]];
        
        [connection performSelectorOnMainThread:@selector(socketDidAccept:) withObject:nil waitUntilDone:NO];
  * is used either in a threaded environment so the interface does not hang, or when you *know* the server 
  * will return something (which we almost always do). Returns the data that was received from the socket.
  */
-- (NSString *)receive
+- (NSString*)receive
 {
        // create a buffer
        char buffer[1024];
        int recvd = recv(sock, &buffer, sizeof(buffer), 0);
        
        // take the received data and put it into an NSData
-       NSMutableString *str = [NSMutableString string];
+       NSMutableStringstr = [NSMutableString string];
        
        if (recvd == -1)
                return nil;
                }
        }
        
-       NSString *tmp = [str stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; // strip whitespace
+       NSStringtmp = [str stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; // strip whitespace
        tmp = [tmp substringToIndex:[tmp length] - 1]; // don't want the null byte
        
        NSAssert([tmp UTF8String][[tmp length] - 1] == '>', @"-[SocketWrapper receive] buffer is incomplete");
 /**
  * Sends a given NSString over the socket. Returns YES on complete submission.
  */
-- (BOOL)send:(NSString *)data
+- (BOOL)send:(NSString*)data
 {
        data = [NSString stringWithFormat:@"%@\0", data];
        int sent = send(sock, [data UTF8String], [data length], 0);
 /**
  * Helper method that just calls -[DebuggerWindowController setError:] on the main thread
  */
-- (void)error:(NSString *)msg
+- (void)error:(NSString*)msg
 {
        [delegate performSelectorOnMainThread:@selector(setError:) withObject:msg waitUntilDone:NO];
 }
index 14f219a98028ba0c936efa624ea8108428f7848c..e3c6f3e73d4db2431699416e29ffebfc4022d081 100644 (file)
        /**
         * Array of StackFrame's (LIFO stack)
         */
-       NSMutableArray *stack;
+       NSMutableArraystack;
 }
 
-@property(readonly) NSMutableArray *stack;
+@property(readonly) NSMutableArraystack;
 
-- (StackFrame *)peek;
-- (StackFrame *)pop;
-- (void)push:(StackFrame *)frame;
+- (StackFrame*)peek;
+- (StackFrame*)pop;
+- (void)push:(StackFrame*)frame;
 
 @end
index 1310ac2d7d6e71c9b783e85125d8f23879d195ab..a478f049d7e0a29a3c98df2fb8c9897258135025 100644 (file)
@@ -45,7 +45,7 @@
 /**
  * Returns a reference to the top of the stack
  */
-- (StackFrame *)peek
+- (StackFrame*)peek
 {
        return [stack lastObject];
 }
 /**
  * Pops the current frame off the stack and returns the frame
  */
-- (StackFrame *)pop
+- (StackFrame*)pop
 {
-       StackFrame *frame = [stack lastObject];
+       StackFrameframe = [stack lastObject];
        
        if (frame != nil)
                [stack removeLastObject];
        
-       for (StackFrame *f in stack)
+       for (StackFramef in stack)
                f.index--;
        
        return frame;
@@ -69,9 +69,9 @@
 /**
  * Pushes a frame onto the end of the stack
  */
-- (void)push:(StackFrame *)frame
+- (void)push:(StackFrame*)frame
 {
-       for (StackFrame *f in stack)
+       for (StackFramef in stack)
                f.index++;
        
        [stack insertObject:frame atIndex:[stack count]];
index b80e0082c98680b9e28cfa229b40dc1877e7e34d..a5466bb05086098be1493aaf767f557389125441 100644 (file)
        /**
         * File the current frame is in
         */
-       NSString *filename;
+       NSStringfilename;
        
        /**
         * Cached, highlighted version of the source
         */
-       NSString *source;
+       NSStringsource;
        
        /**
         * Line number of the source the frame points to
        /**
         * Current-executing function
         */
-       NSString *function;
+       NSStringfunction;
        
        /**
         * Variable list
         */
-       NSArray *variables;
+       NSArrayvariables;
 }
 
 @property(readwrite) int index;
-@property(readonly, copy) NSString *filename;
-@property(readonly, copy) NSString *source;
+@property(readonly, copy) NSStringfilename;
+@property(readonly, copy) NSStringsource;
 @property(readwrite) int lineNumber;
-@property(readwrite, copy) NSString *function;
-@property(readonly, copy) NSArray *variables;
+@property(readwrite, copy) NSStringfunction;
+@property(readonly, copy) NSArrayvariables;
 
 - (id)initWithIndex:(int)anIndex
-          withFilename:(NSString *)aFilename
-                withSource:(NSString *)aSource
+          withFilename:(NSString*)aFilename
+                withSource:(NSString*)aSource
                         atLine:(int)aLineNumber
-                inFunction:(NSString *)function
-         withVariables:(NSArray *)variables;
+                inFunction:(NSString*)function
+         withVariables:(NSArray*)variables;
 
-- (BOOL)isShiftedFrame:(StackFrame *)frame;
+- (BOOL)isShiftedFrame:(StackFrame*)frame;
 
 @end
index 0a955db9fe25f61020d92c605734c19969a78469..ebb3bedbd84054b4d6b6ebd063a050df815dafd1 100644 (file)
@@ -20,9 +20,9 @@
  * Private class continuation
  */
 @interface StackFrame()
-@property(readwrite, copy) NSString *filename;
-@property(readwrite, copy) NSString *source;
-@property(readwrite, copy) NSArray *variables;
+@property(readwrite, copy) NSStringfilename;
+@property(readwrite, copy) NSStringsource;
+@property(readwrite, copy) NSArrayvariables;
 @end
 /***/
 
  * Constructor
  */
 - (id)initWithIndex:(int)anIndex
-          withFilename:(NSString *)aFilename
-                withSource:(NSString *)aSource
+          withFilename:(NSString*)aFilename
+                withSource:(NSString*)aSource
                         atLine:(int)aLineNumber
-                inFunction:(NSString *)aFunction
-         withVariables:(NSArray *)aVariables
+                inFunction:(NSString*)aFunction
+         withVariables:(NSArray*)aVariables
 {
        if (self = [super init])
        {
@@ -56,7 +56,7 @@
  * Determines whether or not the given frame was shifted, rather than jumped. Essentially,
  * this checks if it's in the same file/function.
  */
-- (BOOL)isShiftedFrame:(StackFrame *)frame
+- (BOOL)isShiftedFrame:(StackFrame*)frame
 {
        return ([filename isEqualToString:frame.filename] && [function isEqualToString:frame.function]);
 }
@@ -64,7 +64,7 @@
 /**
  * Returns a human-readable representation
  */
-- (NSString *)description
+- (NSString*)description
 {
        return [NSString stringWithFormat:@"#%d %@ [%@:%d]", index, function, filename, lineNumber];
 }