diff --git a/intern/ghost/GHOST_Path-api.hh b/intern/ghost/GHOST_Path-api.hh index 3bc9ca14165..82dbff04ad2 100644 --- a/intern/ghost/GHOST_Path-api.hh +++ b/intern/ghost/GHOST_Path-api.hh @@ -61,7 +61,7 @@ extern const char *GHOST_getBinaryDir(void); /** * Add the file to the operating system most recently used files */ -extern void GHOST_addToSystemRecentFiles(const char *filename); +extern void GHOST_addToSystemRecentFiles(const char *filepath); #ifdef __cplusplus } diff --git a/intern/ghost/intern/GHOST_IXrGraphicsBinding.hh b/intern/ghost/intern/GHOST_IXrGraphicsBinding.hh index ee92f90ca5d..d7cd28270e0 100644 --- a/intern/ghost/intern/GHOST_IXrGraphicsBinding.hh +++ b/intern/ghost/intern/GHOST_IXrGraphicsBinding.hh @@ -57,4 +57,4 @@ class GHOST_IXrGraphicsBinding { }; std::unique_ptr GHOST_XrGraphicsBindingCreateFromType( - GHOST_TXrGraphicsBinding type, GHOST_Context &ghost_ctx); + GHOST_TXrGraphicsBinding type, GHOST_Context &context); diff --git a/intern/ghost/intern/GHOST_SystemWayland.hh b/intern/ghost/intern/GHOST_SystemWayland.hh index faaaa03f46f..0b5984b026d 100644 --- a/intern/ghost/intern/GHOST_SystemWayland.hh +++ b/intern/ghost/intern/GHOST_SystemWayland.hh @@ -37,15 +37,15 @@ bool ghost_wl_output_own(const struct wl_output *wl_output); void ghost_wl_output_tag(struct wl_output *wl_output); struct GWL_Output *ghost_wl_output_user_data(struct wl_output *wl_output); -bool ghost_wl_surface_own(const struct wl_surface *surface); -void ghost_wl_surface_tag(struct wl_surface *surface); -GHOST_WindowWayland *ghost_wl_surface_user_data(struct wl_surface *surface); +bool ghost_wl_surface_own(const struct wl_surface *wl_surface); +void ghost_wl_surface_tag(struct wl_surface *wl_surface); +GHOST_WindowWayland *ghost_wl_surface_user_data(struct wl_surface *wl_surface); -bool ghost_wl_surface_own_cursor_pointer(const struct wl_surface *surface); -void ghost_wl_surface_tag_cursor_pointer(struct wl_surface *surface); +bool ghost_wl_surface_own_cursor_pointer(const struct wl_surface *wl_surface); +void ghost_wl_surface_tag_cursor_pointer(struct wl_surface *wl_surface); -bool ghost_wl_surface_own_cursor_tablet(const struct wl_surface *surface); -void ghost_wl_surface_tag_cursor_tablet(struct wl_surface *surface); +bool ghost_wl_surface_own_cursor_tablet(const struct wl_surface *wl_surface); +void ghost_wl_surface_tag_cursor_tablet(struct wl_surface *wl_surface); /* Scaling to: translates from WAYLAND into GHOST (viewport local) coordinates. * Scaling from: performs the reverse translation. diff --git a/intern/ghost/intern/GHOST_SystemX11.cc b/intern/ghost/intern/GHOST_SystemX11.cc index d5a33b028be..c204cf78c6c 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cc +++ b/intern/ghost/intern/GHOST_SystemX11.cc @@ -85,7 +85,7 @@ static uchar bit_is_on(const uchar *ptr, int bit) static GHOST_TKey ghost_key_from_keysym(const KeySym key); static GHOST_TKey ghost_key_from_keycode(const XkbDescPtr xkb_descr, const KeyCode keycode); -static GHOST_TKey ghost_key_from_keysym_or_keycode(const KeySym key, +static GHOST_TKey ghost_key_from_keysym_or_keycode(const KeySym key_sym, const XkbDescPtr xkb_descr, const KeyCode keycode); @@ -1776,11 +1776,11 @@ bool GHOST_SystemX11::generateWindowExposeEvents() return anyProcessed; } -static GHOST_TKey ghost_key_from_keysym_or_keycode(const KeySym keysym, +static GHOST_TKey ghost_key_from_keysym_or_keycode(const KeySym key_sym, XkbDescPtr xkb_descr, const KeyCode keycode) { - GHOST_TKey type = ghost_key_from_keysym(keysym); + GHOST_TKey type = ghost_key_from_keysym(key_sym); if (type == GHOST_kKeyUnknown) { if (xkb_descr) { type = ghost_key_from_keycode(xkb_descr, keycode); diff --git a/intern/ghost/intern/GHOST_SystemX11.hh b/intern/ghost/intern/GHOST_SystemX11.hh index 4314063f2ba..4e8dc4d610a 100644 --- a/intern/ghost/intern/GHOST_SystemX11.hh +++ b/intern/ghost/intern/GHOST_SystemX11.hh @@ -31,7 +31,7 @@ #endif /* generic error handlers */ -int GHOST_X11_ApplicationErrorHandler(Display *display, XErrorEvent *theEvent); +int GHOST_X11_ApplicationErrorHandler(Display *display, XErrorEvent *event); int GHOST_X11_ApplicationIOErrorHandler(Display *display); #define GHOST_X11_ERROR_HANDLERS_OVERRIDE(var) \ diff --git a/intern/ghost/intern/GHOST_Window.hh b/intern/ghost/intern/GHOST_Window.hh index d9d65832dfe..c079e71cc21 100644 --- a/intern/ghost/intern/GHOST_Window.hh +++ b/intern/ghost/intern/GHOST_Window.hh @@ -155,7 +155,7 @@ class GHOST_Window : public GHOST_IWindow { GHOST_TSuccess getCursorGrabBounds(GHOST_Rect &bounds) const override; void getCursorGrabState(GHOST_TGrabCursorMode &mode, - GHOST_TAxisFlag &axis_flag, + GHOST_TAxisFlag &wrap_axis, GHOST_Rect &bounds, bool &use_software_cursor) override; /** diff --git a/intern/ghost/intern/GHOST_XrAction.hh b/intern/ghost/intern/GHOST_XrAction.hh index 0b1e9760026..41afce9fada 100644 --- a/intern/ghost/intern/GHOST_XrAction.hh +++ b/intern/ghost/intern/GHOST_XrAction.hh @@ -89,11 +89,13 @@ class GHOST_XrAction { const XrTime &predicted_display_time); void applyHapticFeedback(XrSession session, const char *action_name, - const char *subaction_path, + const char *subaction_path_str, const int64_t &duration, const float &frequency, const float &litude); - void stopHapticFeedback(XrSession session, const char *action_name, const char *subaction_path); + void stopHapticFeedback(XrSession session, + const char *action_name, + const char *subaction_path_str); void *getCustomdata(); void getBindings(std::map> &r_bindings) const; diff --git a/source/blender/imbuf/intern/IMB_filetype.h b/source/blender/imbuf/intern/IMB_filetype.h index 005b56ba7b4..d713b978eda 100644 --- a/source/blender/imbuf/intern/IMB_filetype.h +++ b/source/blender/imbuf/intern/IMB_filetype.h @@ -184,7 +184,7 @@ struct ImBuf *imb_load_cineon(const unsigned char *mem, * \{ */ bool imb_is_a_dpx(const unsigned char *buf, size_t size); -bool imb_save_dpx(struct ImBuf *buf, const char *filepath, int flags); +bool imb_save_dpx(struct ImBuf *ibuf, const char *filepath, int flags); struct ImBuf *imb_load_dpx(const unsigned char *mem, size_t size, int flags,