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

2 files changed, 11 insertions, 14 deletions

diff --git a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.h b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.h
index 6e5913c4..ae471be0 100755
--- a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.h
+++ b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.h
@@ -3,14 +3,10 @@
 #import <Cocoa/Cocoa.h>
 
 @interface PluginConfigController : NSWindowController
-{
-	IBOutlet NSControl *Cached;
-	IBOutlet NSSlider *CacheSize;
-	IBOutlet NSPopUpButton *CdSpeed;
-
-	NSMutableDictionary *keyValues;
-}
-@property (retain) NSMutableDictionary *keyValues;
+@property (weak) IBOutlet NSControl *Cached;
+@property (weak) IBOutlet NSSlider *CacheSize;
+@property (weak) IBOutlet NSPopUpButton *CdSpeed;
+@property (strong) NSMutableDictionary *keyValues;
 
 - (IBAction)cancel:(id)sender;
 - (IBAction)ok:(id)sender;
diff --git a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
index e0453c5a..9e727b14 100755
--- a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
@@ -104,6 +104,7 @@ void ReadConfig()
 
 @implementation PluginConfigController
 @synthesize keyValues;
+@synthesize CdSpeed;
 
 - (IBAction)cancel:(id)sender
 {
@@ -115,12 +116,12 @@ void ReadConfig()
 {
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 	
-	NSMutableDictionary *writeDic = [keyValues mutableCopy];
+	NSMutableDictionary *writeDic = [self.keyValues mutableCopy];
 	
-	writeDic[@"Threaded"] = ([Cached intValue] ? @YES : @NO);
-	writeDic[@"Cache Size"] = @([CacheSize integerValue]);
+	writeDic[@"Threaded"] = ([self.Cached intValue] ? @YES : @NO);
+	writeDic[@"Cache Size"] = @([self.CacheSize integerValue]);
 	
-	switch ([CdSpeed indexOfSelectedItem]) {
+	switch ([self.CdSpeed indexOfSelectedItem]) {
 		case 1: writeDic[@"Speed"] = @1; break;
 		case 2: writeDic[@"Speed"] = @2; break;
 		case 3: writeDic[@"Speed"] = @4; break;
@@ -150,8 +151,8 @@ void ReadConfig()
 	// load from preferences
 	self.keyValues = [[NSMutableDictionary alloc] initWithDictionary:[defaults dictionaryForKey:PrefsKey]];
 	
-	[Cached setIntValue:[keyValues[@"Threaded"] intValue]];
-	[CacheSize setIntegerValue:[keyValues[@"Cache Size"] integerValue]];
+	[self.Cached setIntValue:[keyValues[@"Threaded"] intValue]];
+	[self.CacheSize setIntegerValue:[keyValues[@"Cache Size"] integerValue]];
 	
 	switch ([keyValues[@"Speed"] intValue]) {
 		case 1: [CdSpeed selectItemAtIndex:1]; break;