From dfe7ef7964e708ad7d59ed000e820c53d7b9b730 Mon Sep 17 00:00:00 2001 From: Adam Scott Date: Tue, 27 Aug 2024 12:38:44 -0400 Subject: [PATCH] Fix weird plural public method names --- editor/debugger/editor_debugger_node.cpp | 8 ++++---- editor/debugger/editor_debugger_node.h | 4 ++-- editor/editor_settings_dialog.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/editor/debugger/editor_debugger_node.cpp b/editor/debugger/editor_debugger_node.cpp index d3bd18c0e81..f01301384a2 100644 --- a/editor/debugger/editor_debugger_node.cpp +++ b/editor/debugger/editor_debugger_node.cpp @@ -213,8 +213,8 @@ void EditorDebuggerNode::_bind_methods() { } void EditorDebuggerNode::register_undo_redo(UndoRedo *p_undo_redo) { - p_undo_redo->set_method_notify_callback(_method_changeds, this); - p_undo_redo->set_property_notify_callback(_property_changeds, this); + p_undo_redo->set_method_notify_callback(_methods_changed, this); + p_undo_redo->set_property_notify_callback(_properties_changed, this); } EditorDebuggerRemoteObject *EditorDebuggerNode::get_inspected_remote_object() { @@ -720,7 +720,7 @@ void EditorDebuggerNode::_breakpoints_cleared_in_tree(int p_debugger) { } // Remote inspector/edit. -void EditorDebuggerNode::_method_changeds(void *p_ud, Object *p_base, const StringName &p_name, const Variant **p_args, int p_argcount) { +void EditorDebuggerNode::_methods_changed(void *p_ud, Object *p_base, const StringName &p_name, const Variant **p_args, int p_argcount) { if (!singleton) { return; } @@ -729,7 +729,7 @@ void EditorDebuggerNode::_method_changeds(void *p_ud, Object *p_base, const Stri }); } -void EditorDebuggerNode::_property_changeds(void *p_ud, Object *p_base, const StringName &p_property, const Variant &p_value) { +void EditorDebuggerNode::_properties_changed(void *p_ud, Object *p_base, const StringName &p_property, const Variant &p_value) { if (!singleton) { return; } diff --git a/editor/debugger/editor_debugger_node.h b/editor/debugger/editor_debugger_node.h index aef1d847586..12e097f6522 100644 --- a/editor/debugger/editor_debugger_node.h +++ b/editor/debugger/editor_debugger_node.h @@ -193,8 +193,8 @@ public: // Remote inspector/edit. void request_remote_tree(); - static void _method_changeds(void *p_ud, Object *p_base, const StringName &p_name, const Variant **p_args, int p_argcount); - static void _property_changeds(void *p_ud, Object *p_base, const StringName &p_property, const Variant &p_value); + static void _methods_changed(void *p_ud, Object *p_base, const StringName &p_name, const Variant **p_args, int p_argcount); + static void _properties_changed(void *p_ud, Object *p_base, const StringName &p_property, const Variant &p_value); // LiveDebug void set_live_debugging(bool p_enabled); diff --git a/editor/editor_settings_dialog.cpp b/editor/editor_settings_dialog.cpp index a71d43ad51a..a5c492da10e 100644 --- a/editor/editor_settings_dialog.cpp +++ b/editor/editor_settings_dialog.cpp @@ -139,8 +139,8 @@ void EditorSettingsDialog::_notification(int p_what) { case NOTIFICATION_READY: { EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton(); - undo_redo->get_or_create_history(EditorUndoRedoManager::GLOBAL_HISTORY).undo_redo->set_method_notify_callback(EditorDebuggerNode::_method_changeds, nullptr); - undo_redo->get_or_create_history(EditorUndoRedoManager::GLOBAL_HISTORY).undo_redo->set_property_notify_callback(EditorDebuggerNode::_property_changeds, nullptr); + undo_redo->get_or_create_history(EditorUndoRedoManager::GLOBAL_HISTORY).undo_redo->set_method_notify_callback(EditorDebuggerNode::_methods_changed, nullptr); + undo_redo->get_or_create_history(EditorUndoRedoManager::GLOBAL_HISTORY).undo_redo->set_property_notify_callback(EditorDebuggerNode::_properties_changed, nullptr); undo_redo->get_or_create_history(EditorUndoRedoManager::GLOBAL_HISTORY).undo_redo->set_commit_notify_callback(_undo_redo_callback, this); } break;