Add override keywords.

This commit is contained in:
Marcel Admiraal
2020-07-10 11:34:39 +01:00
parent 6e6fe53c1d
commit 894bc9aa5a
8 changed files with 536 additions and 540 deletions

View File

@@ -249,7 +249,7 @@ private:
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
Set<PlaceHolderScriptInstance *> placeholders; Set<PlaceHolderScriptInstance *> placeholders;
//void _update_placeholder(PlaceHolderScriptInstance *p_placeholder); //void _update_placeholder(PlaceHolderScriptInstance *p_placeholder);
virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder); virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder) override;
void _update_placeholders(); void _update_placeholders();
#endif #endif
@@ -264,7 +264,7 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
bool inherits_script(const Ref<Script> &p_script) const; bool inherits_script(const Ref<Script> &p_script) const override;
// TODO: Remove it in future when breaking changes are acceptable // TODO: Remove it in future when breaking changes are acceptable
StringName get_default_func() const; StringName get_default_func() const;
@@ -330,47 +330,47 @@ public:
void set_instance_base_type(const StringName &p_type); void set_instance_base_type(const StringName &p_type);
virtual bool can_instance() const; virtual bool can_instance() const override;
virtual Ref<Script> get_base_script() const; virtual Ref<Script> get_base_script() const override;
virtual StringName get_instance_base_type() const; virtual StringName get_instance_base_type() const override;
virtual ScriptInstance *instance_create(Object *p_this); virtual ScriptInstance *instance_create(Object *p_this) override;
virtual bool instance_has(const Object *p_this) const; virtual bool instance_has(const Object *p_this) const override;
virtual bool has_source_code() const; virtual bool has_source_code() const override;
virtual String get_source_code() const; virtual String get_source_code() const override;
virtual void set_source_code(const String &p_code); virtual void set_source_code(const String &p_code) override;
virtual Error reload(bool p_keep_state = false); virtual Error reload(bool p_keep_state = false) override;
virtual bool is_tool() const; virtual bool is_tool() const override;
virtual bool is_valid() const; virtual bool is_valid() const override;
virtual ScriptLanguage *get_language() const; virtual ScriptLanguage *get_language() const override;
virtual bool has_script_signal(const StringName &p_signal) const; virtual bool has_script_signal(const StringName &p_signal) const override;
virtual void get_script_signal_list(List<MethodInfo> *r_signals) const; virtual 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 bool get_property_default_value(const StringName &p_property, Variant &r_value) const override;
virtual void get_script_method_list(List<MethodInfo> *p_list) const; virtual void get_script_method_list(List<MethodInfo> *p_list) const override;
virtual bool has_method(const StringName &p_method) const; virtual bool has_method(const StringName &p_method) const override;
virtual MethodInfo get_method_info(const StringName &p_method) const; virtual MethodInfo get_method_info(const StringName &p_method) const override;
virtual void get_script_property_list(List<PropertyInfo> *p_list) const; virtual void get_script_property_list(List<PropertyInfo> *p_list) const override;
virtual int get_member_line(const StringName &p_member) const; virtual int get_member_line(const StringName &p_member) const override;
virtual Vector<ScriptNetData> get_rpc_methods() const; virtual Vector<ScriptNetData> get_rpc_methods() const override;
virtual uint16_t get_rpc_method_id(const StringName &p_method) const; virtual uint16_t get_rpc_method_id(const StringName &p_method) const override;
virtual StringName get_rpc_method(const uint16_t p_rpc_method_id) const; virtual StringName get_rpc_method(const uint16_t p_rpc_method_id) const override;
virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const; virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const override;
virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const; virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
virtual Vector<ScriptNetData> get_rset_properties() const; virtual Vector<ScriptNetData> get_rset_properties() const override;
virtual uint16_t get_rset_property_id(const StringName &p_property) const; virtual uint16_t get_rset_property_id(const StringName &p_property) const override;
virtual StringName get_rset_property(const uint16_t p_rset_property_id) const; virtual StringName get_rset_property(const uint16_t p_rset_property_id) const override;
virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_rpc_method_id) const; virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_rpc_method_id) const override;
virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const; virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
virtual bool are_subnodes_edited() const; virtual bool are_subnodes_edited() const;

View File

@@ -122,25 +122,25 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
//virtual String get_text() const; //virtual String get_text() const;
virtual String get_category() const { return "functions"; } virtual String get_category() const override { return "functions"; }
void set_func(BuiltinFunc p_which); void set_func(BuiltinFunc p_which);
BuiltinFunc get_func(); BuiltinFunc get_func();
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
VisualScriptBuiltinFunc(VisualScriptBuiltinFunc::BuiltinFunc func); VisualScriptBuiltinFunc(VisualScriptBuiltinFunc::BuiltinFunc func);
VisualScriptBuiltinFunc(); VisualScriptBuiltinFunc();

View File

@@ -288,39 +288,39 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
virtual void add_syntax_highlighter(SyntaxHighlighter *p_highlighter); virtual void add_syntax_highlighter(SyntaxHighlighter *p_highlighter) override;
virtual void set_syntax_highlighter(SyntaxHighlighter *p_highlighter); virtual void set_syntax_highlighter(SyntaxHighlighter *p_highlighter) override;
virtual void apply_code(); virtual void apply_code() override;
virtual RES get_edited_resource() const; virtual RES get_edited_resource() const override;
virtual void set_edited_resource(const RES &p_res); virtual void set_edited_resource(const RES &p_res) override;
virtual Vector<String> get_functions(); virtual Vector<String> get_functions() override;
virtual void reload_text(); virtual void reload_text() override;
virtual String get_name(); virtual String get_name() override;
virtual Ref<Texture2D> get_theme_icon(); virtual Ref<Texture2D> get_theme_icon() override;
virtual bool is_unsaved(); virtual bool is_unsaved() override;
virtual Variant get_edit_state(); virtual Variant get_edit_state() override;
virtual void set_edit_state(const Variant &p_state); virtual void set_edit_state(const Variant &p_state) override;
virtual void goto_line(int p_line, bool p_with_error = false); virtual void goto_line(int p_line, bool p_with_error = false) override;
virtual void set_executing_line(int p_line); virtual void set_executing_line(int p_line) override;
virtual void clear_executing_line(); virtual void clear_executing_line() override;
virtual void trim_trailing_whitespace(); virtual void trim_trailing_whitespace() override;
virtual void insert_final_newline(); virtual void insert_final_newline() override;
virtual void convert_indent_to_spaces(); virtual void convert_indent_to_spaces() override;
virtual void convert_indent_to_tabs(); virtual void convert_indent_to_tabs() override;
virtual void ensure_focus(); virtual void ensure_focus() override;
virtual void tag_saved_version(); virtual void tag_saved_version() override;
virtual void reload(bool p_soft); virtual void reload(bool p_soft) override;
virtual void get_breakpoints(List<int> *p_breakpoints); virtual void get_breakpoints(List<int> *p_breakpoints) override;
virtual void add_callback(const String &p_function, PackedStringArray p_args); virtual void add_callback(const String &p_function, PackedStringArray p_args) override;
virtual void update_settings(); virtual void update_settings() override;
virtual bool show_members_overview(); virtual bool show_members_overview() override;
virtual void set_debugger_active(bool p_active); virtual void set_debugger_active(bool p_active) override;
virtual void set_tooltip_request_func(String p_method, Object *p_obj); virtual void set_tooltip_request_func(String p_method, Object *p_obj) override;
virtual Control *get_edit_menu(); virtual Control *get_edit_menu() override;
virtual void clear_edit_menu(); virtual void clear_edit_menu() override;
virtual bool can_lose_focus_on_node_selection() { return false; } virtual bool can_lose_focus_on_node_selection() override { return false; }
virtual void validate(); virtual void validate() override;
static void register_editor(); static void register_editor();

View File

@@ -259,22 +259,22 @@ protected:
void _get_property_list(List<PropertyInfo> *p_list) const; void _get_property_list(List<PropertyInfo> *p_list) const;
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
virtual String get_text() const; virtual String get_text() const override;
virtual String get_category() const { return "operators"; } virtual String get_category() const override { return "operators"; }
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
VisualScriptExpression(); VisualScriptExpression();
~VisualScriptExpression(); ~VisualScriptExpression();

View File

@@ -43,20 +43,20 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
virtual String get_text() const; virtual String get_text() const override;
virtual String get_category() const { return "flow_control"; } virtual String get_category() const override { return "flow_control"; }
void set_return_type(Variant::Type); void set_return_type(Variant::Type);
Variant::Type get_return_type() const; Variant::Type get_return_type() const;
@@ -64,7 +64,7 @@ public:
void set_enable_return_value(bool p_enable); void set_enable_return_value(bool p_enable);
bool is_return_value_enabled() const; bool is_return_value_enabled() const;
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
VisualScriptReturn(); VisualScriptReturn();
}; };
@@ -76,22 +76,22 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
virtual String get_text() const; virtual String get_text() const override;
virtual String get_category() const { return "flow_control"; } virtual String get_category() const override { return "flow_control"; }
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
VisualScriptCondition(); VisualScriptCondition();
}; };
@@ -103,22 +103,22 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
virtual String get_text() const; virtual String get_text() const override;
virtual String get_category() const { return "flow_control"; } virtual String get_category() const override { return "flow_control"; }
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
VisualScriptWhile(); VisualScriptWhile();
}; };
@@ -130,22 +130,22 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
virtual String get_text() const; virtual String get_text() const override;
virtual String get_category() const { return "flow_control"; } virtual String get_category() const override { return "flow_control"; }
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
VisualScriptIterator(); VisualScriptIterator();
}; };
@@ -159,25 +159,25 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
virtual String get_text() const; virtual String get_text() const override;
virtual String get_category() const { return "flow_control"; } virtual String get_category() const override { return "flow_control"; }
void set_steps(int p_steps); void set_steps(int p_steps);
int get_steps() const; int get_steps() const;
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
VisualScriptSequence(); VisualScriptSequence();
}; };
@@ -202,23 +202,23 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual bool has_mixed_input_and_sequence_ports() const { return true; } virtual bool has_mixed_input_and_sequence_ports() const override { return true; }
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
virtual String get_text() const; virtual String get_text() const override;
virtual String get_category() const { return "flow_control"; } virtual String get_category() const override { return "flow_control"; }
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
VisualScriptSwitch(); VisualScriptSwitch();
}; };
@@ -233,20 +233,20 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
virtual String get_text() const; virtual String get_text() const override;
virtual String get_category() const { return "flow_control"; } virtual String get_category() const override { return "flow_control"; }
void set_base_type(const StringName &p_type); void set_base_type(const StringName &p_type);
StringName get_base_type() const; StringName get_base_type() const;
@@ -254,9 +254,9 @@ public:
void set_base_script(const String &p_path); void set_base_script(const String &p_path);
String get_base_script() const; String get_base_script() const;
virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const; virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
VisualScriptTypeCast(); VisualScriptTypeCast();
}; };

View File

@@ -75,25 +75,25 @@ private:
Dictionary _get_argument_cache() const; Dictionary _get_argument_cache() const;
protected: protected:
virtual void _validate_property(PropertyInfo &property) const; virtual void _validate_property(PropertyInfo &property) const override;
static void _bind_methods(); static void _bind_methods();
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
virtual String get_text() const; virtual String get_text() const override;
virtual String get_category() const { return "functions"; } virtual String get_category() const override { return "functions"; }
void set_basic_type(Variant::Type p_type); void set_basic_type(Variant::Type p_type);
Variant::Type get_basic_type() const; Variant::Type get_basic_type() const;
@@ -125,9 +125,9 @@ public:
void set_rpc_call_mode(RPCCallMode p_mode); void set_rpc_call_mode(RPCCallMode p_mode);
RPCCallMode get_rpc_call_mode() const; RPCCallMode get_rpc_call_mode() const;
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const; virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
VisualScriptFunctionCall(); VisualScriptFunctionCall();
}; };
@@ -187,25 +187,25 @@ private:
void _adjust_input_index(PropertyInfo &pinfo) const; void _adjust_input_index(PropertyInfo &pinfo) const;
protected: protected:
virtual void _validate_property(PropertyInfo &property) const; virtual void _validate_property(PropertyInfo &property) const override;
static void _bind_methods(); static void _bind_methods();
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
virtual String get_text() const; virtual String get_text() const override;
virtual String get_category() const { return "functions"; } virtual String get_category() const override { return "functions"; }
void set_base_type(const StringName &p_type); void set_base_type(const StringName &p_type);
StringName get_base_type() const; StringName get_base_type() const;
@@ -231,8 +231,8 @@ public:
void set_assign_op(AssignOp p_op); void set_assign_op(AssignOp p_op);
AssignOp get_assign_op() const; AssignOp get_assign_op() const;
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const; virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
VisualScriptPropertySet(); VisualScriptPropertySet();
}; };
@@ -273,25 +273,25 @@ private:
Variant::Type _get_type_cache() const; Variant::Type _get_type_cache() const;
protected: protected:
virtual void _validate_property(PropertyInfo &property) const; virtual void _validate_property(PropertyInfo &property) const override;
static void _bind_methods(); static void _bind_methods();
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
virtual String get_text() const; virtual String get_text() const override;
virtual String get_category() const { return "functions"; } virtual String get_category() const override { return "functions"; }
void set_base_type(const StringName &p_type); void set_base_type(const StringName &p_type);
StringName get_base_type() const; StringName get_base_type() const;
@@ -314,7 +314,7 @@ public:
void set_index(const StringName &p_type); void set_index(const StringName &p_type);
StringName get_index() const; StringName get_index() const;
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
VisualScriptPropertyGet(); VisualScriptPropertyGet();
}; };
@@ -328,30 +328,30 @@ private:
StringName name; StringName name;
protected: protected:
virtual void _validate_property(PropertyInfo &property) const; virtual void _validate_property(PropertyInfo &property) const override;
static void _bind_methods(); static void _bind_methods();
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
//virtual String get_text() const; //virtual String get_text() const;
virtual String get_category() const { return "functions"; } virtual String get_category() const override { return "functions"; }
void set_signal(const StringName &p_type); void set_signal(const StringName &p_type);
StringName get_signal() const; StringName get_signal() const;
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
VisualScriptEmitSignal(); VisualScriptEmitSignal();
}; };

File diff suppressed because it is too large Load Diff

View File

@@ -50,25 +50,25 @@ private:
float wait_time; float wait_time;
protected: protected:
virtual void _validate_property(PropertyInfo &property) const; virtual void _validate_property(PropertyInfo &property) const override;
static void _bind_methods(); static void _bind_methods();
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
virtual String get_text() const; virtual String get_text() const override;
virtual String get_category() const { return "functions"; } virtual String get_category() const override { return "functions"; }
void set_yield_mode(YieldMode p_mode); void set_yield_mode(YieldMode p_mode);
YieldMode get_yield_mode(); YieldMode get_yield_mode();
@@ -76,7 +76,7 @@ public:
void set_wait_time(float p_time); void set_wait_time(float p_time);
float get_wait_time(); float get_wait_time();
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
VisualScriptYield(); VisualScriptYield();
}; };
@@ -103,25 +103,25 @@ private:
StringName _get_base_type() const; StringName _get_base_type() const;
protected: protected:
virtual void _validate_property(PropertyInfo &property) const; virtual void _validate_property(PropertyInfo &property) const override;
static void _bind_methods(); static void _bind_methods();
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const override;
virtual bool has_input_sequence_port() const; virtual bool has_input_sequence_port() const override;
virtual String get_output_sequence_port_text(int p_port) const; virtual String get_output_sequence_port_text(int p_port) const override;
virtual int get_input_value_port_count() const; virtual int get_input_value_port_count() const override;
virtual int get_output_value_port_count() const; virtual int get_output_value_port_count() const override;
virtual PropertyInfo get_input_value_port_info(int p_idx) const; virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
virtual PropertyInfo get_output_value_port_info(int p_idx) const; virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
virtual String get_caption() const; virtual String get_caption() const override;
virtual String get_text() const; virtual String get_text() const override;
virtual String get_category() const { return "functions"; } virtual String get_category() const override { return "functions"; }
void set_base_type(const StringName &p_type); void set_base_type(const StringName &p_type);
StringName get_base_type() const; StringName get_base_type() const;
@@ -135,7 +135,7 @@ public:
void set_call_mode(CallMode p_mode); void set_call_mode(CallMode p_mode);
CallMode get_call_mode() const; CallMode get_call_mode() const;
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance); virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
VisualScriptYieldSignal(); VisualScriptYieldSignal();
}; };