Renamed ServiceController ⇢ BonjourController

radiantcapsule · Nov 3, 2011 · 0852e10 · 0852e10
1 parent ce4f9f9
commit 0852e10
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 20 deletions.
diff --git a/ServiceController.h → BonjourController.h b/ServiceController.h → BonjourController.h
@@ -1,5 +1,5 @@
 //
-//  ServiceController.h
+//  BonjourController.h
 //  DNSReg
 //
 //  Created by Alex Vollmer on 11/3/11.
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <dns_sd.h>
 
-@interface ServiceController : NSObject
+@interface BonjourController : NSObject
 {
 	DNSServiceRef       fServiceRef;
 	CFSocketRef         fSocketRef;

diff --git a/ServiceController.m → BonjourController.m b/ServiceController.m → BonjourController.m
@@ -1,12 +1,12 @@
 //
-//  ServiceController.m
+//  BonjourController.m
 //  DNSReg
 //
 //  Created by Alex Vollmer on 11/3/11.
 //  Copyright (c) 2011 __MyCompanyName__. All rights reserved.
 //
 
-#import "ServiceController.h"
+#import "BonjourController.h"
 
 static void ProcessSocketResult(CFSocketRef s, CFSocketCallBackType type, CFDataRef address, const void *data, void *info)
 {
@@ -19,7 +19,7 @@ static void ProcessSocketResult(CFSocketRef s, CFSocketCallBackType type, CFData
   }
 }
 
-@implementation ServiceController
+@implementation BonjourController
 
 - (id)initWithServiceRef:(DNSServiceRef)ref
 {
@@ -80,4 +80,4 @@ - (void)dealloc
 }
 
 
-@end // implementation ServiceController
+@end // implementation BonjourController
diff --git a/DNRResolveViewController.m b/DNRResolveViewController.m
@@ -10,7 +10,7 @@
 
 #import "DNRResolveViewController.h"
 #import "DNSRecord.h"
-#import "ServiceController.h"
+#import "BonjourController.h"
 
 static void ResolveCallback(
                             DNSServiceRef                       sdRef,
@@ -27,7 +27,7 @@ static void ResolveCallback(
 
 @interface DNRResolveViewController ()
 
-@property (nonatomic, retain) ServiceController *resolveController;
+@property (nonatomic, retain) BonjourController *resolveController;
 
 - (void)updatePeerWithHost:(NSString *)host port:(uint16_t)port;
 - (void)updateErrorMessage:(NSString *)message;
@@ -133,7 +133,7 @@ - (void)viewDidAppear:(BOOL)animated
                                                   self);
 
     if (kDNSServiceErr_NoError == error) {
-        self.resolveController = [[[ServiceController alloc] initWithServiceRef:serviceRef] autorelease];
+        self.resolveController = [[[BonjourController alloc] initWithServiceRef:serviceRef] autorelease];
         [self.resolveController addToCurrentRunLoop];
     }
     else {

diff --git a/DNSReg.xcodeproj/project.pbxproj b/DNSReg.xcodeproj/project.pbxproj
@@ -17,7 +17,7 @@
 		FA8D61061461BE25005A9D01 /* DNRViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = FA8D61041461BE25005A9D01 /* DNRViewController.xib */; };
 		FA8D61141461F55B005A9D01 /* DNRResolveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA8D61121461F55B005A9D01 /* DNRResolveViewController.m */; };
 		FA8D61151461F55B005A9D01 /* DNRResolveViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = FA8D61131461F55B005A9D01 /* DNRResolveViewController.xib */; };
-		FA8D612414630290005A9D01 /* ServiceController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA8D612314630290005A9D01 /* ServiceController.m */; };
+		FA8D612414630290005A9D01 /* BonjourController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA8D612314630290005A9D01 /* BonjourController.m */; };
 		FA8D612714630310005A9D01 /* DNSRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = FA8D612614630310005A9D01 /* DNSRecord.m */; };
 /* End PBXBuildFile section */
 
@@ -38,8 +38,8 @@
 		FA8D61111461F55B005A9D01 /* DNRResolveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DNRResolveViewController.h; sourceTree = "<group>"; };
 		FA8D61121461F55B005A9D01 /* DNRResolveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DNRResolveViewController.m; sourceTree = "<group>"; };
 		FA8D61131461F55B005A9D01 /* DNRResolveViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DNRResolveViewController.xib; sourceTree = "<group>"; };
-		FA8D612214630290005A9D01 /* ServiceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServiceController.h; sourceTree = "<group>"; };
-		FA8D612314630290005A9D01 /* ServiceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ServiceController.m; sourceTree = "<group>"; };
+		FA8D612214630290005A9D01 /* BonjourController.h */ = {isa = PBXFileReference; fileEncoding = 4; path = BonjourController.h; sourceTree = "<group>"; };
+		FA8D612314630290005A9D01 /* BonjourController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BonjourController.m; sourceTree = "<group>"; };
 		FA8D612514630310005A9D01 /* DNSRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DNSRecord.h; sourceTree = "<group>"; };
 		FA8D612614630310005A9D01 /* DNSRecord.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DNSRecord.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -61,10 +61,10 @@
 		FA8D60E01461BE25005A9D01 = {
 			isa = PBXGroup;
 			children = (
-				FA8D612214630290005A9D01 /* ServiceController.h */,
+				FA8D612214630290005A9D01 /* BonjourController.h */,
 				FA8D612514630310005A9D01 /* DNSRecord.h */,
 				FA8D612614630310005A9D01 /* DNSRecord.m */,
-				FA8D612314630290005A9D01 /* ServiceController.m */,
+				FA8D612314630290005A9D01 /* BonjourController.m */,
 				FA8D61111461F55B005A9D01 /* DNRResolveViewController.h */,
 				FA8D61121461F55B005A9D01 /* DNRResolveViewController.m */,
 				FA8D61131461F55B005A9D01 /* DNRResolveViewController.xib */,
@@ -183,7 +183,7 @@
 				FA8D61001461BE25005A9D01 /* DNRAppDelegate.m in Sources */,
 				FA8D61031461BE25005A9D01 /* DNRViewController.m in Sources */,
 				FA8D61141461F55B005A9D01 /* DNRResolveViewController.m in Sources */,
-				FA8D612414630290005A9D01 /* ServiceController.m in Sources */,
+				FA8D612414630290005A9D01 /* BonjourController.m in Sources */,
 				FA8D612714630310005A9D01 /* DNSRecord.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/alex.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/alex.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...eg.xcodeproj/project.xcworkspace/xcuserdata/alex.xcuserdatad/WorkspaceSettings.xcsettings b/...eg.xcodeproj/project.xcworkspace/xcuserdata/alex.xcuserdatad/WorkspaceSettings.xcsettings
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEWorkspaceUserSettings_HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
+	<true/>
+	<key>IDEWorkspaceUserSettings_SnapshotAutomaticallyBeforeSignificantChanges</key>
+	<false/>
+</dict>
+</plist>
diff --git a/DNSReg/DNRViewController.m b/DNSReg/DNRViewController.m
@@ -9,7 +9,7 @@
 #import "DNRViewController.h"
 #import "DNRResolveViewController.h"
 #import "DNSRecord.h"
-#import "ServiceController.h"
+#import "BonjourController.h"
 
 #pragma mark - Function prototypes
 
@@ -42,8 +42,8 @@ @interface DNRViewController ()
 
 @property (nonatomic, retain) NSMutableArray *peerServices;    
 @property (nonatomic, retain) NSString *peerID;
-@property (nonatomic, retain) ServiceController *registrationController;
-@property (nonatomic, retain) ServiceController *browseController;
+@property (nonatomic, retain) BonjourController *registrationController;
+@property (nonatomic, retain) BonjourController *browseController;
 
 - (void)start;
 - (void)stop;
@@ -252,7 +252,7 @@ - (void)start
         return;
     }
 
-    self.registrationController = [[[ServiceController alloc] initWithServiceRef:serviceRef] autorelease];
+    self.registrationController = [[[BonjourController alloc] initWithServiceRef:serviceRef] autorelease];
     [self.registrationController addToCurrentRunLoop];
 
     // 2. Now start browsing
@@ -272,7 +272,7 @@ - (void)start
         return;
     }
 
-    self.browseController = [[[ServiceController alloc] initWithServiceRef:serviceRef] autorelease];
+    self.browseController = [[[BonjourController alloc] initWithServiceRef:serviceRef] autorelease];
     [self.browseController addToCurrentRunLoop];
 }