[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[730] trunk/fuse/fusepb

[<fr...@us...>]

Revision: 730
          http://sourceforge.net/p/fuse-for-macosx/code/730
Author:   fredm
Date:     2013-03-12 10:38:25 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Make releaseCmdKeys function resemble Objective-C code.

Modified Paths:
--------------
    trunk/fuse/fusepb/controllers/FuseController.h
    trunk/fuse/fusepb/controllers/FuseController.m
    trunk/fuse/fusepb/views/DisplayOpenGLView.m

Modified: trunk/fuse/fusepb/controllers/FuseController.h
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.h	2013-03-12 10:35:28 UTC (rev 729)
+++ trunk/fuse/fusepb/controllers/FuseController.h	2013-03-12 10:38:25 UTC (rev 730)
@@ -158,7 +158,7 @@
 - savePanelAccessoryView;
 @property (getter=saveFileType,readonly) NSPopUpButton* saveFileType;
 
-- (void)releaseCmdKeys:(NSString *)character:(int)keyCode;
+- (void)releaseCmdKeys:(NSString *)character withCode:(int)keyCode;
 - (void)releaseKey:(int)keyCode;
 
 - (void)ui_menu_activate_media_cartridge:(NSNumber*)active;

Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m	2013-03-12 10:35:28 UTC (rev 729)
+++ trunk/fuse/fusepb/controllers/FuseController.m	2013-03-12 10:38:25 UTC (rev 730)
@@ -619,7 +619,7 @@
 
     [[DisplayOpenGLView instance] unpause];
   }
-  [self releaseCmdKeys:@"o":QZ_o];
+  [self releaseCmdKeys:@"o" withCode:QZ_o];
 }
 
 - (IBAction)reset:(id)sender
@@ -668,13 +668,13 @@
 - (IBAction)rzx_insert_snap:(id)sender
 {
   [[DisplayOpenGLView instance] rzxInsertSnap];
-  [self releaseCmdKeys:@"b":QZ_b];
+  [self releaseCmdKeys:@"b" withCode:QZ_b];
 }
 
 - (IBAction)rzx_rollback:(id)sender
 {
   [[DisplayOpenGLView instance] rzxRollback];
-  [self releaseCmdKeys:@"z":QZ_z];
+  [self releaseCmdKeys:@"z" withCode:QZ_z];
 }
 
 - (IBAction)rzx_start:(id)sender
@@ -784,7 +784,7 @@
 save_as_exit:
     [[DisplayOpenGLView instance] unpause];
   }
-  [self releaseCmdKeys:@"s":QZ_s];
+  [self releaseCmdKeys:@"s" withCode:QZ_s];
 }
 
 - (IBAction)open_screen:(id)sender
@@ -912,7 +912,7 @@
 - (IBAction)joystick_keyboard:(id)sender
 {
   [[DisplayOpenGLView instance] joystickToggleKeyboard];
-  [self releaseCmdKeys:@"j":QZ_j];
+  [self releaseCmdKeys:@"j" withCode:QZ_j];
 }
 
 - (IBAction)tape_clear:(id)sender
@@ -942,7 +942,7 @@
 - (IBAction)tape_play:(id)sender
 {
   [[DisplayOpenGLView instance] tapeTogglePlay];
-  [self releaseCmdKeys:@"p":QZ_p];
+  [self releaseCmdKeys:@"p" withCode:QZ_p];
 }
 
 - (IBAction)tape_rewind:(id)sender
@@ -1024,13 +1024,13 @@
   if( !settings_current.full_screen ) {
     [[NSApp keyWindow] performClose:self];
   }
-  [self releaseCmdKeys:@"q":QZ_q];
+  [self releaseCmdKeys:@"q" withCode:QZ_q];
 }
 
 - (IBAction)hide:(id)sender
 {
   [NSApp hide:self];
-  [self releaseCmdKeys:@"h":QZ_h];
+  [self releaseCmdKeys:@"h" withCode:QZ_h];
 }
 
 - (IBAction)help:(id)sender
@@ -1038,7 +1038,7 @@
   if( !settings_current.full_screen ) {
     [NSApp showHelp:self];
   }
-  [self releaseCmdKeys:@"?":QZ_SLASH];
+  [self releaseCmdKeys:@"?" withCode:QZ_SLASH];
 }
 
 - (IBAction)cocoa_break:(id)sender
@@ -1077,7 +1077,7 @@
     }
     [keyboardController showCloseWindow:self];
   }
-  [self releaseCmdKeys:@"k":QZ_k];
+  [self releaseCmdKeys:@"k" withCode:QZ_k];
 }
 
 - (IBAction)showLoadBinaryPane:(id)sender
@@ -1127,7 +1127,7 @@
     preferencesController = [[PreferencesController alloc] init];
   }
   [preferencesController showWindow:self];
-  [self releaseCmdKeys:@".":QZ_PERIOD];
+  [self releaseCmdKeys:@"." withCode:QZ_PERIOD];
 }
 
 - (IBAction)saveFileTypeClicked:(id)sender;
@@ -1181,7 +1181,7 @@
  *    to keep the SDL library in a sane state, otherwise only every other
  *    shortcut keypress will work.
  *-----------------------------------------------------------------------------*/
-- (void) releaseCmdKeys:(NSString *)character:(int)keyCode
+- (void) releaseCmdKeys:(NSString *)character withCode:(int)keyCode
 {
     NSEvent *event1, *event2;
     NSPoint point = { 0, 0 };

Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m	2013-03-12 10:35:28 UTC (rev 729)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m	2013-03-12 10:38:25 UTC (rev 730)
@@ -122,7 +122,7 @@
   [view_lock lock];
   statusbar_updated = YES;
   [view_lock unlock];
-  [[FuseController singleton] releaseCmdKeys:@"f":QZ_f];
+  [[FuseController singleton] releaseCmdKeys:@"f" withCode:QZ_f];
 }
 
 -(IBAction) zoom:(id)sender
@@ -133,33 +133,33 @@
   case 1: /* 320x240 */
     size.width = 320;
     size.height = 240;
-    [[FuseController singleton] releaseCmdKeys:@"1":QZ_1];
+    [[FuseController singleton] releaseCmdKeys:@"1" withCode:QZ_1];
     break;
   case 2: /* 640x480 */
     size.width = 640;
     size.height = 480;
-    [[FuseController singleton] releaseCmdKeys:@"2":QZ_2];
+    [[FuseController singleton] releaseCmdKeys:@"2" withCode:QZ_2];
     break;
   case 3: /* 960x720 */
     size.width = 960;
     size.height = 720;
-    [[FuseController singleton] releaseCmdKeys:@"3":QZ_3];
+    [[FuseController singleton] releaseCmdKeys:@"3" withCode:QZ_3];
     break;
   case 4: /* 1280x960 */
     size.width = 1280;
     size.height = 960;
-    [[FuseController singleton] releaseCmdKeys:@"4":QZ_4];
+    [[FuseController singleton] releaseCmdKeys:@"4" withCode:QZ_4];
     break;
   case 5: /* 1600x1200 */
     size.width = 1600;
     size.height = 1200;
-    [[FuseController singleton] releaseCmdKeys:@"5":QZ_5];
+    [[FuseController singleton] releaseCmdKeys:@"5" withCode:QZ_5];
     break;
   case 0:
   default: /* Actual size */
     size.width = screenTex[0].image_width;
     size.height = screenTex[0].image_height;
-    [[FuseController singleton] releaseCmdKeys:@"0":QZ_0];
+    [[FuseController singleton] releaseCmdKeys:@"0" withCode:QZ_0];
   }
 
   [[self window] setContentSize:size];
@@ -1438,7 +1438,7 @@
 
 -(void) windowDidDeminiaturize:(NSNotification *)inNotification
 {
-  [[FuseController singleton] releaseCmdKeys:@"m":QZ_m];
+  [[FuseController singleton] releaseCmdKeys:@"m" withCode:QZ_m];
 }
 
 -(void) displayLinkStop

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.