4 files changed, 4 insertions, 4 deletions
diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.h b/macosx/plugins/DFInput/macsrc/ControllerList.h
index 91320b28..513dae16 100644
--- a/macosx/plugins/DFInput/macsrc/ControllerList.h
+++ b/macosx/plugins/DFInput/macsrc/ControllerList.h
@@ -33,7 +33,7 @@
 
 + (void)setCurrentController:(int)which;
 + (int)currentController;
-+ (int)getButtonOfRow:(int)row;
++ (int)buttonOfRow:(int)row;
 - (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView;
 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex;
 - (void)deleteRow:(NSInteger)which;
diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.m b/macosx/plugins/DFInput/macsrc/ControllerList.m
index db25d2f2..90cc618f 100644
--- a/macosx/plugins/DFInput/macsrc/ControllerList.m
+++ b/macosx/plugins/DFInput/macsrc/ControllerList.m
@@ -103,7 +103,7 @@ static const int DPad[DKEY_TOTAL] = {
 	DKEY_ANALOG
 };
 
-+ (int)getButtonOfRow:(int)row
++ (int)buttonOfRow:(int)row
 {
 	return DPad[row];
 }
diff --git a/macosx/plugins/DFInput/macsrc/MappingCell.m b/macosx/plugins/DFInput/macsrc/MappingCell.m
index 48e5dfe5..50cbb56a 100644
--- a/macosx/plugins/DFInput/macsrc/MappingCell.m
+++ b/macosx/plugins/DFInput/macsrc/MappingCell.m
@@ -55,7 +55,7 @@
 		[NSApp runModalSession:session];
 		row = [tableView selectedRow];
 		if (row < DKEY_TOTAL) {
-			changed = ReadDKeyEvent(whichPad, [ControllerList getButtonOfRow:row]);
+			changed = ReadDKeyEvent(whichPad, [ControllerList buttonOfRow:row]);
 		} else {
 			row -= DKEY_TOTAL;
 			changed = ReadAnalogEvent(whichPad, row / 4, row % 4);
diff --git a/macosx/plugins/DFInput/macsrc/PadView.m b/macosx/plugins/DFInput/macsrc/PadView.m
index e6828e10..9cfa2666 100644
--- a/macosx/plugins/DFInput/macsrc/PadView.m
+++ b/macosx/plugins/DFInput/macsrc/PadView.m
@@ -89,7 +89,7 @@
 /* handles key events on the pad list */
 - (void)keyDown:(NSEvent *)theEvent
 {
-	NSEventType key = [theEvent keyCode];
+	unsigned short key = [theEvent keyCode];
 
 	if ([[theEvent window] firstResponder] == tableView) {
 		if (key == 51 || key == 117) {