From 52a7555a8478caed42f9c71be981e340cea226e4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 10 Dec 2023 17:14:06 +1100 Subject: [PATCH] Cleanup: match header/source argument naming --- intern/ghost/GHOST_C-api.h | 22 +++++++++++----------- intern/ghost/intern/GHOST_C-api.cc | 17 +++++++++-------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h index 25f171c8f7d..d7137509e5e 100644 --- a/intern/ghost/GHOST_C-api.h +++ b/intern/ghost/GHOST_C-api.h @@ -19,9 +19,9 @@ extern "C" { /** * Definition of a callback routine that receives events. * \param event: The event received. - * \param userdata: The callback's user data, supplied to #GHOST_CreateSystem. + * \param user_data: The callback's user data, supplied to #GHOST_CreateSystem. */ -typedef bool (*GHOST_EventCallbackProcPtr)(GHOST_EventHandle event, GHOST_TUserDataPtr userdata); +typedef bool (*GHOST_EventCallbackProcPtr)(GHOST_EventHandle event, GHOST_TUserDataPtr user_data); /** * Creates the one and only system. @@ -69,10 +69,10 @@ extern void GHOST_ShowMessageBox(GHOST_SystemHandle systemhandle, /** * Creates an event consumer object * \param eventCallback: The event callback routine. - * \param userdata: Pointer to user data returned to the callback routine. + * \param user_data: Pointer to user data returned to the callback routine. */ extern GHOST_EventConsumerHandle GHOST_CreateEventConsumer( - GHOST_EventCallbackProcPtr eventCallback, GHOST_TUserDataPtr userdata); + GHOST_EventCallbackProcPtr eventCallback, GHOST_TUserDataPtr user_data); /** * Disposes an event consumer object @@ -105,7 +105,7 @@ extern GHOST_TimerTaskHandle GHOST_InstallTimer(GHOST_SystemHandle systemhandle, uint64_t delay, uint64_t interval, GHOST_TimerProcPtr timerProc, - GHOST_TUserDataPtr userData); + GHOST_TUserDataPtr user_data); /** * Removes a timer. @@ -207,9 +207,9 @@ extern GHOST_TUserDataPtr GHOST_GetWindowUserData(GHOST_WindowHandle windowhandl /** * Changes the window user data. * \param windowhandle: The handle to the window. - * \param userdata: The window user data. + * \param user_data: The window user data. */ -extern void GHOST_SetWindowUserData(GHOST_WindowHandle windowhandle, GHOST_TUserDataPtr userdata); +extern void GHOST_SetWindowUserData(GHOST_WindowHandle windowhandle, GHOST_TUserDataPtr user_data); extern bool GHOST_IsDialogWindow(GHOST_WindowHandle windowhandle); @@ -537,10 +537,10 @@ extern GHOST_TUserDataPtr GHOST_GetTimerTaskUserData(GHOST_TimerTaskHandle timer /** * Changes the time user data. * \param timertaskhandle: The handle to the timer-task. - * \param userdata: The timer user data. + * \param user_data: The timer user data. */ extern void GHOST_SetTimerTaskUserData(GHOST_TimerTaskHandle timertaskhandle, - GHOST_TUserDataPtr userdata); + GHOST_TUserDataPtr user_data); /** * Returns indication as to whether the window is valid. @@ -1165,7 +1165,7 @@ int GHOST_XrSyncActions(GHOST_XrContextHandle xr_context, const char *action_set /** * Apply an OpenXR haptic output action. */ -int GHOST_XrApplyHapticAction(GHOST_XrContextHandle xr_context, +int GHOST_XrApplyHapticAction(GHOST_XrContextHandle xr_context_handle, const char *action_set_name, const char *action_name, const char *subaction_path, @@ -1176,7 +1176,7 @@ int GHOST_XrApplyHapticAction(GHOST_XrContextHandle xr_context, /** * Stop a previously applied OpenXR haptic output action. */ -void GHOST_XrStopHapticAction(GHOST_XrContextHandle xr_context, +void GHOST_XrStopHapticAction(GHOST_XrContextHandle xr_context_handle, const char *action_set_name, const char *action_name, const char *subaction_path); diff --git a/intern/ghost/intern/GHOST_C-api.cc b/intern/ghost/intern/GHOST_C-api.cc index 268353618bc..23a2f1f19ea 100644 --- a/intern/ghost/intern/GHOST_C-api.cc +++ b/intern/ghost/intern/GHOST_C-api.cc @@ -73,9 +73,9 @@ void GHOST_ShowMessageBox(GHOST_SystemHandle systemhandle, } GHOST_EventConsumerHandle GHOST_CreateEventConsumer(GHOST_EventCallbackProcPtr eventCallback, - GHOST_TUserDataPtr userdata) + GHOST_TUserDataPtr user_data) { - return (GHOST_EventConsumerHandle) new GHOST_CallbackEventConsumer(eventCallback, userdata); + return (GHOST_EventConsumerHandle) new GHOST_CallbackEventConsumer(eventCallback, user_data); } GHOST_TSuccess GHOST_DisposeEventConsumer(GHOST_EventConsumerHandle consumerhandle) @@ -95,11 +95,11 @@ GHOST_TimerTaskHandle GHOST_InstallTimer(GHOST_SystemHandle systemhandle, uint64_t delay, uint64_t interval, GHOST_TimerProcPtr timerproc, - GHOST_TUserDataPtr userdata) + GHOST_TUserDataPtr user_data) { GHOST_ISystem *system = (GHOST_ISystem *)systemhandle; - return (GHOST_TimerTaskHandle)system->installTimer(delay, interval, timerproc, userdata); + return (GHOST_TimerTaskHandle)system->installTimer(delay, interval, timerproc, user_data); } GHOST_TSuccess GHOST_RemoveTimer(GHOST_SystemHandle systemhandle, @@ -188,11 +188,11 @@ GHOST_TUserDataPtr GHOST_GetWindowUserData(GHOST_WindowHandle windowhandle) return window->getUserData(); } -void GHOST_SetWindowUserData(GHOST_WindowHandle windowhandle, GHOST_TUserDataPtr userdata) +void GHOST_SetWindowUserData(GHOST_WindowHandle windowhandle, GHOST_TUserDataPtr user_data) { GHOST_IWindow *window = (GHOST_IWindow *)windowhandle; - window->setUserData(userdata); + window->setUserData(user_data); } bool GHOST_IsDialogWindow(GHOST_WindowHandle windowhandle) @@ -541,11 +541,12 @@ GHOST_TUserDataPtr GHOST_GetTimerTaskUserData(GHOST_TimerTaskHandle timertaskhan return timertask->getUserData(); } -void GHOST_SetTimerTaskUserData(GHOST_TimerTaskHandle timertaskhandle, GHOST_TUserDataPtr userdata) +void GHOST_SetTimerTaskUserData(GHOST_TimerTaskHandle timertaskhandle, + GHOST_TUserDataPtr user_data) { GHOST_ITimerTask *timertask = (GHOST_ITimerTask *)timertaskhandle; - timertask->setUserData(userdata); + timertask->setUserData(user_data); } bool GHOST_GetValid(GHOST_WindowHandle windowhandle)