From d50bdc6fb2378fc3219e14c47a7b1adc60ee2203 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Fri, 5 Jul 2013 21:59:24 +0000 Subject: Change some +stringWithCString and -initWithCString:encoding: to modern Objective-C syntax. Change the encoding of a couple of info.plists to UTF-8, otherwise Xcode was complaining. Removing some extra line breaks on OS X code. Other minor changes. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85867 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/plugins/DFInput/macsrc/PadController.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'macosx/plugins/DFInput/macsrc/PadController.m') diff --git a/macosx/plugins/DFInput/macsrc/PadController.m b/macosx/plugins/DFInput/macsrc/PadController.m index 41a59b10..87e25407 100755 --- a/macosx/plugins/DFInput/macsrc/PadController.m +++ b/macosx/plugins/DFInput/macsrc/PadController.m @@ -51,7 +51,7 @@ void DoAbout() { [icon setSize:size]; NSDictionary *infoPaneDict = - [NSDictionary dictionaryWithObjectsAndKeys: + [[NSDictionary alloc] initWithObjectsAndKeys: [bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName", icon, @"ApplicationIcon", [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion", @@ -62,6 +62,7 @@ void DoAbout() { dispatch_async(dispatch_get_main_queue(), ^{ [app orderFrontStandardAboutPanelWithOptions:infoPaneDict]; }); + RELEASEOBJ(infoPaneDict); } long DoConfiguration() { @@ -148,7 +149,7 @@ char* PLUGLOC(char *toloc) { NSBundle *mainBundle = [NSBundle bundleForClass:[PadController class]]; NSString *origString = nil, *transString = nil; - origString = [NSString stringWithCString:toloc encoding:NSUTF8StringEncoding]; + origString = @(toloc); transString = [mainBundle localizedStringForKey:origString value:nil table:nil]; - return (char*)[transString cStringUsingEncoding:NSUTF8StringEncoding]; + return (char*)[transString UTF8String]; } -- cgit v1.2.3