diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-12 22:50:37 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-12 22:50:37 +0000 |
| commit | b83c8fe686c5374b38b31510f9803d3908d0c4f8 (patch) | |
| tree | ce9eb52a3e041128304bd79a2065c75029aca9a9 /macosx/plugins/DFInput/macsrc | |
| parent | 98f9382fb8307e539091454392ca658648f722b8 (diff) | |
| download | pcsxr-b83c8fe686c5374b38b31510f9803d3908d0c4f8.tar.gz | |
Changing Mac getters to be more Objective-C.
Getters in Objective-C are just named what they are getting, I.E. "getVariable" isn't valid, but "variable" is.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72232 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/DFInput/macsrc')
| -rw-r--r-- | macosx/plugins/DFInput/macsrc/ControllerList.h | 2 | ||||
| -rw-r--r-- | macosx/plugins/DFInput/macsrc/ControllerList.m | 2 | ||||
| -rw-r--r-- | macosx/plugins/DFInput/macsrc/MappingCell.m | 2 | ||||
| -rw-r--r-- | macosx/plugins/DFInput/macsrc/PadView.m | 2 |
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) { |