Replace some legacy NSIndexSet enumeration with 10.6+ style -enumerateIndexesUsingBlock:

1 files changed, 6 insertions, 10 deletions

diff --git a/Source/SPServerVariablesController.m b/Source/SPServerVariablesController.m
index dade0687..d99f8671 100644
--- a/Source/SPServerVariablesController.m
+++ b/Source/SPServerVariablesController.m
@@ -342,13 +342,10 @@
 	
 	if ((firstResponder == variablesTableView) && ([variablesTableView numberOfSelectedRows] > 0)) {
 		
-		NSString *string = @"";
+		NSMutableString *string = [[NSMutableString alloc] init];
 		NSIndexSet *rows = [variablesTableView selectedRowIndexes];
 		
-		NSUInteger i = [rows firstIndex];
-		
-		while (i != NSNotFound) 
-		{
+		[rows enumerateIndexesUsingBlock:^(NSUInteger i, BOOL * _Nonnull stop) {
 			if (i < [variablesFiltered count]) {
 				NSDictionary *variable = NSArrayObjectAtIndex(variablesFiltered, i);
 				
@@ -357,21 +354,20 @@
 				
 				// Decide what to include in the string
 				if (name && value) {
-					string = [string stringByAppendingFormat:@"%@ = %@\n", variableName, variableValue];
+					[string appendFormat:@"%@ = %@\n", variableName, variableValue];
 				}
 				else {
-					string = [string stringByAppendingFormat:@"%@\n", (name) ? variableName : variableValue];
+					[string appendFormat:@"%@\n", (name) ? variableName : variableValue];
 				}
 			}
-			
-			i = [rows indexGreaterThanIndex:i];
-		}
+		}];
 		
 		NSPasteboard *pasteBoard = [NSPasteboard generalPasteboard];
 		
 		// Copy the string to the pasteboard
 		[pasteBoard declareTypes:@[NSStringPboardType] owner:nil];
 		[pasteBoard setString:string forType:NSStringPboardType];
+		[string release];
 	}
 }