rename Command key to OSKey, Window manager already called it the OSKey but internally it was mixed.

7 files changed, 10 insertions, 10 deletions

diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index b876aa11ab5..c9aac8502c4 100644
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -5545,7 +5545,7 @@ static void outliner_draw_keymapbuts(uiBlock *block, ARegion *ar, SpaceOops *soo
 				uiDefButS(block, OPTION, 0, "Shift",	xstart, (int)te->ys+1, butw3+5, OL_H-1, &kmi->shift, 0, 0, 0, 0, "Modifier"); xstart+= butw3+5;
 				uiDefButS(block, OPTION, 0, "Ctrl",	xstart, (int)te->ys+1, butw3, OL_H-1, &kmi->ctrl, 0, 0, 0, 0, "Modifier"); xstart+= butw3;
 				uiDefButS(block, OPTION, 0, "Alt",	xstart, (int)te->ys+1, butw3, OL_H-1, &kmi->alt, 0, 0, 0, 0, "Modifier"); xstart+= butw3;
-				uiDefButS(block, OPTION, 0, "Cmd",	xstart, (int)te->ys+1, butw3, OL_H-1, &kmi->oskey, 0, 0, 0, 0, "Modifier"); xstart+= butw3;
+				uiDefButS(block, OPTION, 0, "OS",	xstart, (int)te->ys+1, butw3, OL_H-1, &kmi->oskey, 0, 0, 0, 0, "Modifier"); xstart+= butw3;
 				xstart+= 5;
 				uiDefKeyevtButS(block, 0, "", xstart, (int)te->ys+1, butw3, OL_H-1, &kmi->keymodifier, "Key Modifier code");
 				xstart+= butw3+5;
diff --git a/source/blender/editors/space_text/text_python.c b/source/blender/editors/space_text/text_python.c
index aee1a7ecfd6..9be554924c9 100644
--- a/source/blender/editors/space_text/text_python.c
+++ b/source/blender/editors/space_text/text_python.c
@@ -182,7 +182,7 @@ static void confirm_suggestion(Text *text, int skipleft)
 #define LR_SHIFTKEY 0
 #define LR_ALTKEY 0
 #define LR_CTRLKEY 0
-#define LR_COMMANDKEY 0
+#define LR_OSKEY 0
 
 // XXX
 static int doc_scroll= 0;
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index a6fcfb04982..1778e648e20 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1534,7 +1534,7 @@ int initTransform(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event, int
 				if ((ELEM(kmi->type, LEFTCTRLKEY, RIGHTCTRLKEY) && event->ctrl) ||
 					(ELEM(kmi->type, LEFTSHIFTKEY, RIGHTSHIFTKEY) && event->shift) ||
 					(ELEM(kmi->type, LEFTALTKEY, RIGHTALTKEY) && event->alt) ||
-					(kmi->type == COMMANDKEY && event->oskey)) {
+					(kmi->type == OSKEY && event->oskey)) {
 					t->modifiers |= MOD_SNAP_INVERT;
 				}
 				break;
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 62d0c99f6c5..7e54a3b14fa 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -175,7 +175,7 @@ EnumPropertyItem event_type_items[] = {
 	{RIGHTCTRLKEY,	"RIGHT_CTRL",	0, "Right Ctrl", ""},
 	{RIGHTSHIFTKEY,	"RIGHT_SHIFT",	0, "Right Shift", ""},
 	{0, "", 0, NULL, NULL},
-	{COMMANDKEY,	"COMMAND",	0, "Command", ""},
+	{OSKEY,	"OSKEY",	0, "OS Key", ""},
 	{0, "", 0, NULL, NULL},
 	{ESCKEY, "ESC", 0, "Esc", ""},
 	{TABKEY, "TAB", 0, "Tab", ""},
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 590d28012f9..334bc79b96a 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2067,7 +2067,7 @@ static int convert_key(GHOST_TKey key)
 			case GHOST_kKeyRightShift:		return RIGHTSHIFTKEY;
 			case GHOST_kKeyLeftControl:		return LEFTCTRLKEY;
 			case GHOST_kKeyRightControl:	return RIGHTCTRLKEY;
-			case GHOST_kKeyCommand:			return COMMANDKEY;
+			case GHOST_kKeyOS:				return OSKEY;
 			case GHOST_kKeyLeftAlt:			return LEFTALTKEY;
 			case GHOST_kKeyRightAlt:		return RIGHTALTKEY;
 				
@@ -2324,7 +2324,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int t
 				if(event.val==KM_PRESS && (evt->ctrl || evt->shift || evt->oskey))
 				   event.alt= evt->alt = 3;		// define?
 			} 
-			else if (event.type==COMMANDKEY) {
+			else if (event.type==OSKEY) {
 				event.oskey= evt->oskey= (event.val==KM_PRESS);
 				if(event.val==KM_PRESS && (evt->ctrl || evt->alt || evt->shift))
 				   event.oskey= evt->oskey = 3;		// define?
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 328c3e80259..d9d7abd3a68 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -528,7 +528,7 @@ static int query_qual(char qual)
 		left= GHOST_kModifierKeyLeftControl;
 		right= GHOST_kModifierKeyRightControl;
 	} else if (qual=='C') {
-		left= right= GHOST_kModifierKeyCommand;
+		left= right= GHOST_kModifierKeyOS;
 	} else {
 		left= GHOST_kModifierKeyLeftAlt;
 		right= GHOST_kModifierKeyRightAlt;
@@ -613,7 +613,7 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr private)
 					wm_event_add_ghostevent(wm, win, GHOST_kEventKeyUp, time, &kdata);
 				}
 				if (win->eventstate->oskey && !query_qual('C')) {
-					kdata.key= GHOST_kKeyCommand;
+					kdata.key= GHOST_kKeyOS;
 					wm_event_add_ghostevent(wm, win, GHOST_kEventKeyUp, time, &kdata);
 				}
 				/* keymodifier zero, it hangs on hotkeys that open windows otherwise */
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h
index e4b56080b03..efc31f6f7c3 100644
--- a/source/blender/windowmanager/wm_event_types.h
+++ b/source/blender/windowmanager/wm_event_types.h
@@ -204,7 +204,7 @@
 #define	ENDKEY		170
 
 #define UNKNOWNKEY	171
-#define COMMANDKEY	172
+#define OSKEY		172
 #define GRLESSKEY	173
 
 /* for event checks */
@@ -215,7 +215,7 @@
 #define ISKEYBOARD(event)	(event >=' ' && event <=320)
 
 	/* test whether the event is a modifier key */
-#define ISKEYMODIFIER(event)	((event >= LEFTCTRLKEY && event <= LEFTSHIFTKEY) || event == COMMANDKEY)
+#define ISKEYMODIFIER(event)	((event >= LEFTCTRLKEY && event <= LEFTSHIFTKEY) || event == OSKEY)
 
 	/* test whether the event is a mouse button */
 #define ISMOUSE(event)	(event >= LEFTMOUSE && event <= MOUSEROTATE)