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 ------------------------------------ GTM.xcodeproj/project.pbxproj | 12 -------- 4 files changed, 169 deletions(-) delete mode 100644 Foundation/GTMNSString+Replace.h delete mode 100644 Foundation/GTMNSString+Replace.m delete mode 100644 Foundation/GTMNSString+ReplaceTest.m 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 diff --git a/GTM.xcodeproj/project.pbxproj b/GTM.xcodeproj/project.pbxproj index dc94984..640b888 100644 --- a/GTM.xcodeproj/project.pbxproj +++ b/GTM.xcodeproj/project.pbxproj @@ -114,7 +114,6 @@ 8BFE6E921282371200B5C894 /* GTMNSScanner+JSONTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD35B900FB22980009058F5 /* GTMNSScanner+JSONTest.m */; }; 8BFE6E941282371200B5C894 /* GTMNSString+FindFolderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F42597780E23FE3A003BEA3E /* GTMNSString+FindFolderTest.m */; }; 8BFE6E951282371200B5C894 /* GTMNSString+HTMLTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F48FE2900D198D24009257D2 /* GTMNSString+HTMLTest.m */; }; - 8BFE6E961282371200B5C894 /* GTMNSString+ReplaceTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F42597470E23AA57003BEA3E /* GTMNSString+ReplaceTest.m */; }; 8BFE6E971282371200B5C894 /* GTMNSString+URLArgumentsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 33C372AE0DD8A8D700E97817 /* GTMNSString+URLArgumentsTest.m */; }; 8BFE6E981282371200B5C894 /* GTMNSString+XMLTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F43E4C270D4E361D0041161F /* GTMNSString+XMLTest.m */; }; 8BFE6E9A1282371200B5C894 /* GTMPathTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F9FD945D0E1D30F80005867E /* GTMPathTest.m */; }; @@ -131,8 +130,6 @@ F41A6F820E02EC3600788A6C /* GTMSignalHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = F41A6F7F0E02EC3600788A6C /* GTMSignalHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; F41A6F830E02EC3600788A6C /* GTMSignalHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = F41A6F800E02EC3600788A6C /* GTMSignalHandler.m */; }; F424F75F0D9AF019000B87EF /* GTMDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B1A16050D90344B00CA1E8E /* GTMDefines.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F42597480E23AA57003BEA3E /* GTMNSString+Replace.h in Headers */ = {isa = PBXBuildFile; fileRef = F42597450E23AA57003BEA3E /* GTMNSString+Replace.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F42597490E23AA57003BEA3E /* GTMNSString+Replace.m in Sources */ = {isa = PBXBuildFile; fileRef = F42597460E23AA57003BEA3E /* GTMNSString+Replace.m */; }; F42597790E23FE3A003BEA3E /* GTMNSString+FindFolder.h in Headers */ = {isa = PBXBuildFile; fileRef = F42597760E23FE3A003BEA3E /* GTMNSString+FindFolder.h */; settings = {ATTRIBUTES = (Public, ); }; }; F425977A0E23FE3A003BEA3E /* GTMNSString+FindFolder.m in Sources */ = {isa = PBXBuildFile; fileRef = F42597770E23FE3A003BEA3E /* GTMNSString+FindFolder.m */; }; F428FF030D48E55E00382ED1 /* GTMNSBezierPath+CGPath.h in Headers */ = {isa = PBXBuildFile; fileRef = F428FEFF0D48E55E00382ED1 /* GTMNSBezierPath+CGPath.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -334,9 +331,6 @@ F41A6F7F0E02EC3600788A6C /* GTMSignalHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMSignalHandler.h; sourceTree = ""; }; F41A6F800E02EC3600788A6C /* GTMSignalHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMSignalHandler.m; sourceTree = ""; }; F41A6F810E02EC3600788A6C /* GTMSignalHandlerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMSignalHandlerTest.m; sourceTree = ""; }; - F42597450E23AA57003BEA3E /* GTMNSString+Replace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSString+Replace.h"; sourceTree = ""; }; - F42597460E23AA57003BEA3E /* GTMNSString+Replace.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSString+Replace.m"; sourceTree = ""; }; - F42597470E23AA57003BEA3E /* GTMNSString+ReplaceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSString+ReplaceTest.m"; sourceTree = ""; }; F42597760E23FE3A003BEA3E /* GTMNSString+FindFolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSString+FindFolder.h"; sourceTree = ""; }; F42597770E23FE3A003BEA3E /* GTMNSString+FindFolder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSString+FindFolder.m"; sourceTree = ""; }; F42597780E23FE3A003BEA3E /* GTMNSString+FindFolderTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSString+FindFolderTest.m"; sourceTree = ""; }; @@ -721,9 +715,6 @@ F48FE28E0D198D24009257D2 /* GTMNSString+HTML.h */, F48FE28F0D198D24009257D2 /* GTMNSString+HTML.m */, F48FE2900D198D24009257D2 /* GTMNSString+HTMLTest.m */, - F42597450E23AA57003BEA3E /* GTMNSString+Replace.h */, - F42597460E23AA57003BEA3E /* GTMNSString+Replace.m */, - F42597470E23AA57003BEA3E /* GTMNSString+ReplaceTest.m */, 33C372A40DD8A88500E97817 /* GTMNSString+URLArguments.h */, 33C372A50DD8A88500E97817 /* GTMNSString+URLArguments.m */, 33C372AE0DD8A8D700E97817 /* GTMNSString+URLArgumentsTest.m */, @@ -847,7 +838,6 @@ 33C374380DD8D44800E97817 /* GTMNSDictionary+URLArguments.h in Headers */, F41A6F820E02EC3600788A6C /* GTMSignalHandler.h in Headers */, F9FD94CD0E1D50450005867E /* GTMPath.h in Headers */, - F42597480E23AA57003BEA3E /* GTMNSString+Replace.h in Headers */, F42597790E23FE3A003BEA3E /* GTMNSString+FindFolder.h in Headers */, F92B9FA80E2E64B900A2FE61 /* GTMLogger.h in Headers */, F92B9FA90E2E64BC00A2FE61 /* GTMLogger+ASL.h in Headers */, @@ -1165,7 +1155,6 @@ 8BFE6E921282371200B5C894 /* GTMNSScanner+JSONTest.m in Sources */, 8BFE6E941282371200B5C894 /* GTMNSString+FindFolderTest.m in Sources */, 8BFE6E951282371200B5C894 /* GTMNSString+HTMLTest.m in Sources */, - 8BFE6E961282371200B5C894 /* GTMNSString+ReplaceTest.m in Sources */, 8BFE6E971282371200B5C894 /* GTMNSString+URLArgumentsTest.m in Sources */, 8BFE6E981282371200B5C894 /* GTMNSString+XMLTest.m in Sources */, 8BFE6E9A1282371200B5C894 /* GTMPathTest.m in Sources */, @@ -1200,7 +1189,6 @@ 8B7DCBBD0DFF0F5D0017E983 /* GTMMethodCheck.m in Sources */, F41A6F830E02EC3600788A6C /* GTMSignalHandler.m in Sources */, F9FD94630E1D31280005867E /* GTMPath.m in Sources */, - F42597490E23AA57003BEA3E /* GTMNSString+Replace.m in Sources */, F425977A0E23FE3A003BEA3E /* GTMNSString+FindFolder.m in Sources */, F98680C30E2C163D00CEE8BF /* GTMLogger.m in Sources */, F98681970E2C20C800CEE8BF /* GTMLogger+ASL.m in Sources */, -- cgit v1.2.3