OS X: make all ivars either be in the implementation block, or converted to Objective C 2.0 properties.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@92227 e17a0e51-4ae3-4d35-97c3-1a29b211df97

3 files changed, 29 insertions, 36 deletions

diff --git a/macosx/plugins/DFSound/macsrc/NamedSlider.h b/macosx/plugins/DFSound/macsrc/NamedSlider.h
index 6a5c869a..8b919224 100755
--- a/macosx/plugins/DFSound/macsrc/NamedSlider.h
+++ b/macosx/plugins/DFSound/macsrc/NamedSlider.h
@@ -3,10 +3,6 @@
 #import <Cocoa/Cocoa.h>
 
 @interface NamedSlider : NSSlider
-{
-	NSArray *strings;
-	__unsafe_unretained Class pluginClass;
-}
 @property (strong) NSArray *strings;
 @property (unsafe_unretained) Class pluginClass;
 @end
diff --git a/macosx/plugins/DFSound/macsrc/PluginController.m b/macosx/plugins/DFSound/macsrc/PluginController.m
index 05104d48..f219bd3f 100755
--- a/macosx/plugins/DFSound/macsrc/PluginController.m
+++ b/macosx/plugins/DFSound/macsrc/PluginController.m
@@ -144,15 +144,15 @@ void ReadConfig(void)
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 
 	NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:self.keyValues];
-	writeDic[@"High Compatibility Mode"] = ([hiCompBox intValue] ? @YES : @NO);
-	writeDic[@"SPU IRQ Wait"] = ([irqWaitBox intValue] ? @YES : @NO);
-	writeDic[@"Mono Sound Output"] = ([monoSoundBox intValue] ? @YES : @NO);
-	writeDic[@"XA Pitch"] = ([xaSpeedBox intValue] ? @YES : @NO);
+	writeDic[@"High Compatibility Mode"] = ([self.hiCompBox intValue] ? @YES : @NO);
+	writeDic[@"SPU IRQ Wait"] = ([self.irqWaitBox intValue] ? @YES : @NO);
+	writeDic[@"Mono Sound Output"] = ([self.monoSoundBox intValue] ? @YES : @NO);
+	writeDic[@"XA Pitch"] = ([self.xaSpeedBox intValue] ? @YES : @NO);
 
-	writeDic[@"Interpolation Quality"] = @([interpolValue intValue]);
-	writeDic[@"Reverb Quality"] = @([reverbValue intValue]);
+	writeDic[@"Interpolation Quality"] = @([self.interpolValue intValue]);
+	writeDic[@"Reverb Quality"] = @([self.reverbValue intValue]);
 
-	writeDic[@"Volume"] = @([volumeValue intValue]);
+	writeDic[@"Volume"] = @([self.volumeValue intValue]);
 
 	// write to defaults
 	[defaults setObject:writeDic forKey:PrefsKey];
@@ -180,14 +180,14 @@ void ReadConfig(void)
 	/* load from preferences */
 	self.keyValues = [NSMutableDictionary dictionaryWithDictionary:[defaults dictionaryForKey:PrefsKey]];
 
-	[hiCompBox setIntValue:[keyValues[@"High Compatibility Mode"] boolValue]];
-	[irqWaitBox setIntValue:[keyValues[@"SPU IRQ Wait"] boolValue]];
-	[monoSoundBox setIntValue:[keyValues[@"Mono Sound Output"] boolValue]];
-	[xaSpeedBox setIntValue:[keyValues[@"XA Pitch"] boolValue]];
+	[self.hiCompBox setIntValue:[self.keyValues[@"High Compatibility Mode"] boolValue]];
+	[self.irqWaitBox setIntValue:[self.keyValues[@"SPU IRQ Wait"] boolValue]];
+	[self.monoSoundBox setIntValue:[self.keyValues[@"Mono Sound Output"] boolValue]];
+	[self.xaSpeedBox setIntValue:[self.keyValues[@"XA Pitch"] boolValue]];
 
-	[interpolValue setIntValue:[keyValues[@"Interpolation Quality"] intValue]];
-	[reverbValue setIntValue:[keyValues[@"Reverb Quality"] intValue]];
-	[volumeValue setIntValue:[keyValues[@"Volume"] intValue]];
+	[self.interpolValue setIntValue:[self.keyValues[@"Interpolation Quality"] intValue]];
+	[self.reverbValue setIntValue:[self.keyValues[@"Reverb Quality"] intValue]];
+	[self.volumeValue setIntValue:[self.keyValues[@"Volume"] intValue]];
 }
 
 - (void)awakeFromNib
@@ -196,26 +196,26 @@ void ReadConfig(void)
 	
 	NSBundle *spuBundle = [NSBundle bundleForClass:thisClass];
 	
-	[interpolValue setStrings:@[
+	[self.interpolValue setStrings:@[
 		[spuBundle localizedStringForKey:@"(No Interpolation)" value:@"" table:nil],
 		[spuBundle localizedStringForKey:@"(Simple Interpolation)" value:@"" table:nil],
 		[spuBundle localizedStringForKey:@"(Gaussian Interpolation)" value:@"" table:nil],
 		[spuBundle localizedStringForKey:@"(Cubic Interpolation)" value:@"" table:nil]]];
-	interpolValue.pluginClass = thisClass;
+	self.interpolValue.pluginClass = thisClass;
 
-	[reverbValue setStrings:@[
+	[self.reverbValue setStrings:@[
 		[spuBundle localizedStringForKey:@"(No Reverb)" value:@"" table:nil],
 		[spuBundle localizedStringForKey:@"(Simple Reverb)" value:@"" table:nil],
 		[spuBundle localizedStringForKey:@"(PSX Reverb)" value:@"" table:nil]]];
-	reverbValue.pluginClass = thisClass;
+	self.reverbValue.pluginClass = thisClass;
 
-	[volumeValue setStrings:@[
+	[self.volumeValue setStrings:@[
 		[spuBundle localizedStringForKey:@"(Muted)" value:@"" table:nil],
 		[spuBundle localizedStringForKey:@"(Low)" value:@"" table:nil],
 		[spuBundle localizedStringForKey:@"(Medium)" value:@"" table:nil],
 		[spuBundle localizedStringForKey:@"(Loud)" value:@"" table:nil],
 		[spuBundle localizedStringForKey:@"(Loudest)" value:@"" table:nil]]];
-	volumeValue.pluginClass = thisClass;
+	self.volumeValue.pluginClass = thisClass;
 }
 
 @end
diff --git a/macosx/plugins/DFSound/macsrc/SPUPluginController.h b/macosx/plugins/DFSound/macsrc/SPUPluginController.h
index d1e6924a..8fe29fe2 100644
--- a/macosx/plugins/DFSound/macsrc/SPUPluginController.h
+++ b/macosx/plugins/DFSound/macsrc/SPUPluginController.h
@@ -10,19 +10,16 @@
 #import "NamedSlider.h"
 
 @interface SPUPluginController : NSWindowController
-{
-    IBOutlet NSCell *hiCompBox;
-    IBOutlet NamedSlider *interpolValue;
-    IBOutlet NSCell *irqWaitBox;
-    IBOutlet NSCell *monoSoundBox;
-    IBOutlet NamedSlider *reverbValue;
-    IBOutlet NSCell *xaEnableBox;
-    IBOutlet NSCell *xaSpeedBox;
-    IBOutlet NamedSlider *volumeValue;
-	
-	NSMutableDictionary *keyValues;
-}
+@property (weak) IBOutlet NSCell *hiCompBox;
+@property (weak) IBOutlet NamedSlider *interpolValue;
+@property (weak) IBOutlet NSCell *irqWaitBox;
+@property (weak) IBOutlet NSCell *monoSoundBox;
+@property (weak) IBOutlet NamedSlider *reverbValue;
+@property (weak) IBOutlet NSCell *xaEnableBox;
+@property (weak) IBOutlet NSCell *xaSpeedBox;
+@property (weak) IBOutlet NamedSlider *volumeValue;
 @property (readwrite, strong) NSMutableDictionary *keyValues;
+
 - (IBAction)cancel:(id)sender;
 - (IBAction)ok:(id)sender;
 - (IBAction)reset:(id)sender;