diff --git a/Headers/Foundation/NSString.h b/Headers/Foundation/NSString.h index a7ab7a135..b9c8ea67e 100644 --- a/Headers/Foundation/NSString.h +++ b/Headers/Foundation/NSString.h @@ -800,8 +800,8 @@ typedef NSUInteger NSStringEncodingConversionOptions; - (NSString*) stringByReplacingPercentEscapesUsingEncoding: (NSStringEncoding)e; - (NSString*) stringByTrimmingCharactersInSet: (NSCharacterSet*)aSet; - (const char *)UTF8String; -- (NSString *) stringByAddingPercentWithAllowedCharacters: (NSCharacterSet *)aSet; -- (NSString *) stringByRemovingEscapeEncoding; +- (NSString *) stringByAddingPercentEncodingWithAllowedCharacters: (NSCharacterSet *)aSet; +- (NSString *) stringByRemovingPercentEncoding; #endif #if OS_API_VERSION(MAC_OS_X_VERSION_10_3,GS_API_LATEST) diff --git a/Source/NSString.m b/Source/NSString.m index 1a098e2f0..d5302755d 100644 --- a/Source/NSString.m +++ b/Source/NSString.m @@ -1886,7 +1886,7 @@ GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *locale) } } -- (NSString *) stringByAddingPercentWithAllowedCharacters: (NSCharacterSet *)aSet +- (NSString *) stringByAddingPercentEncodingWithAllowedCharacters: (NSCharacterSet *)aSet { NSData *data = [self dataUsingEncoding: NSUTF8StringEncoding]; NSString *s = nil; @@ -1934,7 +1934,7 @@ GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *locale) return s; } -- (NSString *) stringByRemovingEscapeEncoding +- (NSString *) stringByRemovingPercentEncoding { return nil; }