[Bf-blender-cvs] [4eeec6e9b54] master: Fix macOS builds after removing Ghost integral types.

[Nicholas Rishel]

Commit: 4eeec6e9b540e8751beb0e6104ebc9b41ede8e4d
Author: Nicholas Rishel
Date:   Mon Jul 5 15:04:37 2021 -0700
Branches: master
https://developer.blender.org/rB4eeec6e9b540e8751beb0e6104ebc9b41ede8e4d

Fix macOS builds after removing Ghost integral types.

===================================================================

M	intern/ghost/intern/GHOST_WindowCocoa.h
M	intern/ghost/intern/GHOST_WindowCocoa.mm
M	intern/ghost/intern/GHOST_WindowViewCocoa.h

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowCocoa.h b/intern/ghost/intern/GHOST_WindowCocoa.h
index 43836abe659..0fd70514ac6 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.h
+++ b/intern/ghost/intern/GHOST_WindowCocoa.h
@@ -255,7 +255,7 @@ class GHOST_WindowCocoa : public GHOST_Window {
   }
 
 #ifdef WITH_INPUT_IME
-  void beginIME(GHOST_TInt32 x, GHOST_TInt32 y, GHOST_TInt32 w, GHOST_TInt32 h, int completed);
+  void beginIME(int32_t x, int32_t y, int32_t w, int32_t h, bool completed);
   void endIME();
 #endif /* WITH_INPUT_IME */
 
@@ -332,7 +332,7 @@ class GHOST_EventIME : public GHOST_Event {
    * \param type: The type of key event.
    * \param key: The key code of the key.
    */
-  GHOST_EventIME(GHOST_TUns64 msec, GHOST_TEventType type, GHOST_IWindow *window, void *customdata)
+  GHOST_EventIME(uint64_t msec, GHOST_TEventType type, GHOST_IWindow *window, void *customdata)
       : GHOST_Event(msec, type, window)
   {
     this->m_data = customdata;
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index b17b3e40a60..0c3b3062126 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -1217,14 +1217,13 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCustomCursorShape(
 }
 
 #ifdef WITH_INPUT_IME
-void GHOST_WindowCocoa::beginIME(
-    GHOST_TInt32 x, GHOST_TInt32 y, GHOST_TInt32 w, GHOST_TInt32 h, int completed)
+void GHOST_WindowCocoa::beginIME(int32_t x, int32_t y, int32_t w, int32_t h, bool completed)
 {
   if (m_openGLView) {
-    [m_openGLView beginIME:x y:y w:w h:h completed:(bool)completed];
+    [m_openGLView beginIME:x y:y w:w h:h completed:completed];
   }
   else {
-    [m_metalView beginIME:x y:y w:w h:h completed:(bool)completed];
+    [m_metalView beginIME:x y:y w:w h:h completed:completed];
   }
 }
 
diff --git a/intern/ghost/intern/GHOST_WindowViewCocoa.h b/intern/ghost/intern/GHOST_WindowViewCocoa.h
index 2aaf1d56116..fa629528809 100644
--- a/intern/ghost/intern/GHOST_WindowViewCocoa.h
+++ b/intern/ghost/intern/GHOST_WindowViewCocoa.h
@@ -55,11 +55,7 @@
                     windowCocoa:(GHOST_WindowCocoa *)winCocoa;
 
 #ifdef WITH_INPUT_IME
-- (void)beginIME:(GHOST_TInt32)x
-               y:(GHOST_TInt32)y
-               w:(GHOST_TInt32)w
-               h:(GHOST_TInt32)h
-       completed:(bool)completed;
+- (void)beginIME:(int32_t)x y:(int32_t)y w:(int32_t)w h:(int32_t)h completed:(bool)completed;
 
 - (void)endIME;
 #endif
@@ -439,18 +435,14 @@
   [self checkImeEnabled];
 }
 
-- (void)setImeCandidateWinPos:(GHOST_TInt32)x y:(GHOST_TInt32)y w:(GHOST_TInt32)w h:(GHOST_TInt32)h
+- (void)setImeCandidateWinPos:(int32_t)x y:(int32_t)y w:(int32_t)w h:(int32_t)h
 {
-  GHOST_TInt32 outX, outY;
+  int32_t outX, outY;
   associatedWindow->clientToScreen(x, y, outX, outY);
   ime.candidate_window_position = NSMakeRect((CGFloat)outX, (CGFloat)outY, (CGFloat)w, (CGFloat)h);
 }
 
-- (void)beginIME:(GHOST_TInt32)x
-               y:(GHOST_TInt32)y
-               w:(GHOST_TInt32)w
-               h:(GHOST_TInt32)h
-       completed:(bool)completed
+- (void)beginIME:(int32_t)x y:(int32_t)y w:(int32_t)w h:(int32_t)h completed:(bool)completed
 {
   ime.state_flag |= GHOST_IME_INPUT_FOCUSED;
   [self checkImeEnabled];