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

10 files changed, 18 insertions, 18 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) {
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h
index d88bd867..b8eccf4a 100644
--- a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h
+++ b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h
@@ -34,7 +34,7 @@ extern PluginWindowController *gameController;
 }
 
 + (id)openGameView;
-- (PluginGLView *)getOpenGLView;
+- (PluginGLView *)openGLView;
 - (BOOL)fullscreen;
 - (void)setFullscreen:(BOOL)flag;
 
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
index 48262e56..7bfa656f 100644
--- a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
@@ -46,7 +46,7 @@ NSRect windowFrame;
 	[gameWindow makeKeyAndOrderFront:nil];
 	[gameController showWindow:nil];
 	
-	CGDirectDisplayID display = (CGDirectDisplayID)[[[[gameWindow screen] deviceDescription] objectForKey:@"NSScreenNumber"] longValue];
+	CGDirectDisplayID display = (CGDirectDisplayID)[[[[gameWindow screen] deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
 	if (CGDisplayIsCaptured(display)) {
 		[gameController setFullscreen:YES];
 	}
@@ -54,7 +54,7 @@ NSRect windowFrame;
 	return gameController;
 }
 
-- (PluginGLView *)getOpenGLView
+- (PluginGLView *)openGLView
 {
 	return (PluginGLView *)glView;
 }
@@ -94,7 +94,7 @@ NSRect windowFrame;
 {
 	NSWindow *window = [self window];
 	NSScreen *screen = [window screen];
-	CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] longValue];
+	CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
 	
 	NSDisableScreenUpdates();
 	
diff --git a/macosx/plugins/DFXVideo/macsrc/drawgl.m b/macosx/plugins/DFXVideo/macsrc/drawgl.m
index 81f5f32e..18d3762a 100644
--- a/macosx/plugins/DFXVideo/macsrc/drawgl.m
+++ b/macosx/plugins/DFXVideo/macsrc/drawgl.m
@@ -114,7 +114,7 @@ unsigned long ulInitDisplay(void)	// OPEN GAME WINDOW
 	}
 	
 	PluginWindowController *windowController = [PluginWindowController openGameView];
-	glView = [windowController getOpenGLView];
+	glView = [windowController openGLView];
 	
     NSString *title = [NSString stringWithCString:pCaptionText encoding:NSUTF8StringEncoding];
 	[[windowController window] setTitle:title];
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
index a60a4b81..6ad83f63 100644
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
@@ -44,7 +44,7 @@ extern PluginWindowController *gameController;
 }
 
 + (id)openGameView;
-- (PluginGLView *)getOpenGLView;
+- (PluginGLView *)openGLView;
 - (BOOL)fullscreen;
 - (void)setFullscreen:(BOOL)flag;
 - (void)performFullscreenSwap;
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
index 5f3ee7dd..5fc97637 100644
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
@@ -94,12 +94,12 @@ NSRect FitRectInRect(NSRect source, NSRect destination)
 
 	[gameWindow makeKeyAndOrderFront:nil];
 	[gameController showWindow:nil];
-    NSOpenGLView*  glInstance = [gameController getOpenGLView];
+    NSOpenGLView*  glInstance = [gameController openGLView];
     [glInstance setFrameSize: windowDefaultRect.size];
     [glInstance reshape];
 //    [glView update];
    
-	CGDirectDisplayID display = (CGDirectDisplayID)[[[[gameWindow screen] deviceDescription] objectForKey:@"NSScreenNumber"] longValue];
+	CGDirectDisplayID display = (CGDirectDisplayID)[[[[gameWindow screen] deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
 	if (CGDisplayIsCaptured(display)) {
 		[gameController setFullscreen:YES];
 	}
@@ -141,7 +141,7 @@ NSRect FitRectInRect(NSRect source, NSRect destination)
 - (NSRect) screenFrame
 {
     NSWindow* wind = [self window];
-	CGDirectDisplayID display = (CGDirectDisplayID)[[[[wind screen] deviceDescription] objectForKey:@"NSScreenNumber"] longValue];
+	CGDirectDisplayID display = (CGDirectDisplayID)[[[[wind screen] deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
 
     return NSMakeRect (0,0,CGDisplayPixelsWide(display), CGDisplayPixelsHigh(display));
 }
@@ -169,7 +169,7 @@ NSRect FitRectInRect(NSRect source, NSRect destination)
     
 }
 
-- (PluginGLView *)getOpenGLView
+- (PluginGLView *)openGLView
 {
 	return (PluginGLView *)glView;
 }
@@ -277,7 +277,7 @@ NSRect FitRectInRect(NSRect source, NSRect destination)
 	NSWindow *window = [self window];
 	NSScreen *screen = [window screen];
 
-    CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] longValue];
+    CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
 
     NSRect newPlace;
     
@@ -365,7 +365,7 @@ NSRect FitRectInRect(NSRect source, NSRect destination)
 	NSWindow *window = [self window];
   	NSScreen *screen = [window screen];
 
-    CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] longValue];
+    CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
 
     if ([self fullscreen]){
         [window setLevel: NSScreenSaverWindowLevel];
@@ -378,7 +378,7 @@ NSRect FitRectInRect(NSRect source, NSRect destination)
     // if in fullscreen, we must abdicate mouse hiding and level.
 	NSWindow *window = [self window];
 	NSScreen *screen = [window screen];
-    CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] longValue];
+    CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
 
     if ([self fullscreen]){
         [window setLevel: NSNormalWindowLevel];
diff --git a/macosx/plugins/PeopsXgl/macsrc/drawgl.m b/macosx/plugins/PeopsXgl/macsrc/drawgl.m
index 70c5a15e..dcf9e675 100644
--- a/macosx/plugins/PeopsXgl/macsrc/drawgl.m
+++ b/macosx/plugins/PeopsXgl/macsrc/drawgl.m
@@ -155,7 +155,7 @@ unsigned long ulInitDisplay(void)	// OPEN GAME WINDOW
     // this causes a runtime error if it's done on a thread other than the main thread
     dispatch_sync(dispatch_get_main_queue(), ^{
         windowController = [PluginWindowController openGameView];
-        glView = [windowController getOpenGLView];
+        glView = [windowController openGLView];
 	
         [[windowController window] setTitle:[NSString stringWithCString:pCaptionText encoding:NSUTF8StringEncoding]];
     });