From 3b858e3ad77a0e691f11d734dd90b9d0aad4e8a0 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Mon, 14 Jul 2008 12:14:04 -0400 Subject: [PATCH] Renaming DebuggerConnection to GDBpConnection --- MacGDBp.xcodeproj/project.pbxproj | 12 ++++++------ Source/BreakpointManager.h | 6 +++--- Source/DebuggerController.h | 6 +++--- Source/DebuggerController.m | 4 ++-- Source/{DebuggerConnection.h => GDBpConnection.h} | 2 +- Source/{DebuggerConnection.m => GDBpConnection.m} | 6 +++--- Source/SocketWrapper.h | 6 +++--- Source/SocketWrapper.m | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) rename Source/{DebuggerConnection.h => GDBpConnection.h} (97%) rename Source/{DebuggerConnection.m => GDBpConnection.m} (98%) diff --git a/MacGDBp.xcodeproj/project.pbxproj b/MacGDBp.xcodeproj/project.pbxproj index adee687..d60041e 100644 --- a/MacGDBp.xcodeproj/project.pbxproj +++ b/MacGDBp.xcodeproj/project.pbxproj @@ -11,7 +11,7 @@ 1E027F0B0D36F23F00885DEE /* StepOver.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E027F090D36F23F00885DEE /* StepOver.png */; }; 1E027F390D36F60800885DEE /* Reconnect.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E027F380D36F60800885DEE /* Reconnect.png */; }; 1E02C3D50C60EC2C006F1752 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C3D40C60EC2C006F1752 /* AppDelegate.m */; }; - 1E02C5710C610158006F1752 /* DebuggerConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C5700C610158006F1752 /* DebuggerConnection.m */; }; + 1E02C5710C610158006F1752 /* GDBpConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C5700C610158006F1752 /* GDBpConnection.m */; }; 1E02C5F60C610724006F1752 /* DebuggerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C5F50C610724006F1752 /* DebuggerController.m */; }; 1E1E53030DF9B89800D334F9 /* Breakpoints.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1E1E53010DF9B89800D334F9 /* Breakpoints.xib */; }; 1E35FC760C6579CA0030F527 /* NSXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E35FC750C6579CA0030F527 /* NSXMLElementAdditions.m */; }; @@ -61,8 +61,8 @@ 1E027F380D36F60800885DEE /* Reconnect.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Reconnect.png; path = Icons/Reconnect.png; sourceTree = ""; }; 1E02C3D30C60EC2C006F1752 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Source/AppDelegate.h; sourceTree = ""; }; 1E02C3D40C60EC2C006F1752 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Source/AppDelegate.m; sourceTree = ""; }; - 1E02C56F0C610158006F1752 /* DebuggerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerConnection.h; path = Source/DebuggerConnection.h; sourceTree = ""; }; - 1E02C5700C610158006F1752 /* DebuggerConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DebuggerConnection.m; path = Source/DebuggerConnection.m; sourceTree = ""; }; + 1E02C56F0C610158006F1752 /* GDBpConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GDBpConnection.h; path = Source/GDBpConnection.h; sourceTree = ""; }; + 1E02C5700C610158006F1752 /* GDBpConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GDBpConnection.m; path = Source/GDBpConnection.m; sourceTree = ""; }; 1E02C5F40C610724006F1752 /* DebuggerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerController.h; path = Source/DebuggerController.h; sourceTree = ""; }; 1E02C5F50C610724006F1752 /* DebuggerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DebuggerController.m; path = Source/DebuggerController.m; sourceTree = ""; }; 1E1E53020DF9B89800D334F9 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Breakpoints.xib; sourceTree = ""; }; @@ -185,8 +185,8 @@ 1E1E52C10DF9B1FB00D334F9 /* Connection */ = { isa = PBXGroup; children = ( - 1E02C56F0C610158006F1752 /* DebuggerConnection.h */, - 1E02C5700C610158006F1752 /* DebuggerConnection.m */, + 1E02C56F0C610158006F1752 /* GDBpConnection.h */, + 1E02C5700C610158006F1752 /* GDBpConnection.m */, 1E02C5F40C610724006F1752 /* DebuggerController.h */, 1E02C5F50C610724006F1752 /* DebuggerController.m */, 1EEEE93E0C618B70000C0732 /* SocketWrapper.h */, @@ -362,7 +362,7 @@ files = ( 8D11072D0486CEB800E47090 /* main.m in Sources */, 1E02C3D50C60EC2C006F1752 /* AppDelegate.m in Sources */, - 1E02C5710C610158006F1752 /* DebuggerConnection.m in Sources */, + 1E02C5710C610158006F1752 /* GDBpConnection.m in Sources */, 1E02C5F60C610724006F1752 /* DebuggerController.m in Sources */, 1EEEE9400C618B70000C0732 /* SocketWrapper.m in Sources */, 1E35FC760C6579CA0030F527 /* NSXMLElementAdditions.m in Sources */, diff --git a/Source/BreakpointManager.h b/Source/BreakpointManager.h index 21fd7fc..dfb88f1 100644 --- a/Source/BreakpointManager.h +++ b/Source/BreakpointManager.h @@ -16,16 +16,16 @@ #import #import "Breakpoint.h" -#import "DebuggerConnection.h" +#import "GDBpConnection.h" @interface BreakpointManager : NSObject { NSMutableArray *breakpoints; - DebuggerConnection *connection; + GDBpConnection *connection; } -@property(readwrite, assign) DebuggerConnection *connection; +@property(readwrite, assign) GDBpConnection *connection; @property(readonly) NSMutableArray *breakpoints; + (BreakpointManager *)sharedManager; diff --git a/Source/DebuggerController.h b/Source/DebuggerController.h index 54cc034..59ae3f2 100644 --- a/Source/DebuggerController.h +++ b/Source/DebuggerController.h @@ -17,11 +17,11 @@ #import #import "BSSourceView.h" -@class DebuggerConnection; +@class GDBpConnection; @interface DebuggerController : NSWindowController { - DebuggerConnection *connection; + GDBpConnection *connection; IBOutlet NSArrayController *stackController; NSArray *stack; @@ -42,7 +42,7 @@ IBOutlet NSToolbarItem *reconnectButton; } -@property(readonly) DebuggerConnection *connection; +@property(readonly) GDBpConnection *connection; @property(readonly) BSSourceView *sourceViewer; - (void)resetDisplays; diff --git a/Source/DebuggerController.m b/Source/DebuggerController.m index b9f1ba6..33a8b35 100644 --- a/Source/DebuggerController.m +++ b/Source/DebuggerController.m @@ -15,7 +15,7 @@ */ #import "DebuggerController.h" -#import "DebuggerConnection.h" +#import "GDBpConnection.h" #import "NSXMLElementAdditions.h" #import "AppDelegate.h" #import "BreakpointManager.h" @@ -37,7 +37,7 @@ if (self = [super initWithWindowNibName:@"Debugger"]) { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - connection = [[DebuggerConnection alloc] initWithWindowController:self + connection = [[GDBpConnection alloc] initWithWindowController:self port:[defaults integerForKey:@"Port"] session:[defaults stringForKey:@"IDEKey"]]; expandedRegisters = [[NSMutableSet alloc] init]; diff --git a/Source/DebuggerConnection.h b/Source/GDBpConnection.h similarity index 97% rename from Source/DebuggerConnection.h rename to Source/GDBpConnection.h index 4955290..eb7f747 100644 --- a/Source/DebuggerConnection.h +++ b/Source/GDBpConnection.h @@ -19,7 +19,7 @@ #import "SocketWrapper.h" #import "Breakpoint.h" -@interface DebuggerConnection : NSObject +@interface GDBpConnection : NSObject { int port; NSString *session; diff --git a/Source/DebuggerConnection.m b/Source/GDBpConnection.m similarity index 98% rename from Source/DebuggerConnection.m rename to Source/GDBpConnection.m index 348fa22..10fa28a 100644 --- a/Source/DebuggerConnection.m +++ b/Source/GDBpConnection.m @@ -14,15 +14,15 @@ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#import "DebuggerConnection.h" +#import "GDBpConnection.h" #import "AppDelegate.h" -@interface DebuggerConnection (Private) +@interface GDBpConnection (Private) - (NSString *)createCommand:(NSString *)cmd; - (NSXMLDocument *)processData:(NSString *)data; @end -@implementation DebuggerConnection +@implementation GDBpConnection @synthesize socket, windowController; diff --git a/Source/SocketWrapper.h b/Source/SocketWrapper.h index 2877df8..2e0850f 100644 --- a/Source/SocketWrapper.h +++ b/Source/SocketWrapper.h @@ -16,11 +16,11 @@ #import -@class DebuggerConnection; +@class GDBpConnection; @interface SocketWrapper : NSObject { - DebuggerConnection *connection; + GDBpConnection *connection; int port; int sock; @@ -29,7 +29,7 @@ id delegate; } -- (id)initWithConnection:(DebuggerConnection *)cnx; +- (id)initWithConnection:(GDBpConnection *)cnx; - (id)delegate; - (void)setDelegate:(id)aDelegate; diff --git a/Source/SocketWrapper.m b/Source/SocketWrapper.m index 326c35d..2e09313 100644 --- a/Source/SocketWrapper.m +++ b/Source/SocketWrapper.m @@ -33,7 +33,7 @@ /** * Initializes the socket wrapper with a host and port */ -- (id)initWithConnection:(DebuggerConnection *)cnx +- (id)initWithConnection:(GDBpConnection *)cnx { if (self = [super init]) { -- 2.22.5