diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-05-03 14:28:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-03 14:28:18 +0200 |
commit | 297241f368632dd91a3e7df47da3d9e5197e4f1e (patch) | |
tree | 78eba933e9940b9a65bbe1ee02027a61e98f6716 /servers/display_server.h | |
parent | 77c9138e7274f0b7d2ae1327748774ab74bd5d5c (diff) | |
parent | 180e5d30286279c979507a571bf6d336aa49da9d (diff) |
Merge pull request #60714 from Calinou/typedef-remove-ref
Remove `RES` and `REF` typedefs in favor of spelled out `Ref<>`
Diffstat (limited to 'servers/display_server.h')
-rw-r--r-- | servers/display_server.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/display_server.h b/servers/display_server.h index 136f95a74f..7a15df2f92 100644 --- a/servers/display_server.h +++ b/servers/display_server.h @@ -80,7 +80,7 @@ private: static Input::MouseMode _input_get_mouse_mode(); static void _input_warp(const Vector2 &p_to_pos); static Input::CursorShape _input_get_current_cursor_shape(); - static void _input_set_custom_mouse_cursor_func(const RES &, Input::CursorShape, const Vector2 &p_hostspot); + static void _input_set_custom_mouse_cursor_func(const Ref<Resource> &, Input::CursorShape, const Vector2 &p_hostspot); protected: static void _bind_methods(); @@ -410,7 +410,7 @@ public: }; virtual void cursor_set_shape(CursorShape p_shape); virtual CursorShape cursor_get_shape() const; - virtual void cursor_set_custom_image(const RES &p_cursor, CursorShape p_shape = CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()); + virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape = CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()); virtual bool get_swap_cancel_ok(); |