adium 4584:f68138d15637: Backout my changes to immutableCopy and...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/f68138d15637
revision:	4584:f68138d15637
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Sun Jan 29 01:58:12 2012 +0100

Backout my changes to immutableCopy and use __attribute__((objc_method_family(copy))), as pointed out by Peter Hosey.

diffs (122 lines):

diff -r aa11115be326 -r f68138d15637 Frameworks/AIUtilities Framework/Source/AICharacterSetAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AICharacterSetAdditions.h	Sun Jan 29 01:41:57 2012 +0100
+++ b/Frameworks/AIUtilities Framework/Source/AICharacterSetAdditions.h	Sun Jan 29 01:58:12 2012 +0100
@@ -15,5 +15,5 @@
  */
 
 @interface NSCharacterSet (AICharacterSetAdditions)
-- (NSCharacterSet *)copyImmutable;
+- (NSCharacterSet *)immutableCopy __attribute__((objc_method_family(copy)));
 @end
diff -r aa11115be326 -r f68138d15637 Frameworks/AIUtilities Framework/Source/AICharacterSetAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AICharacterSetAdditions.m	Sun Jan 29 01:41:57 2012 +0100
+++ b/Frameworks/AIUtilities Framework/Source/AICharacterSetAdditions.m	Sun Jan 29 01:58:12 2012 +0100
@@ -25,9 +25,9 @@
  *
  * However, -[NSMutableCharacterSet copy] returns a new NSMutableCharacterSet which remains inefficient!
  *
- * This is still true as of 10.7.2.
+ * XXX: This is still true as of 10.7.2.
  */
-- (NSCharacterSet *)copyImmutable
+- (NSCharacterSet *)immutableCopy
 {
 	return [[NSCharacterSet characterSetWithBitmapRepresentation:[self bitmapRepresentation]] retain];
 }
diff -r aa11115be326 -r f68138d15637 Plugins/Purple Service/ESIRCService.m
--- a/Plugins/Purple Service/ESIRCService.m	Sun Jan 29 01:41:57 2012 +0100
+++ b/Plugins/Purple Service/ESIRCService.m	Sun Jan 29 01:58:12 2012 +0100
@@ -58,7 +58,7 @@
 	NSCharacterSet			*returnSet;
 	
 	[allowedCharacters addCharactersInString:@"[]\\`_^{|}-"];
-	returnSet = [allowedCharacters copyImmutable];
+	returnSet = [allowedCharacters immutableCopy];
 	[allowedCharacters release];
 
 	return [returnSet autorelease];
diff -r aa11115be326 -r f68138d15637 Plugins/Purple Service/ESJabberService.m
--- a/Plugins/Purple Service/ESJabberService.m	Sun Jan 29 01:41:57 2012 +0100
+++ b/Plugins/Purple Service/ESJabberService.m	Sun Jan 29 01:58:12 2012 +0100
@@ -175,7 +175,7 @@
 		[allowedCharactersInNode addCharactersInRange:x10000_10FFFF];
 
 
-		charactersInNode = [allowedCharactersInNode copyImmutable];
+		charactersInNode = [allowedCharactersInNode immutableCopy];
 		[allowedCharactersInNode release];
 	}
 
@@ -212,7 +212,7 @@
 		[allowedCharactersInDomain addCharactersInRange:upperCaseLatters];
 		[allowedCharactersInDomain addCharactersInString:@"-."];
 
-		charactersInDomain = [allowedCharactersInDomain copyImmutable];
+		charactersInDomain = [allowedCharactersInDomain immutableCopy];
 		[allowedCharactersInDomain release];
 	}
 
@@ -252,7 +252,7 @@
 		[allowedCharactersInResource addCharactersInRange:xE000_FFFD];
 		[allowedCharactersInResource addCharactersInRange:x10000_10FFFF];
 
-		charactersInResource = [allowedCharactersInResource copyImmutable];
+		charactersInResource = [allowedCharactersInResource immutableCopy];
 		[allowedCharactersInResource release];
 	}
 
@@ -277,7 +277,7 @@
 	[allowedCharacters formUnionWithCharacterSet:nodeSet];
 	[allowedCharacters addCharactersInString:@"@"];
 	[allowedCharacters formUnionWithCharacterSet:domainSet];
-	returnSet = [allowedCharacters copyImmutable];
+	returnSet = [allowedCharacters immutableCopy];
 	[allowedCharacters release];
 
 	return [returnSet autorelease];
@@ -296,7 +296,7 @@
 
 	[allowedCharacters addCharactersInString:@"/"];
 	[allowedCharacters formUnionWithCharacterSet:resourceSet];
-	returnSet = [allowedCharacters copyImmutable];
+	returnSet = [allowedCharacters immutableCopy];
 	[allowedCharacters release];
 	
 	return [returnSet autorelease];
diff -r aa11115be326 -r f68138d15637 Plugins/Purple Service/ESMeanwhileService.m
--- a/Plugins/Purple Service/ESMeanwhileService.m	Sun Jan 29 01:41:57 2012 +0100
+++ b/Plugins/Purple Service/ESMeanwhileService.m	Sun Jan 29 01:58:12 2012 +0100
@@ -60,7 +60,7 @@
 	[allowedCharacters formUnionWithCharacterSet:[NSCharacterSet symbolCharacterSet]];
 	[allowedCharacters addCharactersInString:@" "];
 
-	returnSet = [allowedCharacters copyImmutable];
+	returnSet = [allowedCharacters immutableCopy];
 	[allowedCharacters release];
 	
 	return [returnSet autorelease];
diff -r aa11115be326 -r f68138d15637 Source/AIEmoticonController.m
--- a/Source/AIEmoticonController.m	Sun Jan 29 01:41:57 2012 +0100
+++ b/Source/AIEmoticonController.m	Sun Jan 29 01:58:12 2012 +0100
@@ -292,7 +292,7 @@
 					[tempSet formUnionWithCharacterSet:[NSCharacterSet symbolCharacterSet]];
 					//remove any characters *in* the replacement string from the trimming set
 					[tempSet removeCharactersInString:replacementString];
-					[endingSetDict setObject:[[tempSet copyImmutable] autorelease] forKey:replacementString];
+					[endingSetDict setObject:[[tempSet immutableCopy] autorelease] forKey:replacementString];
 					[tempSet release];
 					endingTrimSet = [endingSetDict objectForKey:replacementString];
 				}
@@ -863,10 +863,10 @@
         }
     }
 
-	[_emoticonHintCharacterSet release]; _emoticonHintCharacterSet = [tmpEmoticonHintCharacterSet copyImmutable];
+	[_emoticonHintCharacterSet release]; _emoticonHintCharacterSet = [tmpEmoticonHintCharacterSet immutableCopy];
 	[tmpEmoticonHintCharacterSet release];
 
-    [_emoticonStartCharacterSet release]; _emoticonStartCharacterSet = [tmpEmoticonStartCharacterSet copyImmutable];
+    [_emoticonStartCharacterSet release]; _emoticonStartCharacterSet = [tmpEmoticonStartCharacterSet immutableCopy];
 	[tmpEmoticonStartCharacterSet release];
 
 	//After building all the subIndexes, sort them by length here