From 6010640d3328f1445926349538747b25d2c67d51 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Mon, 14 Jul 2008 12:12:10 -0400 Subject: [PATCH] Renaming DebuggerWindowController to DebuggerController --- English.lproj/Debugger.xib | 20 +++++-------------- English.lproj/MainMenu.xib | 11 +++++----- MacGDBp.xcodeproj/project.pbxproj | 12 +++++------ Source/AppDelegate.h | 6 +++--- Source/DebuggerConnection.h | 8 ++++---- Source/DebuggerConnection.m | 2 +- ...indowController.h => DebuggerController.h} | 2 +- ...indowController.m => DebuggerController.m} | 6 +++--- 8 files changed, 28 insertions(+), 39 deletions(-) rename Source/{DebuggerWindowController.h => DebuggerController.h} (97%) rename Source/{DebuggerWindowController.m => DebuggerController.m} (98%) diff --git a/English.lproj/Debugger.xib b/English.lproj/Debugger.xib index 75d9ab6..a66de89 100644 --- a/English.lproj/Debugger.xib +++ b/English.lproj/Debugger.xib @@ -2,13 +2,12 @@ 1050 - 9D34 - 667 + 9E17 + 670 949.33 352.00 YES - YES @@ -17,7 +16,7 @@ YES - DebuggerWindowController + DebuggerController FirstResponder @@ -394,7 +393,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ {3.40282e+38, 3.40282e+38} {213, 107} - + 256 YES @@ -886,7 +885,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ {769, 501} - {{0, 0}, {1440, 878}} {213, 169} @@ -1804,7 +1802,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ - DebuggerWindowController + DebuggerController NSWindowController YES @@ -1856,14 +1854,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ NSToolbarItem - - IBProjectSource - Source/DebuggerWindowController.h - - - - DebuggerWindowController - NSWindowController IBUserSource diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index ce5b817..e223abb 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -8,7 +8,6 @@ 352.00 YES - YES @@ -702,7 +701,7 @@ BreakpointWindowController - DebuggerWindowController + DebuggerController SUUpdater @@ -1892,7 +1891,7 @@ YES BreakpointWindowController - DebuggerWindowController + DebuggerController @@ -1955,7 +1954,7 @@ - DebuggerWindowController + DebuggerController NSWindowController YES @@ -2008,8 +2007,8 @@ - IBProjectSource - Source/DebuggerWindowController.h + IBUserSource + diff --git a/MacGDBp.xcodeproj/project.pbxproj b/MacGDBp.xcodeproj/project.pbxproj index 2b3af10..adee687 100644 --- a/MacGDBp.xcodeproj/project.pbxproj +++ b/MacGDBp.xcodeproj/project.pbxproj @@ -12,7 +12,7 @@ 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 */; }; - 1E02C5F60C610724006F1752 /* DebuggerWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C5F50C610724006F1752 /* DebuggerWindowController.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 */; }; 1E35FEA10C6599040030F527 /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E35FEA00C6599040030F527 /* base64.c */; }; @@ -63,8 +63,8 @@ 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 = ""; }; - 1E02C5F40C610724006F1752 /* DebuggerWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerWindowController.h; path = Source/DebuggerWindowController.h; sourceTree = ""; }; - 1E02C5F50C610724006F1752 /* DebuggerWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DebuggerWindowController.m; path = Source/DebuggerWindowController.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 = ""; }; 1E35FC750C6579CA0030F527 /* NSXMLElementAdditions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NSXMLElementAdditions.m; path = Source/NSXMLElementAdditions.m; sourceTree = ""; }; 1E35FE9F0C6599040030F527 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = Source/base64.h; sourceTree = ""; }; @@ -187,8 +187,8 @@ children = ( 1E02C56F0C610158006F1752 /* DebuggerConnection.h */, 1E02C5700C610158006F1752 /* DebuggerConnection.m */, - 1E02C5F40C610724006F1752 /* DebuggerWindowController.h */, - 1E02C5F50C610724006F1752 /* DebuggerWindowController.m */, + 1E02C5F40C610724006F1752 /* DebuggerController.h */, + 1E02C5F50C610724006F1752 /* DebuggerController.m */, 1EEEE93E0C618B70000C0732 /* SocketWrapper.h */, 1EEEE93F0C618B70000C0732 /* SocketWrapper.m */, 1E35FFB00C65A74C0030F527 /* NSXMLElementAdditions.h */, @@ -363,7 +363,7 @@ 8D11072D0486CEB800E47090 /* main.m in Sources */, 1E02C3D50C60EC2C006F1752 /* AppDelegate.m in Sources */, 1E02C5710C610158006F1752 /* DebuggerConnection.m in Sources */, - 1E02C5F60C610724006F1752 /* DebuggerWindowController.m in Sources */, + 1E02C5F60C610724006F1752 /* DebuggerController.m in Sources */, 1EEEE9400C618B70000C0732 /* SocketWrapper.m in Sources */, 1E35FC760C6579CA0030F527 /* NSXMLElementAdditions.m in Sources */, 1E35FEA10C6599040030F527 /* base64.c in Sources */, diff --git a/Source/AppDelegate.h b/Source/AppDelegate.h index 9073f1b..d35568f 100644 --- a/Source/AppDelegate.h +++ b/Source/AppDelegate.h @@ -15,18 +15,18 @@ */ #import -#import "DebuggerWindowController.h" +#import "DebuggerController.h" #import "BreakpointWindowController.h" #import "PreferencesController.h" @interface AppDelegate : NSObject { - IBOutlet DebuggerWindowController *debugger; + IBOutlet DebuggerController *debugger; IBOutlet BreakpointWindowController *breakpoint; PreferencesController *prefs; } -@property(readonly) DebuggerWindowController *debugger; +@property(readonly) DebuggerController *debugger; @property(readonly) BreakpointWindowController *breakpoint; - (IBAction)showDebuggerWindow:(id)sender; diff --git a/Source/DebuggerConnection.h b/Source/DebuggerConnection.h index 61b1a95..4955290 100644 --- a/Source/DebuggerConnection.h +++ b/Source/DebuggerConnection.h @@ -15,7 +15,7 @@ */ #import -#import "DebuggerWindowController.h" +#import "DebuggerController.h" #import "SocketWrapper.h" #import "Breakpoint.h" @@ -25,16 +25,16 @@ NSString *session; BOOL connected; - DebuggerWindowController *windowController; + DebuggerController *windowController; SocketWrapper *socket; } @property(readonly) SocketWrapper *socket; -@property(readonly) DebuggerWindowController *windowController; +@property(readonly) DebuggerController *windowController; // initializer -- (id)initWithWindowController:(DebuggerWindowController *)wc port:(int)aPort session:(NSString *)aSession; +- (id)initWithWindowController:(DebuggerController *)wc port:(int)aPort session:(NSString *)aSession; // getter - (int)port; diff --git a/Source/DebuggerConnection.m b/Source/DebuggerConnection.m index 4e03e18..348fa22 100644 --- a/Source/DebuggerConnection.m +++ b/Source/DebuggerConnection.m @@ -30,7 +30,7 @@ * Creates a new DebuggerConnection and initializes the socket from the given connection * paramters. */ -- (id)initWithWindowController:(DebuggerWindowController *)wc port:(int)aPort session:(NSString *)aSession; +- (id)initWithWindowController:(DebuggerController *)wc port:(int)aPort session:(NSString *)aSession; { if (self = [super init]) { diff --git a/Source/DebuggerWindowController.h b/Source/DebuggerController.h similarity index 97% rename from Source/DebuggerWindowController.h rename to Source/DebuggerController.h index b3fe5d0..54cc034 100644 --- a/Source/DebuggerWindowController.h +++ b/Source/DebuggerController.h @@ -19,7 +19,7 @@ @class DebuggerConnection; -@interface DebuggerWindowController : NSWindowController +@interface DebuggerController : NSWindowController { DebuggerConnection *connection; diff --git a/Source/DebuggerWindowController.m b/Source/DebuggerController.m similarity index 98% rename from Source/DebuggerWindowController.m rename to Source/DebuggerController.m index a1bdf82..b9f1ba6 100644 --- a/Source/DebuggerWindowController.m +++ b/Source/DebuggerController.m @@ -14,17 +14,17 @@ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#import "DebuggerWindowController.h" +#import "DebuggerController.h" #import "DebuggerConnection.h" #import "NSXMLElementAdditions.h" #import "AppDelegate.h" #import "BreakpointManager.h" -@interface DebuggerWindowController (Private) +@interface DebuggerController (Private) - (void)updateSourceViewer; @end -@implementation DebuggerWindowController +@implementation DebuggerController @synthesize connection, sourceViewer; -- 2.22.5