Rename DebuggerConnection to DebuggerProcessor in preparation for the separation...

diff --git a/MacGDBp.xcodeproj/project.pbxproj b/MacGDBp.xcodeproj/project.pbxproj
index ac19f9778fc5ed803574e425309eb7fca77636a3..d8dcc9515d4f5262dc735de6684938f953678254 100644 (file)
--- 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 /* DebuggerProcessor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C5700C610158006F1752 /* DebuggerProcessor.m */; };
                1E02C5F60C610724006F1752 /* DebuggerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C5F50C610724006F1752 /* DebuggerController.m */; };
                1E0AFBB90FC2518700C67031 /* HUDIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E0AFBB80FC2518700C67031 /* HUDIcon.png */; };
                1E1E53030DF9B89800D334F9 /* Breakpoints.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1E1E53010DF9B89800D334F9 /* Breakpoints.xib */; };
@@ -67,8 +67,8 @@
                1E027F380D36F60800885DEE /* Reconnect.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Reconnect.png; path = Icons/Reconnect.png; sourceTree = "<group>"; };
                1E02C3D30C60EC2C006F1752 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Source/AppDelegate.h; sourceTree = "<group>"; };
                1E02C3D40C60EC2C006F1752 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Source/AppDelegate.m; sourceTree = "<group>"; };
-               1E02C56F0C610158006F1752 /* DebuggerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerConnection.h; path = Source/DebuggerConnection.h; sourceTree = "<group>"; };
-               1E02C5700C610158006F1752 /* DebuggerConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DebuggerConnection.m; path = Source/DebuggerConnection.m; sourceTree = "<group>"; };
+               1E02C56F0C610158006F1752 /* DebuggerProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerProcessor.h; path = Source/DebuggerProcessor.h; sourceTree = "<group>"; };
+               1E02C5700C610158006F1752 /* DebuggerProcessor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DebuggerProcessor.m; path = Source/DebuggerProcessor.m; sourceTree = "<group>"; };
                1E02C5F40C610724006F1752 /* DebuggerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerController.h; path = Source/DebuggerController.h; sourceTree = "<group>"; };
                1E02C5F50C610724006F1752 /* DebuggerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DebuggerController.m; path = Source/DebuggerController.m; sourceTree = "<group>"; };
                1E0AFBB80FC2518700C67031 /* HUDIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HUDIcon.png; path = Icons/HUDIcon.png; sourceTree = "<group>"; };
@@ -202,8 +202,8 @@
                1E1E52C10DF9B1FB00D334F9 /* Connection */ = {
                        isa = PBXGroup;
                        children = (
-                               1E02C56F0C610158006F1752 /* DebuggerConnection.h */,
-                               1E02C5700C610158006F1752 /* DebuggerConnection.m */,
+                               1E02C56F0C610158006F1752 /* DebuggerProcessor.h */,
+                               1E02C5700C610158006F1752 /* DebuggerProcessor.m */,
                                1E35FFB00C65A74C0030F527 /* NSXMLElementAdditions.h */,
                                1E35FC750C6579CA0030F527 /* NSXMLElementAdditions.m */,
                                1E6B5945116106FE001189D2 /* LoggingController.h */,
@@ -397,7 +397,7 @@
                        files = (
                                8D11072D0486CEB800E47090 /* main.m in Sources */,
                                1E02C3D50C60EC2C006F1752 /* AppDelegate.m in Sources */,
-                               1E02C5710C610158006F1752 /* DebuggerConnection.m in Sources */,
+                               1E02C5710C610158006F1752 /* DebuggerProcessor.m in Sources */,
                                1E02C5F60C610724006F1752 /* DebuggerController.m in Sources */,
                                1E35FC760C6579CA0030F527 /* NSXMLElementAdditions.m in Sources */,
                                1E35FEA10C6599040030F527 /* base64.c in Sources */,

diff --git a/Source/BreakpointManager.h b/Source/BreakpointManager.h
index 48cd184f2662ea0c641776be16da53da877d0602..4d3e1b6ce917b45147b200f6062e3ed2c72d8ded 100644 (file)
--- a/Source/BreakpointManager.h
+++ b/Source/BreakpointManager.h
@@ -16,17 +16,17 @@
 
 #import <Cocoa/Cocoa.h>
 #import "Breakpoint.h"
-#import "DebuggerConnection.h"
+#import "DebuggerProcessor.h"
 
 @interface BreakpointManager : NSObject
 {
        NSMutableArray* breakpoints;
        NSMutableArray* savedBreakpoints;
        
-       DebuggerConnection* connection;
+       DebuggerProcessor* connection;
 }
 
-@property(readwrite, assign) DebuggerConnection* connection;
+@property(readwrite, assign) DebuggerProcessor* connection;
 @property(readonly) NSMutableArray* breakpoints;
 
 + (BreakpointManager*)sharedManager;

diff --git a/Source/DebuggerController.h b/Source/DebuggerController.h
index 6fc3b125738d4a5e623cf37f844cae2eb48f0dee..37e4f915bd18b63d20b54f2e944642e9f40f5fe4 100644 (file)
--- a/Source/DebuggerController.h
+++ b/Source/DebuggerController.h
@@ -16,12 +16,12 @@
 
 #import <Cocoa/Cocoa.h>
 #import "BSSourceView.h"
-#import "DebuggerConnection.h"
+#import "DebuggerProcessor.h"
 #import "StackController.h"
 
-@interface DebuggerController : NSWindowController <DebuggerConnectionDelegate>
+@interface DebuggerController : NSWindowController <DebuggerProcessorDelegate>
 {
-       DebuggerConnection* connection;
+       DebuggerProcessor* connection;
        
        // This is true when the |connection| has told us to clobber. We will do
        // so upon receipt of the first new stack frame.
@@ -43,7 +43,7 @@
        IBOutlet BSSourceView* sourceViewer;
 }
 
-@property(readonly) DebuggerConnection* connection;
+@property(readonly) DebuggerProcessor* connection;
 @property(readonly) BSSourceView* sourceViewer;
 @property(readonly) NSWindow* inspector;
 

diff --git a/Source/DebuggerController.m b/Source/DebuggerController.m
index d6e06b4cc2400aefd17822faa44f0d9f3cba9e79..365401e5d7e5ddfba7a572897d674ef1684faccf 100644 (file)
--- a/Source/DebuggerController.m
+++ b/Source/DebuggerController.m
@@ -41,7 +41,7 @@
                
                NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
 
-               connection = [[DebuggerConnection alloc] initWithPort:[defaults integerForKey:@"Port"]];
+               connection = [[DebuggerProcessor alloc] initWithPort:[defaults integerForKey:@"Port"]];
                connection.delegate = self;
                expandedVariables = [[NSMutableSet alloc] init];
                [[self window] makeKeyAndOrderFront:nil];

diff --git a/Source/DebuggerConnection.h b/Source/DebuggerProcessor.h
similarity index 95%
rename from Source/DebuggerConnection.h
rename to Source/DebuggerProcessor.h
index 115bd96b5aa02054ae1aa242168b067a5f7778aa..80db4f665c7f57320b641e531b0d5e65e7617f8c 100644 (file)
--- a/Source/DebuggerConnection.h
+++ b/Source/DebuggerProcessor.h
@@ -21,7 +21,7 @@
 
 @class LoggingController;
 
-@protocol DebuggerConnectionDelegate;
+@protocol DebuggerProcessorDelegate;
 
 // The DebuggerConnection is the communication layer between the application
 // and the Xdebug engine. Clients can issue debugger commands using this class,
@@ -30,7 +30,7 @@
 // primary unit that this class deals with is the StackFrame; clients should
 // maintain a stack structure and the Connection will inform the delegate when
 // a new frame is created or the stack should be destroyed.
-@interface DebuggerConnection : NSObject
+@interface DebuggerProcessor : NSObject
 {
        // The port to connect on.
        NSUInteger port;
@@ -42,7 +42,7 @@
        NSString* status;
        
        // The connection's delegate.
-       id <DebuggerConnectionDelegate> delegate;
+       id <DebuggerProcessorDelegate> delegate;
 
        // The raw CFSocket on which the two streams are based. Strong.
        CFSocketRef socket_;
@@ -98,7 +98,7 @@
 }
 
 @property (readonly, copy) NSString* status;
-@property (assign) id <DebuggerConnectionDelegate> delegate;
+@property (assign) id <DebuggerProcessorDelegate> delegate;
 
 // initializer
 - (id)initWithPort:(NSUInteger)aPort;
@@ -125,7 +125,7 @@
 
 // Delegate ////////////////////////////////////////////////////////////////////
 
-@protocol DebuggerConnectionDelegate <NSObject>
+@protocol DebuggerProcessorDelegate <NSObject>
 
 // Passes up errors from SocketWrapper and any other errors generated by the
 // GDBpConnection.

diff --git a/Source/DebuggerConnection.m b/Source/DebuggerProcessor.m
similarity index 99%
rename from Source/DebuggerConnection.m
rename to Source/DebuggerProcessor.m
index 3ab0f444d9e2c7cbe472659c343177cfd56744d6..1d215ddf5dff02305f211cf248f0fa0efd87e559 100644 (file)
--- a/Source/DebuggerConnection.m
+++ b/Source/DebuggerProcessor.m
@@ -17,14 +17,14 @@
 #import <sys/socket.h>
 #import <netinet/in.h>
 
-#import "DebuggerConnection.h"
+#import "DebuggerProcessor.h"
 
 #import "AppDelegate.h"
 #import "LoggingController.h"
 
 // GDBpConnection (Private) ////////////////////////////////////////////////////
 
-@interface DebuggerConnection ()
+@interface DebuggerProcessor ()
 @property (readwrite, copy) NSString* status;
 @property (assign) CFSocketRef socket;
 @property (assign) CFReadStreamRef readStream;
@@ -69,7 +69,7 @@
 
 void ReadStreamCallback(CFReadStreamRef stream, CFStreamEventType eventType, void* connectionRaw)
 {
-       DebuggerConnection* connection = (DebuggerConnection*)connectionRaw;
+       DebuggerProcessor* connection = (DebuggerProcessor*)connectionRaw;
        switch (eventType)
        {
                case kCFStreamEventHasBytesAvailable:
@@ -97,7 +97,7 @@ void ReadStreamCallback(CFReadStreamRef stream, CFStreamEventType eventType, voi
 
 void WriteStreamCallback(CFWriteStreamRef stream, CFStreamEventType eventType, void* connectionRaw)
 {
-       DebuggerConnection* connection = (DebuggerConnection*)connectionRaw;
+       DebuggerProcessor* connection = (DebuggerProcessor*)connectionRaw;
        switch (eventType)
        {
                case kCFStreamEventCanAcceptBytes:
@@ -132,7 +132,7 @@ void SocketAcceptCallback(CFSocketRef socket,
        assert(callbackType == kCFSocketAcceptCallBack);
        NSLog(@"SocketAcceptCallback()");
        
-       DebuggerConnection* connection = (DebuggerConnection*)connectionRaw;
+       DebuggerProcessor* connection = (DebuggerProcessor*)connectionRaw;
        
        CFReadStreamRef readStream;
        CFWriteStreamRef writeStream;
@@ -198,7 +198,7 @@ void SocketAcceptCallback(CFSocketRef socket,
 
 // GDBpConnection //////////////////////////////////////////////////////////////
 
-@implementation DebuggerConnection
+@implementation DebuggerProcessor
 @synthesize socket = socket_;
 @synthesize readStream = readStream_;
 @synthesize lastReadTransaction = lastReadTransaction_;