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, 18 insertions, 19 deletions

diff --git a/macosx/plugins/DFInput/macsrc/PadView.h b/macosx/plugins/DFInput/macsrc/PadView.h
index 8ab20ab5..5406a9f0 100755
--- a/macosx/plugins/DFInput/macsrc/PadView.h
+++ b/macosx/plugins/DFInput/macsrc/PadView.h
@@ -25,14 +25,12 @@
 #import "ControllerList.h"
 
 @interface PadView : NSView
-{
-	IBOutlet NSTableView *tableView;
-	IBOutlet NSPopUpButton *typeMenu;
-	IBOutlet NSPopUpButton *deviceMenu;
 
-	ControllerList *controller;
-}
+@property (weak) IBOutlet NSTableView *tableView;
+@property (weak) IBOutlet NSPopUpButton *typeMenu;
+@property (weak) IBOutlet NSPopUpButton *deviceMenu;
 @property (weak) IBOutlet NSButton *useSDL2Check;
+@property (strong) ControllerList *controllerList;
 
 - (IBAction)setType:(id)sender;
 - (IBAction)setDevice:(id)sender;
diff --git a/macosx/plugins/DFInput/macsrc/PadView.m b/macosx/plugins/DFInput/macsrc/PadView.m
index befb5df3..21e76ded 100755
--- a/macosx/plugins/DFInput/macsrc/PadView.m
+++ b/macosx/plugins/DFInput/macsrc/PadView.m
@@ -23,6 +23,7 @@
 #include "pad.h"
 
 @implementation PadView
+@synthesize controllerList = controller;
 
 - (id)initWithFrame:(NSRect)frameRect
 {
@@ -43,7 +44,7 @@
 	g.cfg.PadDef[[ControllerList currentController]].Type =
 		([sender indexOfSelectedItem] > 0 ? PSE_PAD_TYPE_ANALOGPAD : PSE_PAD_TYPE_STANDARD);
 	
-	[tableView reloadData];
+	[self.tableView reloadData];
 }
 
 - (IBAction)setDevice:(id)sender
@@ -55,7 +56,7 @@
 {
 	controller.usingSDL2 = !controller.usingSDL2;
 	
-	[tableView reloadData];
+	[self.tableView reloadData];
 }
 
 - (void)setController:(int)which
@@ -63,10 +64,10 @@
 	int i;
 	
 	[ControllerList setCurrentController:which];
-	[tableView setDataSource:controller];
+	[self.tableView setDataSource:controller];
 	
-	[deviceMenu removeAllItems];
-	[deviceMenu addItemWithTitle:[[NSBundle bundleForClass:[self class]] localizedStringForKey:@"(Keyboard only)" value:@"" table:nil]];
+	[self.deviceMenu removeAllItems];
+	[self.deviceMenu addItemWithTitle:[[NSBundle bundleForClass:[self class]] localizedStringForKey:@"(Keyboard only)" value:@"" table:nil]];
 	
 	for (i = 0; i < SDL_NumJoysticks(); i++) {
 		NSMenuItem *joystickItem;
@@ -82,19 +83,19 @@
 		joystickItem = [[NSMenuItem alloc] initWithTitle:@(SDL_JoystickName(i)) action:NULL keyEquivalent:@""];
 #endif
 		[joystickItem setTag:i + 1];
-        [[deviceMenu menu] addItem:joystickItem];
+        [[self.deviceMenu menu] addItem:joystickItem];
 	}
 	
 	if (g.cfg.PadDef[which].DevNum >= SDL_NumJoysticks()) {
 		g.cfg.PadDef[which].DevNum = -1;
 	}
 	
-	[deviceMenu selectItemAtIndex:g.cfg.PadDef[which].DevNum + 1];
-	[typeMenu selectItemAtIndex:(g.cfg.PadDef[which].Type == PSE_PAD_TYPE_ANALOGPAD ? 1 : 0)];
+	[self.deviceMenu selectItemAtIndex:g.cfg.PadDef[which].DevNum + 1];
+	[self.typeMenu selectItemAtIndex:(g.cfg.PadDef[which].Type == PSE_PAD_TYPE_ANALOGPAD ? 1 : 0)];
 	
 	[self.useSDL2Check setState:g.cfg.PadDef[which].UseSDL2 ? NSOnState : NSOffState];
 	
-	[tableView reloadData];
+	[self.tableView reloadData];
 }
 
 - (BOOL)control:(NSControl *)control textShouldBeginEditing:(NSText *)fieldEditor
@@ -107,15 +108,15 @@
 {
 	unsigned short key = [theEvent keyCode];
 	
-	if ([[theEvent window] firstResponder] == tableView) {
+	if ([[theEvent window] firstResponder] == self.tableView) {
 		if (key == 51 || key == 117) {
 			// delete keys - remove the mappings for the selected item
-			[controller deleteRow:[tableView selectedRow]];
-			[tableView reloadData];
+			[controller deleteRow:[self.tableView selectedRow]];
+			[self.tableView reloadData];
 			return;
 		} else if (key == 36) {
 			// return key - configure the selected item
-			[tableView editColumn:[tableView columnWithIdentifier:@"button"] row:[tableView selectedRow] withEvent:nil select:YES];
+			[self.tableView editColumn:[self.tableView columnWithIdentifier:@"button"] row:[self.tableView selectedRow] withEvent:nil select:YES];
 			return;
 		}
 	}