diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-08-24 19:44:48 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-08-24 19:44:48 +0000 |
| commit | 2a2790470d2ab7e0e22021e9b1774536546b1b4e (patch) | |
| tree | 02de3f051dca12a63637f56ec0c60a83819b5ad6 /macosx/PcsxrController.m | |
| parent | 8b64ca8414e1dcf56b1d3d3a481090e551499445 (diff) | |
| download | pcsxr-2a2790470d2ab7e0e22021e9b1774536546b1b4e.tar.gz | |
OS X:
Replace CFStringCreateByCombiningStrings with NSArray's componentsJoinedByString:.
Moving some class interfaces out of CheatController.h to CheatController.m
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86897 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxrController.m')
| -rwxr-xr-x | macosx/PcsxrController.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m index 7f4d9eda..f00e447d 100755 --- a/macosx/PcsxrController.m +++ b/macosx/PcsxrController.m @@ -538,14 +538,14 @@ otherblock();\ NSString *appRawPath = RETAINOBJ([mutProgArgs objectAtIndex:0]); //Remove the app file path from the array [mutProgArgs removeObjectAtIndex:0]; - NSString *arg = CFBridgingRelease(CFStringCreateByCombiningStrings(kCFAllocatorDefault, BRIDGE(CFArrayRef, mutProgArgs), CFSTR(" "))); - NSString *recognizedArgs = CFBridgingRelease(CFStringCreateByCombiningStrings(kCFAllocatorDefault, BRIDGE(CFArrayRef, [argDict allKeys]), CFSTR(" "))); + NSString *arg = [mutProgArgs componentsJoinedByString:@" "]; + NSString *recognizedArgs = [[argDict allKeys] componentsJoinedByString:@" "]; NSString *tmpStr = [NSString stringWithFormat:@"A launch command wasn't found in the command line and one or more arguments that PCSX-R recognizes were: %@.\nThe following command line arguments were passed with the application launch file at %@: %@.\n\nThe valid launch commands are %@, %@, and %@.", recognizedArgs, appRawPath, arg, kPCSXRArgumentISO, kPCSXRArgumentCDROM, kPCSXRArgumentBIOS]; RELEASEOBJ(appRawPath); ParseErrorStr(tmpStr); } else if (hasParsedAnArgument){ - NSArray *argArray = [[argDict allValues] sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2) { + NSArray *argArray = [[argDict allValues] sortedArrayWithOptions:NSSortStable usingComparator:^NSComparisonResult(id obj1, id obj2) { LaunchArg *LA1 = obj1; LaunchArg *LA2 = obj2; if (LA1.launchOrder > LA2.launchOrder) { @@ -553,7 +553,7 @@ otherblock();\ } else if (LA1.launchOrder < LA2.launchOrder) { return NSOrderedAscending; } else { - return [LA1.argument compare:LA2.argument]; + return NSOrderedSame; } }]; for (LaunchArg *arg in argArray) { |