From a61792968363bbd443f03186e77fef77ddbf88a7 Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Mon, 27 Jun 2022 20:31:28 +1000
Subject: Cleanup: rename misleading/inconsistent GHOST types

Remove mask suffix from:
- GHOST_TButtonMask
- GHOST_TModifierKeyMask
.. neither are used as bit-masks.

Remove 'Grab' from:
- GHOST_kGrabAxisNone
- GHOST_kGrabAxisY
.. matching the existing GHOST_TAxisFlag & GHOST_kAxisX.
---
 source/blender/windowmanager/intern/wm_cursors.c | 9 ++++-----
 source/blender/windowmanager/intern/wm_draw.c    | 2 +-
 source/blender/windowmanager/intern/wm_window.c  | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'source/blender/windowmanager')

diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c
index fc992ef069d..54636cb57ec 100644
--- a/source/blender/windowmanager/intern/wm_cursors.c
+++ b/source/blender/windowmanager/intern/wm_cursors.c
@@ -228,7 +228,7 @@ void WM_cursor_grab_enable(wmWindow *win, int wrap, bool hide, int bounds[4])
   /* Only grab cursor when not running debug.
    * It helps not to get a stuck WM when hitting a break-point. */
   GHOST_TGrabCursorMode mode = GHOST_kGrabNormal;
-  GHOST_TAxisFlag mode_axis = GHOST_kAxisX | GHOST_kGrabAxisY;
+  GHOST_TAxisFlag mode_axis = GHOST_kAxisX | GHOST_kAxisY;
 
   if (bounds) {
     wm_cursor_position_to_ghost(win, &bounds[0], &bounds[1]);
@@ -245,7 +245,7 @@ void WM_cursor_grab_enable(wmWindow *win, int wrap, bool hide, int bounds[4])
       mode_axis = GHOST_kAxisX;
     }
     else if (wrap == WM_CURSOR_WRAP_Y) {
-      mode_axis = GHOST_kGrabAxisY;
+      mode_axis = GHOST_kAxisY;
     }
   }
 
@@ -267,11 +267,10 @@ void WM_cursor_grab_disable(wmWindow *win, const int mouse_ungrab_xy[2])
       if (mouse_ungrab_xy) {
         int mouse_xy[2] = {mouse_ungrab_xy[0], mouse_ungrab_xy[1]};
         wm_cursor_position_to_ghost(win, &mouse_xy[0], &mouse_xy[1]);
-        GHOST_SetCursorGrab(
-            win->ghostwin, GHOST_kGrabDisable, GHOST_kGrabAxisNone, NULL, mouse_xy);
+        GHOST_SetCursorGrab(win->ghostwin, GHOST_kGrabDisable, GHOST_kAxisNone, NULL, mouse_xy);
       }
       else {
-        GHOST_SetCursorGrab(win->ghostwin, GHOST_kGrabDisable, GHOST_kGrabAxisNone, NULL, NULL);
+        GHOST_SetCursorGrab(win->ghostwin, GHOST_kGrabDisable, GHOST_kAxisNone, NULL, NULL);
       }
 
       win->grabcursor = GHOST_kGrabDisable;
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index b6953b21b65..66ed36b373d 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -309,7 +309,7 @@ static void wm_software_cursor_draw(wmWindow *win, const struct GrabState *grab_
       event_xy[0] = mod_i(event_xy[0] - min, max - min) + min;
     }
   }
-  if (grab_state->wrap_axis & GHOST_kGrabAxisY) {
+  if (grab_state->wrap_axis & GHOST_kAxisY) {
     const int height = WM_window_pixels_y(win);
     const int min = height - grab_state->bounds[1];
     const int max = height - grab_state->bounds[3];
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 49389634462..3ea3ec2b70b 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -963,7 +963,7 @@ typedef enum {
 /* check if specified modifier key type is pressed */
 static int query_qual(modifierKeyType qual)
 {
-  GHOST_TModifierKeyMask left, right;
+  GHOST_TModifierKey left, right;
   switch (qual) {
     case SHIFT:
       left = GHOST_kModifierKeyLeftShift;
-- 
cgit v1.2.3