Remove legacy instance variables and synthesize

NuRemote/NRStats.h

@@ -6,15 +6,7 @@
 -(void)stats:(NRStats *)stats prunedPoints:(NSUInteger)deletedCount;
 @end
 
-@interface NRStats : NSObject {
-	NSString *_name;
-	NSMutableArray *_times;
-	NSMutableArray *_data;
-	id<NRStatsDelegate> __unsafe_unretained _delegate;
-	NSTimeInterval _maximumDataAge;
-	NSTimeInterval _timeGranuality;
-    NSFormatter *_formatter;
-}
+@interface NRStats : NSObject
 @property(nonatomic,copy,readonly) NSString *name;
 @property(nonatomic,strong,readonly) NSMutableArray *times, *data;
 @property(nonatomic) NSTimeInterval maximumDataAge; // default 60

NuRemote/NRStats.m

@@ -12,8 +12,6 @@ @interface NRStats ()
 @end
 
 @implementation NRStats
-@synthesize name = _name, times = _times, data = _data, delegate = _delegate, maximumDataAge = _maximumDataAge, timeGranuality = _timeGranuality;
-@synthesize formatter = _formatter;
 -(instancetype)initWithName:(NSString*)name;
 {
 	if(!(self = [super init])) return nil;

NuRemote/RemotingClient.h

@@ -24,13 +24,7 @@
 @end
 
 
-@interface RemotingClient : NSObject {
-	AsyncSocket *socket;
-	NSString *name;
-	NSString *incomingDatasetName;
-	NSMutableDictionary *delegateResponseMap;
-	NSData *messageSeparator;
-}
+@interface RemotingClient : NSObject
 @property(nonatomic,strong) id<RemotingClientDelegate> delegate;
 @property(nonatomic,copy) NSString *name;
 @property(nonatomic,readonly,strong) AsyncSocket *socket;

NuRemote/RemotingClient.m

@@ -8,7 +8,10 @@
 
 #import "RemotingClient.h"
 
-@interface RemotingClient ()
+@interface RemotingClient ()  {
+    NSMutableDictionary *delegateResponseMap;
+}
+
 @property(nonatomic,readwrite,strong) AsyncSocket *socket;
 @property(nonatomic,copy) NSString *incomingDatasetName;
 @property(nonatomic,copy) NSData *messageSeparator;
@@ -35,7 +38,6 @@ typedef NS_ENUM(NSInteger, ReadingType) {
 }
 
 @implementation RemotingClient
-@synthesize socket, name, incomingDatasetName, messageSeparator;
 
 +(void)performSearchOnBrowser:(NSNetServiceBrowser*)browser;
 {
@@ -45,10 +47,10 @@ -(instancetype)initWithService:(NSNetService*)service error:(NSError**)err;
 {
 	self.messageSeparator = [NSData dataWithBytes:"\xa\xa" length:2];
 
-	self.socket = [[AsyncSocket alloc] initWithDelegate:self];
-	[self.socket setRunLoopModes:@[NSRunLoopCommonModes]];
+	_socket = [[AsyncSocket alloc] initWithDelegate:self];
+	[_socket setRunLoopModes:@[NSRunLoopCommonModes]];
 
-	if(![socket connectToAddress:(service.addresses)[0] error:err]) {
+	if(![_socket connectToAddress:(service.addresses)[0] error:err]) {
 		return nil;
 	}
 
@@ -61,10 +63,10 @@ -(instancetype)initWithHost:(NSString*)host port:(int)port error:(NSError**)err;
 {
 	self.messageSeparator = [NSData dataWithBytes:"\xa\xa" length:2];
 
-	self.socket = [[AsyncSocket alloc] initWithDelegate:self];
-	[self.socket setRunLoopModes:@[NSRunLoopCommonModes]];
+	_socket = [[AsyncSocket alloc] initWithDelegate:self];
+	[_socket setRunLoopModes:@[NSRunLoopCommonModes]];
 
-	if(![socket connectToHost:host onPort:port error:err]) {
+	if(![_socket connectToHost:host onPort:port error:err]) {
 		return nil;
 	}
 
@@ -76,8 +78,8 @@ -(instancetype)initWithHost:(NSString*)host port:(int)port error:(NSError**)err;
 }
 -(void)dealloc;
 {
-	self.socket.delegate = nil;
-	 delegateResponseMap = nil;
+    _socket.delegate = nil;
+    delegateResponseMap = nil;
 }
 
 #define MapResponse(sel) [delegateResponseMap setObject:[NSNumber numberWithBool:[_delegate respondsToSelector:@selector(sel)]] forKey:NSStringFromSelector(@selector(sel))];
@@ -110,7 +112,7 @@ - (void)onSocket:(AsyncSocket *)sock didConnectToHost:(NSString *)host port:(UIn
 {
 	[self sendCommand:@"(connection useETBForMessageSeparator)"];
 	self.messageSeparator = [NSData dataWithBytes:(char[]){23} length:1];
-	[socket readDataToData:self.messageSeparator withTimeout:-1 tag:kReadingCommand];
+	[self.socket readDataToData:self.messageSeparator withTimeout:-1 tag:kReadingCommand];
 
 	if(DelegateResponds(remotingClient:receivedOutput:withStatusCode:))
 		[_delegate remotingClient:self receivedOutput:@"Enabling logging and stats...." withStatusCode:1];
@@ -141,11 +143,11 @@ - (void)onSocket:(AsyncSocket *)sock didReadData:(NSData *)data withTag:(long)ta
 				if(DelegateResponds(remotingClient:receivedOutput:withStatusCode:))
 					[_delegate remotingClient:self receivedOutput:[NSString stringWithFormat:@"Receiving %d bytes of stats...", length] withStatusCode:[code intValue]];
 
-				[socket readDataToLength:length withTimeout:-1 tag:kReadingDatasetPriming];
+				[self.socket readDataToLength:length withTimeout:-1 tag:kReadingDatasetPriming];
 			} else if([code intValue] == RemotingDataReply) {
 				if(DelegateResponds(remotingClient:receivedOutput:withStatusCode:))
 					[_delegate remotingClient:self receivedOutput:[NSString stringWithFormat:@"Receiving %d bytes of data...", length] withStatusCode:[code intValue]];
-				[socket readDataToLength:length withTimeout:-1 tag:kReadingData];
+				[self.socket readDataToLength:length withTimeout:-1 tag:kReadingData];
 			}
 		} else if([code intValue] == RemotingStatusStatsNewDataPoint) {
 			if(DelegateResponds(remotingClient:receivedPoint:at:inSet:)) {
@@ -158,20 +160,20 @@ - (void)onSocket:(AsyncSocket *)sock didReadData:(NSData *)data withTag:(long)ta
 					inSet:components[0]
 				];
 			}
-			[socket readDataToData:self.messageSeparator withTimeout:-1 tag:kReadingCommand];
+			[self.socket readDataToData:self.messageSeparator withTimeout:-1 tag:kReadingCommand];
 
 		} else {
 			if(DelegateResponds(remotingClient:receivedOutput:withStatusCode:))
 				[_delegate remotingClient:self receivedOutput:output withStatusCode:[code intValue]];
-			[socket readDataToData:self.messageSeparator withTimeout:-1 tag:kReadingCommand];
+			[self.socket readDataToData:self.messageSeparator withTimeout:-1 tag:kReadingCommand];
 		}
 
 	} else if (tag == kReadingData) {
 		if(DelegateResponds(remotingClient:receivedOutput:withStatusCode:))
 			[_delegate remotingClient:self receivedOutput:[NSString stringWithFormat:@"Received %lu bytes of data.", (unsigned long)[data length]] withStatusCode:201];
 		if(DelegateResponds(remotingClient:receivedData:))
 			[_delegate remotingClient:self receivedData:data];
-		[socket readDataToData:self.messageSeparator withTimeout:-1 tag:kReadingCommand];
+		[self.socket readDataToData:self.messageSeparator withTimeout:-1 tag:kReadingCommand];
 	} else if (tag == kReadingDatasetPriming) {
 		NSDictionary *primedStats = [NSKeyedUnarchiver unarchiveObjectWithData:data];
 		if(DelegateResponds(remotingClient:receivedOutput:withStatusCode:))
@@ -183,15 +185,15 @@ - (void)onSocket:(AsyncSocket *)sock didReadData:(NSData *)data withTag:(long)ta
 
 		self.incomingDatasetName = nil;
 
-		[socket readDataToData:self.messageSeparator withTimeout:-1 tag:kReadingCommand];
+		[self.socket readDataToData:self.messageSeparator withTimeout:-1 tag:kReadingCommand];
 	}
 }
 -(void)sendCommand:(NSString*)commands;
 {
 	NSMutableData *data = [NSMutableData data];
 	[data appendData:[commands dataUsingEncoding:NSUTF8StringEncoding]];
 	[data appendData:self.messageSeparator];
-	[socket writeData:data withTimeout:-1 tag:0];
+	[self.socket writeData:data withTimeout:-1 tag:0];
 }
 
 

NuRemote/SPNuRemote.m

@@ -46,9 +46,6 @@ -(void)useETBForMessageSeparator;
 @end
 
 @implementation SPNRClient
-@synthesize messageSeparator = _messageSeparator;
-@synthesize statsEnabled = _statsEnabled;
-@synthesize loggingEnabled = _loggingEnabled;
 -(id)init:(AsyncSocket*)s :(SPNuRemote*)parent_;
 {
 	if(!(self = [super init])) return nil;