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

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

Revision: 641
          http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=641&view=rev
Author:   fredm
Date:     2010-05-27 11:49:15 +0000 (Thu, 27 May 2010)

Log Message:
-----------
Use standard Fuse non-const keysyms_map definition to avoid needing casts about
the place to remove warnings.

Modified Paths:
--------------
    trunk/fuse/keyboard.c
    trunk/fuse/keyboard.h
    trunk/fuse/ui/cocoa/keysyms.m

Modified: trunk/fuse/keyboard.c
===================================================================
--- trunk/fuse/keyboard.c	2010-05-26 12:46:40 UTC (rev 640)
+++ trunk/fuse/keyboard.c	2010-05-27 11:49:15 UTC (rev 641)
@@ -283,7 +283,7 @@
 {
   struct key_info *ptr;
   struct spectrum_keys_wrapper *ptr2;
-  const keysyms_map_t *ptr3;
+  keysyms_map_t *ptr3;
   struct key_text_t *ptr4;
 
   keyboard_release_all();

Modified: trunk/fuse/keyboard.h
===================================================================
--- trunk/fuse/keyboard.h	2010-05-26 12:46:40 UTC (rev 640)
+++ trunk/fuse/keyboard.h	2010-05-27 11:49:15 UTC (rev 641)
@@ -119,7 +119,7 @@
 
 } keysyms_map_t;
 
-extern const keysyms_map_t keysyms_map[];
+extern keysyms_map_t keysyms_map[];
 
 input_key keysyms_remap( libspectrum_dword ui_keysym );
 

Modified: trunk/fuse/ui/cocoa/keysyms.m
===================================================================
--- trunk/fuse/ui/cocoa/keysyms.m	2010-05-26 12:46:40 UTC (rev 640)
+++ trunk/fuse/ui/cocoa/keysyms.m	2010-05-27 11:49:15 UTC (rev 641)
@@ -31,7 +31,7 @@
 
 /* Map ADC keyboard scancode to Fuse input layer keysym for Spectrum
    virtual keyboard */
-const keysyms_map_t keysyms_map[] = {
+keysyms_map_t keysyms_map[] = {
 
   { 48,         INPUT_KEY_Tab        },
   { 36,         INPUT_KEY_Return     },
@@ -99,7 +99,7 @@
 
 /* Map UCS-2(?) Unicode to Fuse input layer keysym for
    non-extended mode Spectrum symbols present on keyboards */
-const keysyms_map_t unicode_keysyms_map[] = {
+keysyms_map_t unicode_keysyms_map[] = {
 
   { 27,                      INPUT_KEY_Escape      },
   { NSUpArrowFunctionKey,    INPUT_KEY_Up          },


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