From ba4ef08c38276505b834cd72e7eab2dacead375f Mon Sep 17 00:00:00 2001 From: dmaclach Date: Sun, 11 Nov 2018 10:47:11 -0800 Subject: Remove ancient GTMNSString+Replace (#185) --- Foundation/GTMNSString+Replace.h | 45 --------------------------- Foundation/GTMNSString+Replace.m | 53 -------------------------------- Foundation/GTMNSString+ReplaceTest.m | 59 ------------------------------------ 3 files changed, 157 deletions(-) delete mode 100644 Foundation/GTMNSString+Replace.h delete mode 100644 Foundation/GTMNSString+Replace.m delete mode 100644 Foundation/GTMNSString+ReplaceTest.m (limited to 'Foundation') diff --git a/Foundation/GTMNSString+Replace.h b/Foundation/GTMNSString+Replace.h deleted file mode 100644 index 6512dfe..0000000 --- a/Foundation/GTMNSString+Replace.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// GTMNSString+Replace.h -// -// Copyright 2006-2008 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy -// of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. -// - -#import - -/// Give easy search-n-replace functionality to NSString. -@interface NSString (GTMStringReplaceAdditions) - -#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 -// 10.5 has stringByReplacingOccurrencesOfString:withString:, use that directly. - -/// Returns a new autoreleased string by replacing all occurrences of -// |oldString| with |newString| (case sensitive). If |oldString| is nil or -// @"" nothing is done and |self| is returned. If |newString| is nil, it's -// treated as if |newString| were the empty string, thus effectively -// deleting all occurrences of |oldString| from |self|. -// -// Args: -// target - the NSString to search for -// replacement - the NSString to replace |oldString| with -// -// Returns: -// A new autoreleased NSString -// -- (NSString *)gtm_stringByReplacingString:(NSString *)target - withString:(NSString *)replacement; - -#endif // MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 - -@end diff --git a/Foundation/GTMNSString+Replace.m b/Foundation/GTMNSString+Replace.m deleted file mode 100644 index 1306a68..0000000 --- a/Foundation/GTMNSString+Replace.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// GTMNSString+Replace.m -// -// Copyright 2006-2008 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy -// of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. -// - -#import "GTMNSString+Replace.h" - - -@implementation NSString (GTMStringReplaceAdditions) - -#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 -// 10.5 has stringByReplacingOccurrencesOfString:withString:, use that directly. - -- (NSString *)gtm_stringByReplacingString:(NSString *)target - withString:(NSString *)replacement { - // If |target| was nil, then do nothing and return |self| - // - // We do the retain+autorelease dance here because of this use case: - // NSString *s1 = [[NSString alloc] init...]; - // NSString *s2 = [s1 stringByReplacingString:@"foo" withString:@"bar"]; - // [s1 release]; // |s2| still needs to be valid after this line - if (!target) - return [[self retain] autorelease]; - - // If |replacement| is nil we want it to be treated as if @"" was specified - // ... effectively removing |target| from self - if (!replacement) - replacement = @""; - - NSMutableString *result = [[self mutableCopy] autorelease]; - [result replaceOccurrencesOfString:target - withString:replacement - options:0 - range:NSMakeRange(0, [result length])]; - return result; -} - -#endif // MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 - -@end diff --git a/Foundation/GTMNSString+ReplaceTest.m b/Foundation/GTMNSString+ReplaceTest.m deleted file mode 100644 index e56ab0e..0000000 --- a/Foundation/GTMNSString+ReplaceTest.m +++ /dev/null @@ -1,59 +0,0 @@ -// -// GTMNSString+ReplaceTest.m -// -// Copyright 2006-2008 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy -// of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. -// - -#import "GTMSenTestCase.h" -#import "GTMNSString+Replace.h" - -@interface GTMNSString_ReplaceTest : GTMTestCase -@end - -@implementation GTMNSString_ReplaceTest - -#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 - -- (void)testStringByReplacingStringWithString { - NSString *testString = @"a bc debc gh"; - NSString *result; - - result = [testString gtm_stringByReplacingString:@"bc" withString:@"BC"]; - STAssertEqualObjects(@"a BC deBC gh", result, - @"'bc' wasn't replaced with 'BC'"); - - result = [testString gtm_stringByReplacingString:@"bc" withString:@""]; - STAssertEqualObjects(@"a de gh", result, @"'bc' wasn't replaced with ''"); - - result = [testString gtm_stringByReplacingString:@"bc" withString:nil]; - STAssertEqualObjects(@"a de gh", result, @"'bc' wasn't replaced with (nil)"); - - result = [testString gtm_stringByReplacingString:@" " withString:@"S"]; - STAssertEqualObjects(@"aSbcSdebcSgh", result, @"' ' wasn't replaced with 'S'"); - - result = [testString gtm_stringByReplacingString:nil withString:@"blah"]; - STAssertEqualObjects(testString, result, @"(nil) wasn't replaced with 'blah'"); - - result = [testString gtm_stringByReplacingString:nil withString:nil]; - STAssertEqualObjects(testString, result, @"(nil) wasn't replaced with (nil)"); - - result = [testString gtm_stringByReplacingString:@"" withString:@"X"]; - STAssertEqualObjects(testString, result, - @"replacing '' with anything should yield the original string"); -} - -#endif // MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 - -@end -- cgit v1.2.3