From 2fbdcb23ae7a9f95cee9e80f161ea6847fe0ef6c Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Wed, 1 Aug 2007 21:51:09 -0700 Subject: [PATCH] Removing all information about specifying a host because GDBp doesn't actually support anything but PHP->localhost. * English.lproj/Connect.nib: Removing and unhooking the host text field * Source/ConnectWindowController.h: Removing _host outlet * Source/ConnectWindowController.m: ([ConnectWindowController connect:]): Remove the "Host" parameter from the DebuggerConnection init method * Source/DebuggerConnection.h: Removing the _host ivar and removing the "host" parameter from the init method as well as the host getter method * Source/DebuggerConnection.m: ([DebuggerConnection initWithHost:port:session:]): Renamed to [DebuggerConnection initWithPort:session:] ([DebuggerConnection dealloc]): Removed _host ivar and so it no longer needs to be release'd ([DebuggerConnection host]): Removed * Source/DebuggerWindowController.m: ([DebuggerWindowController initWithConnection:]): No longer set the host in the window title --- English.lproj/Connect.nib/classes.nib | 2 +- English.lproj/Connect.nib/keyedobjects.nib | Bin 5941 -> 5430 bytes Source/ConnectWindowController.h | 1 - Source/ConnectWindowController.m | 2 +- Source/DebuggerConnection.h | 4 +--- Source/DebuggerConnection.m | 13 +------------ Source/DebuggerWindowController.m | 3 ++- 7 files changed, 6 insertions(+), 19 deletions(-) diff --git a/English.lproj/Connect.nib/classes.nib b/English.lproj/Connect.nib/classes.nib index 99f71ac..aa0f0c5 100644 --- a/English.lproj/Connect.nib/classes.nib +++ b/English.lproj/Connect.nib/classes.nib @@ -4,7 +4,7 @@ ACTIONS = {connect = id; }; CLASS = ConnectWindowController; LANGUAGE = ObjC; - OUTLETS = {"_host" = NSTextField; "_port" = NSTextField; "_session" = NSTextField; }; + OUTLETS = {"_port" = NSTextField; "_session" = NSTextField; }; SUPERCLASS = NSWindowController; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; } diff --git a/English.lproj/Connect.nib/keyedobjects.nib b/English.lproj/Connect.nib/keyedobjects.nib index 3d2ed7101f660b5b1e573b6075953c913b6bf5d4..dc9a0b03330ad263e32804002bbd5a1bfe071bbe 100644 GIT binary patch delta 3547 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 R5PS$}{vR6pzy5X}{SOw=l#2iW diff --git a/Source/ConnectWindowController.h b/Source/ConnectWindowController.h index bf80708..f69bce7 100644 --- a/Source/ConnectWindowController.h +++ b/Source/ConnectWindowController.h @@ -19,7 +19,6 @@ @interface ConnectWindowController : NSWindowController { - IBOutlet NSTextField *_host; IBOutlet NSTextField *_port; IBOutlet NSTextField *_session; } diff --git a/Source/ConnectWindowController.m b/Source/ConnectWindowController.m index 2fe763d..dfa93c4 100644 --- a/Source/ConnectWindowController.m +++ b/Source/ConnectWindowController.m @@ -52,7 +52,7 @@ */ - (IBAction)connect: (id)sender { - [[DebuggerConnection alloc] initWithHost: [_host stringValue] port: [_port intValue] session: [_session stringValue]]; + [[DebuggerConnection alloc] initWithPort: [_port intValue] session: [_session stringValue]]; [[self window] orderOut: self]; } diff --git a/Source/DebuggerConnection.h b/Source/DebuggerConnection.h index 06435e4..5a25a8d 100644 --- a/Source/DebuggerConnection.h +++ b/Source/DebuggerConnection.h @@ -20,7 +20,6 @@ @interface DebuggerConnection : NSObject { - NSString *_host; int _port; NSString *_session; @@ -32,10 +31,9 @@ } // initializer -- (id)initWithHost: (NSString *)host port: (int)port session: (NSString *)session; +- (id)initWithPort: (int)port session: (NSString *)session; // getter -- (NSString *)host; - (int)port; - (NSString *)session; diff --git a/Source/DebuggerConnection.m b/Source/DebuggerConnection.m index 69bb8da..38c91ec 100644 --- a/Source/DebuggerConnection.m +++ b/Source/DebuggerConnection.m @@ -23,12 +23,10 @@ * Creates a new DebuggerConnection and initializes the socket from the given connection * paramters. */ -- (id)initWithHost: (NSString *)host port: (int)port session: (NSString *)session +- (id)initWithPort: (int)port session: (NSString *)session { - NSLog(@"initWithHost"); if (self = [super init]) { - _host = [host retain]; _port = port; _session = [session retain]; @@ -60,21 +58,12 @@ */ - (void)dealloc { - [_host release]; [_session release]; [socket release]; [super dealloc]; } -/** - * Gets the hostname - */ -- (NSString *)host -{ - return _host; -} - /** * Gets the port number */ diff --git a/Source/DebuggerWindowController.m b/Source/DebuggerWindowController.m index 4c45336..51b0819 100644 --- a/Source/DebuggerWindowController.m +++ b/Source/DebuggerWindowController.m @@ -27,7 +27,8 @@ if (self = [super initWithWindowNibName: @"Debugger"]) { _connection = [cnx retain]; - [[self window] setTitle: [NSString stringWithFormat: @"GDBp @ %@:%d/%@", [_connection host], [_connection port], [_connection session]]]; + // TODO - get the host from SocketWrapper and use that in the title + [[self window] setTitle: [NSString stringWithFormat: @"GDBp @ localhost:%d/%@", [_connection port], [_connection session]]]; } return self; } -- 2.22.5