From 08c1acb850c2bc623212e4620afc7524c348e35e Mon Sep 17 00:00:00 2001 From: theraven Date: Sun, 28 Feb 2010 23:37:22 +0000 Subject: [PATCH] Added a couple of convenience methods on NSString (OS X 10.5 compatibility). git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29810 72102866-910b-0410-8b05-ffd578937521 --- Headers/Foundation/NSString.h | 6 ++++++ Source/NSString.m | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/Headers/Foundation/NSString.h b/Headers/Foundation/NSString.h index 42fad9e9e..523850fec 100644 --- a/Headers/Foundation/NSString.h +++ b/Headers/Foundation/NSString.h @@ -280,6 +280,12 @@ typedef NSUInteger NSStringEncodingConversionOptions; - (id) initWithContentsOfFile: (NSString*)path usedEncoding: (NSStringEncoding*)enc error: (NSError**)error; +- (NSString*)stringByReplacingOccurrencesOfString: (NSString*)replace + withString: (NSString*)by + options: (NSStringCompareOptions)opts + range: (NSRange)searchRange; +- (NSString*)stringByReplacingOccurrencesOfString: (NSString*)replace + withString: (NSString*)by; #endif - (id) initWithCharactersNoCopy: (unichar*)chars length: (NSUInteger)length diff --git a/Source/NSString.m b/Source/NSString.m index 9a22329e9..eb096e1ca 100644 --- a/Source/NSString.m +++ b/Source/NSString.m @@ -1614,6 +1614,28 @@ handle_printf_atsign (FILE *stream, return array; } +- (NSString*)stringByReplacingOccurrencesOfString: (NSString*)replace + withString: (NSString*)by + options: (NSStringCompareOptions)opts + range: (NSRange)searchRange +{ + id copy = [self mutableCopy]; + [copy replaceOccurrencesOfString: replace + withString: by + options: opts + range: searchRange]; + return [copy makeImmutableCopyOnFail: NO]; +} +- (NSString*)stringByReplacingOccurrencesOfString: (NSString*)replace + withString: (NSString*)by +{ + return [self + stringByReplacingOccurrencesOfString: replace + withString: by + options: 0 + range: NSMakeRange(0, [self length])]; +} + /** * Returns a substring of the receiver from character at the specified * index to the end of the string.