diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-05 21:59:24 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-05 21:59:24 +0000 |
| commit | d50bdc6fb2378fc3219e14c47a7b1adc60ee2203 (patch) | |
| tree | 924bce4490768605b7c0041db20a40e074a597b1 /macosx/plugins/DFXVideo/macsrc/PluginConfigController.m | |
| parent | 3296522bfedc2c72cb7d3f4476a64db8bbf38e8f (diff) | |
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
Diffstat (limited to 'macosx/plugins/DFXVideo/macsrc/PluginConfigController.m')
| -rwxr-xr-x | macosx/plugins/DFXVideo/macsrc/PluginConfigController.m | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m index 95eb38da..2932d3d7 100755 --- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m @@ -323,7 +323,6 @@ void ReadConfig(void) [fragmentShaderViewablePath setToolTip:[fragmentPath path]]; unsigned int hackValues = [[keyValues objectForKey:@"Hacks"] unsignedIntValue]; - NSArray *views = [hacksView subviews]; for (NSView *control in views) { if ([control isKindOfClass:[NSButton class]]) { @@ -359,8 +358,8 @@ char* PLUGLOC(char *toloc) { NSBundle *mainBundle = [NSBundle bundleForClass:[PluginConfigController 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]; } |