You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-13 13:31:48 +00:00
Mono/C#: Fix several clang-tidy warnings and cleanup
This commit is contained in:
Ignacio Etcheverry
@@ -135,7 +135,7 @@ private:
|
||||
bool exports_invalidated = true;
|
||||
void _update_exports_values(Map<StringName, Variant> &values, List<PropertyInfo> &propnames);
|
||||
void _update_member_info_no_exports();
|
||||
virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder);
|
||||
void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder) override;
|
||||
#endif
|
||||
|
||||
#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
|
||||
@@ -146,6 +146,8 @@ private:
|
||||
|
||||
void _clear();
|
||||
|
||||
void _update_name();
|
||||
|
||||
void load_script_signals(GDMonoClass *p_class, GDMonoClass *p_native_class);
|
||||
bool _get_signal(GDMonoClass *p_class, GDMonoMethod *p_delegate_invoke, Vector<SignalParameter> ¶ms);
|
||||
|
||||
@@ -169,68 +171,66 @@ private:
|
||||
protected:
|
||||
static void _bind_methods();
|
||||
|
||||
Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error);
|
||||
virtual void _resource_path_changed();
|
||||
Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) override;
|
||||
void _resource_path_changed() override;
|
||||
bool _get(const StringName &p_name, Variant &r_ret) const;
|
||||
bool _set(const StringName &p_name, const Variant &p_value);
|
||||
void _get_property_list(List<PropertyInfo> *p_properties) const;
|
||||
|
||||
public:
|
||||
virtual bool can_instance() const;
|
||||
virtual StringName get_instance_base_type() const;
|
||||
virtual ScriptInstance *instance_create(Object *p_this);
|
||||
virtual PlaceHolderScriptInstance *placeholder_instance_create(Object *p_this);
|
||||
virtual bool instance_has(const Object *p_this) const;
|
||||
bool can_instance() const override;
|
||||
StringName get_instance_base_type() const override;
|
||||
ScriptInstance *instance_create(Object *p_this) override;
|
||||
PlaceHolderScriptInstance *placeholder_instance_create(Object *p_this) override;
|
||||
bool instance_has(const Object *p_this) const override;
|
||||
|
||||
virtual bool has_source_code() const;
|
||||
virtual String get_source_code() const;
|
||||
virtual void set_source_code(const String &p_code);
|
||||
bool has_source_code() const override;
|
||||
String get_source_code() const override;
|
||||
void set_source_code(const String &p_code) override;
|
||||
|
||||
virtual Error reload(bool p_keep_state = false);
|
||||
Error reload(bool p_keep_state = false) override;
|
||||
|
||||
virtual bool has_script_signal(const StringName &p_signal) const;
|
||||
virtual void get_script_signal_list(List<MethodInfo> *r_signals) const;
|
||||
bool has_script_signal(const StringName &p_signal) const override;
|
||||
void get_script_signal_list(List<MethodInfo> *r_signals) const override;
|
||||
|
||||
virtual bool get_property_default_value(const StringName &p_property, Variant &r_value) const;
|
||||
virtual void get_script_property_list(List<PropertyInfo> *p_list) const;
|
||||
virtual void update_exports();
|
||||
bool get_property_default_value(const StringName &p_property, Variant &r_value) const override;
|
||||
void get_script_property_list(List<PropertyInfo> *p_list) const override;
|
||||
void update_exports() override;
|
||||
|
||||
void get_members(Set<StringName> *p_members) override;
|
||||
|
||||
virtual bool is_tool() const { return tool; }
|
||||
virtual bool is_valid() const { return valid; }
|
||||
bool is_tool() const override { return tool; }
|
||||
bool is_valid() const override { return valid; }
|
||||
|
||||
bool inherits_script(const Ref<Script> &p_script) const;
|
||||
bool inherits_script(const Ref<Script> &p_script) const override;
|
||||
|
||||
virtual Ref<Script> get_base_script() const;
|
||||
virtual ScriptLanguage *get_language() const;
|
||||
Ref<Script> get_base_script() const override;
|
||||
ScriptLanguage *get_language() const override;
|
||||
|
||||
virtual void get_script_method_list(List<MethodInfo> *p_list) const;
|
||||
bool has_method(const StringName &p_method) const;
|
||||
MethodInfo get_method_info(const StringName &p_method) const;
|
||||
void get_script_method_list(List<MethodInfo> *p_list) const override;
|
||||
bool has_method(const StringName &p_method) const override;
|
||||
MethodInfo get_method_info(const StringName &p_method) const override;
|
||||
|
||||
virtual int get_member_line(const StringName &p_member) const;
|
||||
int get_member_line(const StringName &p_member) const override;
|
||||
|
||||
virtual Vector<ScriptNetData> get_rpc_methods() const;
|
||||
virtual uint16_t get_rpc_method_id(const StringName &p_method) const;
|
||||
virtual StringName get_rpc_method(const uint16_t p_rpc_method_id) const;
|
||||
virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const;
|
||||
virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const;
|
||||
Vector<ScriptNetData> get_rpc_methods() const override;
|
||||
uint16_t get_rpc_method_id(const StringName &p_method) const override;
|
||||
StringName get_rpc_method(const uint16_t p_rpc_method_id) const override;
|
||||
MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const override;
|
||||
MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
|
||||
|
||||
virtual Vector<ScriptNetData> get_rset_properties() const;
|
||||
virtual uint16_t get_rset_property_id(const StringName &p_variable) const;
|
||||
virtual StringName get_rset_property(const uint16_t p_variable_id) const;
|
||||
virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_variable_id) const;
|
||||
virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const;
|
||||
Vector<ScriptNetData> get_rset_properties() const override;
|
||||
uint16_t get_rset_property_id(const StringName &p_variable) const override;
|
||||
StringName get_rset_property(const uint16_t p_variable_id) const override;
|
||||
MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_variable_id) const override;
|
||||
MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
virtual bool is_placeholder_fallback_enabled() const { return placeholder_fallback_enabled; }
|
||||
bool is_placeholder_fallback_enabled() const override { return placeholder_fallback_enabled; }
|
||||
#endif
|
||||
|
||||
Error load_source_code(const String &p_path);
|
||||
|
||||
StringName get_script_name() const;
|
||||
|
||||
CSharpScript();
|
||||
~CSharpScript();
|
||||
};
|
||||
@@ -249,8 +249,6 @@ class CSharpInstance : public ScriptInstance {
|
||||
Ref<CSharpScript> script;
|
||||
MonoGCHandleData gchandle;
|
||||
|
||||
Vector<Callable> event_signal_callables;
|
||||
|
||||
bool _reference_owner_unsafe();
|
||||
|
||||
/*
|
||||
@@ -277,18 +275,18 @@ public:
|
||||
|
||||
_FORCE_INLINE_ bool is_destructing_script_instance() { return destructing_script_instance; }
|
||||
|
||||
virtual Object *get_owner();
|
||||
Object *get_owner() override;
|
||||
|
||||
virtual bool set(const StringName &p_name, const Variant &p_value);
|
||||
virtual bool get(const StringName &p_name, Variant &r_ret) const;
|
||||
virtual void get_property_list(List<PropertyInfo> *p_properties) const;
|
||||
virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid) const;
|
||||
bool set(const StringName &p_name, const Variant &p_value) override;
|
||||
bool get(const StringName &p_name, Variant &r_ret) const override;
|
||||
void get_property_list(List<PropertyInfo> *p_properties) const override;
|
||||
Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid) const override;
|
||||
|
||||
/* TODO */ virtual void get_method_list(List<MethodInfo> *p_list) const {}
|
||||
virtual bool has_method(const StringName &p_method) const;
|
||||
virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error);
|
||||
virtual void call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount);
|
||||
virtual void call_multilevel_reversed(const StringName &p_method, const Variant **p_args, int p_argcount);
|
||||
/* TODO */ void get_method_list(List<MethodInfo> *p_list) const override {}
|
||||
bool has_method(const StringName &p_method) const override;
|
||||
Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) override;
|
||||
void call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount) override;
|
||||
void call_multilevel_reversed(const StringName &p_method, const Variant **p_args, int p_argcount) override;
|
||||
|
||||
void mono_object_disposed(MonoObject *p_obj);
|
||||
|
||||
@@ -301,29 +299,29 @@ public:
|
||||
void connect_event_signals();
|
||||
void disconnect_event_signals();
|
||||
|
||||
virtual void refcount_incremented();
|
||||
virtual bool refcount_decremented();
|
||||
void refcount_incremented() override;
|
||||
bool refcount_decremented() override;
|
||||
|
||||
virtual Vector<ScriptNetData> get_rpc_methods() const;
|
||||
virtual uint16_t get_rpc_method_id(const StringName &p_method) const;
|
||||
virtual StringName get_rpc_method(const uint16_t p_rpc_method_id) const;
|
||||
virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const;
|
||||
virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const;
|
||||
Vector<ScriptNetData> get_rpc_methods() const override;
|
||||
uint16_t get_rpc_method_id(const StringName &p_method) const override;
|
||||
StringName get_rpc_method(const uint16_t p_rpc_method_id) const override;
|
||||
MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const override;
|
||||
MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
|
||||
|
||||
virtual Vector<ScriptNetData> get_rset_properties() const;
|
||||
virtual uint16_t get_rset_property_id(const StringName &p_variable) const;
|
||||
virtual StringName get_rset_property(const uint16_t p_variable_id) const;
|
||||
virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_variable_id) const;
|
||||
virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const;
|
||||
Vector<ScriptNetData> get_rset_properties() const override;
|
||||
uint16_t get_rset_property_id(const StringName &p_variable) const override;
|
||||
StringName get_rset_property(const uint16_t p_variable_id) const override;
|
||||
MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_variable_id) const override;
|
||||
MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
|
||||
|
||||
virtual void notification(int p_notification);
|
||||
void notification(int p_notification) override;
|
||||
void _call_notification(int p_notification);
|
||||
|
||||
virtual String to_string(bool *r_valid);
|
||||
String to_string(bool *r_valid) override;
|
||||
|
||||
virtual Ref<Script> get_script() const;
|
||||
Ref<Script> get_script() const override;
|
||||
|
||||
virtual ScriptLanguage *get_language();
|
||||
ScriptLanguage *get_language() override;
|
||||
|
||||
CSharpInstance(const Ref<CSharpScript> &p_script);
|
||||
~CSharpInstance();
|
||||
@@ -437,83 +435,90 @@ public:
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ const Dictionary &get_scripts_metadata() {
|
||||
if (scripts_metadata_invalidated)
|
||||
if (scripts_metadata_invalidated) {
|
||||
_load_scripts_metadata();
|
||||
}
|
||||
return scripts_metadata;
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ ManagedCallableMiddleman *get_managed_callable_middleman() const { return managed_callable_middleman; }
|
||||
|
||||
virtual String get_name() const;
|
||||
String get_name() const override;
|
||||
|
||||
/* LANGUAGE FUNCTIONS */
|
||||
virtual String get_type() const;
|
||||
virtual String get_extension() const;
|
||||
virtual Error execute_file(const String &p_path);
|
||||
virtual void init();
|
||||
virtual void finish();
|
||||
String get_type() const override;
|
||||
String get_extension() const override;
|
||||
Error execute_file(const String &p_path) override;
|
||||
void init() override;
|
||||
void finish() override;
|
||||
|
||||
void finalize();
|
||||
|
||||
/* EDITOR FUNCTIONS */
|
||||
virtual void get_reserved_words(List<String> *p_words) const;
|
||||
virtual void get_comment_delimiters(List<String> *p_delimiters) const;
|
||||
virtual void get_string_delimiters(List<String> *p_delimiters) const;
|
||||
virtual Ref<Script> get_template(const String &p_class_name, const String &p_base_class_name) const;
|
||||
virtual bool is_using_templates();
|
||||
virtual void make_template(const String &p_class_name, const String &p_base_class_name, Ref<Script> &p_script);
|
||||
/* TODO */ virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path, List<String> *r_functions, List<ScriptLanguage::Warning> *r_warnings = nullptr, Set<int> *r_safe_lines = nullptr) const { return true; }
|
||||
virtual String validate_path(const String &p_path) const;
|
||||
virtual Script *create_script() const;
|
||||
virtual bool has_named_classes() const;
|
||||
virtual bool supports_builtin_mode() const;
|
||||
/* TODO? */ virtual int find_function(const String &p_function, const String &p_code) const { return -1; }
|
||||
virtual String make_function(const String &p_class, const String &p_name, const PackedStringArray &p_args) const;
|
||||
void get_reserved_words(List<String> *p_words) const override;
|
||||
void get_comment_delimiters(List<String> *p_delimiters) const override;
|
||||
void get_string_delimiters(List<String> *p_delimiters) const override;
|
||||
Ref<Script> get_template(const String &p_class_name, const String &p_base_class_name) const override;
|
||||
bool is_using_templates() override;
|
||||
void make_template(const String &p_class_name, const String &p_base_class_name, Ref<Script> &p_script) override;
|
||||
/* TODO */ bool validate(const String &p_script, int &r_line_error, int &r_col_error,
|
||||
String &r_test_error, const String &p_path, List<String> *r_functions,
|
||||
List<ScriptLanguage::Warning> *r_warnings = nullptr, Set<int> *r_safe_lines = nullptr) const override {
|
||||
return true;
|
||||
}
|
||||
String validate_path(const String &p_path) const override;
|
||||
Script *create_script() const override;
|
||||
bool has_named_classes() const override;
|
||||
bool supports_builtin_mode() const override;
|
||||
/* TODO? */ int find_function(const String &p_function, const String &p_code) const override { return -1; }
|
||||
String make_function(const String &p_class, const String &p_name, const PackedStringArray &p_args) const override;
|
||||
virtual String _get_indentation() const;
|
||||
/* TODO? */ virtual void auto_indent_code(String &p_code, int p_from_line, int p_to_line) const {}
|
||||
/* TODO */ virtual void add_global_constant(const StringName &p_variable, const Variant &p_value) {}
|
||||
/* TODO? */ void auto_indent_code(String &p_code, int p_from_line, int p_to_line) const override {}
|
||||
/* TODO */ void add_global_constant(const StringName &p_variable, const Variant &p_value) override {}
|
||||
|
||||
/* DEBUGGER FUNCTIONS */
|
||||
virtual String debug_get_error() const;
|
||||
virtual int debug_get_stack_level_count() const;
|
||||
virtual int debug_get_stack_level_line(int p_level) const;
|
||||
virtual String debug_get_stack_level_function(int p_level) const;
|
||||
virtual String debug_get_stack_level_source(int p_level) const;
|
||||
/* TODO */ virtual void debug_get_stack_level_locals(int p_level, List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {}
|
||||
/* TODO */ virtual void debug_get_stack_level_members(int p_level, List<String> *p_members, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {}
|
||||
/* TODO */ virtual void debug_get_globals(List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {}
|
||||
/* TODO */ virtual String debug_parse_stack_level_expression(int p_level, const String &p_expression, int p_max_subitems, int p_max_depth) { return ""; }
|
||||
virtual Vector<StackInfo> debug_get_current_stack_info();
|
||||
String debug_get_error() const override;
|
||||
int debug_get_stack_level_count() const override;
|
||||
int debug_get_stack_level_line(int p_level) const override;
|
||||
String debug_get_stack_level_function(int p_level) const override;
|
||||
String debug_get_stack_level_source(int p_level) const override;
|
||||
/* TODO */ void debug_get_stack_level_locals(int p_level, List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) override {}
|
||||
/* TODO */ void debug_get_stack_level_members(int p_level, List<String> *p_members, List<Variant> *p_values, int p_max_subitems, int p_max_depth) override {}
|
||||
/* TODO */ void debug_get_globals(List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) override {}
|
||||
/* TODO */ String debug_parse_stack_level_expression(int p_level, const String &p_expression, int p_max_subitems, int p_max_depth) override { return ""; }
|
||||
Vector<StackInfo> debug_get_current_stack_info() override;
|
||||
|
||||
/* PROFILING FUNCTIONS */
|
||||
/* TODO */ virtual void profiling_start() {}
|
||||
/* TODO */ virtual void profiling_stop() {}
|
||||
/* TODO */ virtual int profiling_get_accumulated_data(ProfilingInfo *p_info_arr, int p_info_max) { return 0; }
|
||||
/* TODO */ virtual int profiling_get_frame_data(ProfilingInfo *p_info_arr, int p_info_max) { return 0; }
|
||||
/* TODO */ void profiling_start() override {}
|
||||
/* TODO */ void profiling_stop() override {}
|
||||
/* TODO */ int profiling_get_accumulated_data(ProfilingInfo *p_info_arr, int p_info_max) override { return 0; }
|
||||
/* TODO */ int profiling_get_frame_data(ProfilingInfo *p_info_arr, int p_info_max) override { return 0; }
|
||||
|
||||
virtual void frame();
|
||||
void frame() override;
|
||||
|
||||
/* TODO? */ virtual void get_public_functions(List<MethodInfo> *p_functions) const {}
|
||||
/* TODO? */ virtual void get_public_constants(List<Pair<String, Variant>> *p_constants) const {}
|
||||
/* TODO? */ void get_public_functions(List<MethodInfo> *p_functions) const override {}
|
||||
/* TODO? */ void get_public_constants(List<Pair<String, Variant>> *p_constants) const override {}
|
||||
|
||||
virtual void reload_all_scripts();
|
||||
virtual void reload_tool_script(const Ref<Script> &p_script, bool p_soft_reload);
|
||||
void reload_all_scripts() override;
|
||||
void reload_tool_script(const Ref<Script> &p_script, bool p_soft_reload) override;
|
||||
|
||||
/* LOADER FUNCTIONS */
|
||||
virtual void get_recognized_extensions(List<String> *p_extensions) const;
|
||||
void get_recognized_extensions(List<String> *p_extensions) const override;
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
virtual Error open_in_external_editor(const Ref<Script> &p_script, int p_line, int p_col);
|
||||
virtual bool overrides_external_editor();
|
||||
Error open_in_external_editor(const Ref<Script> &p_script, int p_line, int p_col) override;
|
||||
bool overrides_external_editor() override;
|
||||
#endif
|
||||
|
||||
/* THREAD ATTACHING */
|
||||
virtual void thread_enter();
|
||||
virtual void thread_exit();
|
||||
void thread_enter() override;
|
||||
void thread_exit() override;
|
||||
|
||||
// Don't use these. I'm watching you
|
||||
virtual void *alloc_instance_binding_data(Object *p_object);
|
||||
virtual void free_instance_binding_data(void *p_data);
|
||||
virtual void refcount_incremented_instance_binding(Object *p_object);
|
||||
virtual bool refcount_decremented_instance_binding(Object *p_object);
|
||||
void *alloc_instance_binding_data(Object *p_object) override;
|
||||
void free_instance_binding_data(void *p_data) override;
|
||||
void refcount_incremented_instance_binding(Object *p_object) override;
|
||||
bool refcount_decremented_instance_binding(Object *p_object) override;
|
||||
|
||||
Map<Object *, CSharpScriptBinding>::Element *insert_script_binding(Object *p_object, const CSharpScriptBinding &p_script_binding);
|
||||
bool setup_csharp_script_binding(CSharpScriptBinding &r_script_binding, Object *p_object);
|
||||
@@ -531,17 +536,17 @@ public:
|
||||
|
||||
class ResourceFormatLoaderCSharpScript : public ResourceFormatLoader {
|
||||
public:
|
||||
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false);
|
||||
virtual void get_recognized_extensions(List<String> *p_extensions) const;
|
||||
virtual bool handles_type(const String &p_type) const;
|
||||
virtual String get_resource_type(const String &p_path) const;
|
||||
RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false) override;
|
||||
void get_recognized_extensions(List<String> *p_extensions) const override;
|
||||
bool handles_type(const String &p_type) const override;
|
||||
String get_resource_type(const String &p_path) const override;
|
||||
};
|
||||
|
||||
class ResourceFormatSaverCSharpScript : public ResourceFormatSaver {
|
||||
public:
|
||||
virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0);
|
||||
virtual void get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const;
|
||||
virtual bool recognize(const RES &p_resource) const;
|
||||
Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0) override;
|
||||
void get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const override;
|
||||
bool recognize(const RES &p_resource) const override;
|
||||
};
|
||||
|
||||
#endif // CSHARP_SCRIPT_H
|
||||
|
||||
Reference in New Issue
Block a user