Browse Source

Add override keywords.

Marcel Admiraal 5 years ago
parent
commit
26fcf2b04c
100 changed files with 1037 additions and 1033 deletions
  1. 1 1
      core/compressed_translation.h
  2. 1 1
      core/image.h
  3. 1 1
      core/input/input.h
  4. 38 38
      core/input/input_event.h
  5. 4 4
      core/io/packet_peer.h
  6. 4 4
      core/io/packet_peer_udp.h
  7. 5 5
      core/io/stream_peer.h
  8. 5 5
      core/io/stream_peer_tcp.h
  9. 140 140
      core/object.h
  10. 2 2
      core/packed_data_container.h
  11. 6 2
      core/resource.h
  12. 1 1
      core/script_language.h
  13. 2 2
      drivers/unix/ip_unix.h
  14. 2 2
      editor/animation_bezier_editor.h
  15. 7 7
      editor/animation_track_editor.h
  16. 39 39
      editor/animation_track_editor_plugins.h
  17. 1 1
      editor/code_editor.h
  18. 1 1
      editor/connections_dialog.h
  19. 1 1
      editor/create_dialog.h
  20. 1 1
      editor/debugger/script_editor_debugger.h
  21. 4 4
      editor/dependency_editor.h
  22. 1 1
      editor/editor_asset_installer.h
  23. 11 11
      editor/editor_audio_buses.h
  24. 1 1
      editor/editor_dir_dialog.h
  25. 11 11
      editor/editor_export.h
  26. 1 1
      editor/editor_file_dialog.h
  27. 7 7
      editor/editor_inspector.h
  28. 2 2
      editor/editor_layouts_dialog.h
  29. 2 2
      editor/editor_properties.cpp
  30. 37 37
      editor/editor_properties.h
  31. 2 2
      editor/editor_properties_array_dict.h
  32. 2 2
      editor/editor_spin_slider.h
  33. 1 1
      editor/editor_sub_scene.h
  34. 1 1
      editor/export_template_manager.h
  35. 1 1
      editor/find_in_files.h
  36. 4 4
      editor/import/editor_import_collada.h
  37. 12 12
      editor/import/editor_import_plugin.h
  38. 4 4
      editor/import/editor_scene_importer_gltf.h
  39. 12 12
      editor/import/resource_importer_bitmask.h
  40. 10 10
      editor/import/resource_importer_csv.h
  41. 10 10
      editor/import/resource_importer_csv_translation.h
  42. 10 10
      editor/import/resource_importer_image.h
  43. 12 12
      editor/import/resource_importer_layered_texture.h
  44. 14 14
      editor/import/resource_importer_obj.h
  45. 15 15
      editor/import/resource_importer_scene.h
  46. 10 10
      editor/import/resource_importer_shader_file.h
  47. 12 12
      editor/import/resource_importer_texture.h
  48. 12 12
      editor/import/resource_importer_texture_atlas.h
  49. 10 10
      editor/import/resource_importer_wav.h
  50. 149 149
      editor/node_3d_editor_gizmos.h
  51. 8 8
      editor/plugins/abstract_polygon_2d_editor.h
  52. 2 2
      editor/plugins/animation_blend_space_1d_editor.h
  53. 2 2
      editor/plugins/animation_blend_space_2d_editor.h
  54. 3 3
      editor/plugins/animation_blend_tree_editor_plugin.h
  55. 8 8
      editor/plugins/animation_player_editor_plugin.h
  56. 2 2
      editor/plugins/animation_state_machine_editor.h
  57. 5 5
      editor/plugins/animation_tree_editor_plugin.h
  58. 5 5
      editor/plugins/asset_library_editor_plugin.h
  59. 6 6
      editor/plugins/audio_stream_editor_plugin.h
  60. 5 5
      editor/plugins/baked_lightmap_editor_plugin.h
  61. 5 5
      editor/plugins/camera_3d_editor_plugin.h
  62. 9 9
      editor/plugins/canvas_item_editor_plugin.h
  63. 2 2
      editor/plugins/collision_polygon_2d_editor_plugin.h
  64. 6 6
      editor/plugins/collision_polygon_3d_editor_plugin.h
  65. 8 8
      editor/plugins/collision_shape_2d_editor_plugin.h
  66. 5 5
      editor/plugins/cpu_particles_2d_editor_plugin.h
  67. 6 6
      editor/plugins/cpu_particles_3d_editor_plugin.h
  68. 6 6
      editor/plugins/curve_editor_plugin.h
  69. 2 2
      editor/plugins/debugger_editor_plugin.h
  70. 17 17
      editor/plugins/editor_preview_plugins.h
  71. 5 5
      editor/plugins/gi_probe_editor_plugin.h
  72. 5 5
      editor/plugins/gpu_particles_2d_editor_plugin.h
  73. 6 6
      editor/plugins/gpu_particles_3d_editor_plugin.h
  74. 4 4
      editor/plugins/gradient_editor_plugin.h
  75. 53 53
      editor/plugins/item_list_editor_plugin.h
  76. 9 9
      editor/plugins/light_occluder_2d_editor_plugin.h
  77. 6 6
      editor/plugins/line_2d_editor_plugin.h
  78. 21 21
      editor/plugins/material_editor_plugin.h
  79. 3 3
      editor/plugins/mesh_editor_plugin.h
  80. 5 5
      editor/plugins/mesh_instance_3d_editor_plugin.h
  81. 5 5
      editor/plugins/mesh_library_editor_plugin.h
  82. 5 5
      editor/plugins/multimesh_editor_plugin.h
  83. 10 10
      editor/plugins/navigation_polygon_editor_plugin.h
  84. 14 14
      editor/plugins/node_3d_editor_plugin.h
  85. 2 2
      editor/plugins/packed_scene_translation_parser_plugin.h
  86. 8 8
      editor/plugins/path_2d_editor_plugin.h
  87. 14 14
      editor/plugins/path_3d_editor_plugin.h
  88. 4 4
      editor/plugins/physical_bone_3d_editor_plugin.h
  89. 7 7
      editor/plugins/polygon_2d_editor_plugin.h
  90. 5 5
      editor/plugins/resource_preloader_editor_plugin.h
  91. 5 5
      editor/plugins/root_motion_editor_plugin.h
  92. 14 14
      editor/plugins/script_editor_plugin.h
  93. 33 33
      editor/plugins/script_text_editor.h
  94. 12 12
      editor/plugins/shader_editor_plugin.h
  95. 5 5
      editor/plugins/shader_file_editor_plugin.h
  96. 5 5
      editor/plugins/skeleton_2d_editor_plugin.h
  97. 3 3
      editor/plugins/skeleton_3d_editor_plugin.h
  98. 5 5
      editor/plugins/skeleton_ik_3d_editor_plugin.h
  99. 5 5
      editor/plugins/sprite_2d_editor_plugin.h
  100. 5 5
      editor/plugins/sprite_frames_editor_plugin.h

+ 1 - 1
core/compressed_translation.h

@@ -79,7 +79,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual StringName get_message(const StringName &p_src_text) const; //overridable for other implementations
+	virtual StringName get_message(const StringName &p_src_text) const override; //overridable for other implementations
 	void generate(const Ref<Translation> &p_from);
 	void generate(const Ref<Translation> &p_from);
 
 
 	PHashTranslation() {}
 	PHashTranslation() {}

+ 1 - 1
core/image.h

@@ -369,7 +369,7 @@ public:
 	Image(const uint8_t *p_mem_png_jpg, int p_len = -1);
 	Image(const uint8_t *p_mem_png_jpg, int p_len = -1);
 	Image(const char **p_xpm);
 	Image(const char **p_xpm);
 
 
-	virtual Ref<Resource> duplicate(bool p_subresources = false) const;
+	virtual Ref<Resource> duplicate(bool p_subresources = false) const override;
 
 
 	UsedChannels detect_used_channels(CompressSource p_source = COMPRESS_SOURCE_GENERIC);
 	UsedChannels detect_used_channels(CompressSource p_source = COMPRESS_SOURCE_GENERIC);
 	void optimize_channels();
 	void optimize_channels();

+ 1 - 1
core/input/input.h

@@ -255,7 +255,7 @@ protected:
 public:
 public:
 	void set_mouse_mode(MouseMode p_mode);
 	void set_mouse_mode(MouseMode p_mode);
 	MouseMode get_mouse_mode() const;
 	MouseMode get_mouse_mode() const;
-	void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const;
+	void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override;
 
 
 	static Input *get_singleton();
 	static Input *get_singleton();
 
 

+ 38 - 38
core/input/input_event.h

@@ -266,7 +266,7 @@ protected:
 
 
 public:
 public:
 	void set_pressed(bool p_pressed);
 	void set_pressed(bool p_pressed);
-	virtual bool is_pressed() const;
+	virtual bool is_pressed() const override;
 
 
 	void set_keycode(uint32_t p_keycode);
 	void set_keycode(uint32_t p_keycode);
 	uint32_t get_keycode() const;
 	uint32_t get_keycode() const;
@@ -278,17 +278,17 @@ public:
 	uint32_t get_unicode() const;
 	uint32_t get_unicode() const;
 
 
 	void set_echo(bool p_enable);
 	void set_echo(bool p_enable);
-	virtual bool is_echo() const;
+	virtual bool is_echo() const override;
 
 
 	uint32_t get_keycode_with_modifiers() const;
 	uint32_t get_keycode_with_modifiers() const;
 	uint32_t get_physical_keycode_with_modifiers() const;
 	uint32_t get_physical_keycode_with_modifiers() const;
 
 
-	virtual bool action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const;
-	virtual bool shortcut_match(const Ref<InputEvent> &p_event) const;
+	virtual bool action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const override;
+	virtual bool shortcut_match(const Ref<InputEvent> &p_event) const override;
 
 
-	virtual bool is_action_type() const { return true; }
+	virtual bool is_action_type() const override { return true; }
 
 
-	virtual String as_text() const;
+	virtual String as_text() const override;
 
 
 	InputEventKey() {}
 	InputEventKey() {}
 };
 };
@@ -336,16 +336,16 @@ public:
 	int get_button_index() const;
 	int get_button_index() const;
 
 
 	void set_pressed(bool p_pressed);
 	void set_pressed(bool p_pressed);
-	virtual bool is_pressed() const;
+	virtual bool is_pressed() const override;
 
 
 	void set_doubleclick(bool p_doubleclick);
 	void set_doubleclick(bool p_doubleclick);
 	bool is_doubleclick() const;
 	bool is_doubleclick() const;
 
 
-	virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const;
-	virtual bool action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const;
+	virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const override;
+	virtual bool action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const override;
 
 
-	virtual bool is_action_type() const { return true; }
-	virtual String as_text() const;
+	virtual bool is_action_type() const override { return true; }
+	virtual String as_text() const override;
 
 
 	InputEventMouseButton() {}
 	InputEventMouseButton() {}
 };
 };
@@ -374,10 +374,10 @@ public:
 	void set_speed(const Vector2 &p_speed);
 	void set_speed(const Vector2 &p_speed);
 	Vector2 get_speed() const;
 	Vector2 get_speed() const;
 
 
-	virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const;
-	virtual String as_text() const;
+	virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const override;
+	virtual String as_text() const override;
 
 
-	virtual bool accumulate(const Ref<InputEvent> &p_event);
+	virtual bool accumulate(const Ref<InputEvent> &p_event) override;
 
 
 	InputEventMouseMotion() {}
 	InputEventMouseMotion() {}
 };
 };
@@ -397,12 +397,12 @@ public:
 	void set_axis_value(float p_value);
 	void set_axis_value(float p_value);
 	float get_axis_value() const;
 	float get_axis_value() const;
 
 
-	virtual bool is_pressed() const;
+	virtual bool is_pressed() const override;
 
 
-	virtual bool action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const;
+	virtual bool action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const override;
 
 
-	virtual bool is_action_type() const { return true; }
-	virtual String as_text() const;
+	virtual bool is_action_type() const override { return true; }
+	virtual String as_text() const override;
 
 
 	InputEventJoypadMotion() {}
 	InputEventJoypadMotion() {}
 };
 };
@@ -421,16 +421,16 @@ public:
 	int get_button_index() const;
 	int get_button_index() const;
 
 
 	void set_pressed(bool p_pressed);
 	void set_pressed(bool p_pressed);
-	virtual bool is_pressed() const;
+	virtual bool is_pressed() const override;
 
 
 	void set_pressure(float p_pressure);
 	void set_pressure(float p_pressure);
 	float get_pressure() const;
 	float get_pressure() const;
 
 
-	virtual bool action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const;
-	virtual bool shortcut_match(const Ref<InputEvent> &p_event) const;
+	virtual bool action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const override;
+	virtual bool shortcut_match(const Ref<InputEvent> &p_event) const override;
 
 
-	virtual bool is_action_type() const { return true; }
-	virtual String as_text() const;
+	virtual bool is_action_type() const override { return true; }
+	virtual String as_text() const override;
 
 
 	InputEventJoypadButton() {}
 	InputEventJoypadButton() {}
 };
 };
@@ -452,10 +452,10 @@ public:
 	Vector2 get_position() const;
 	Vector2 get_position() const;
 
 
 	void set_pressed(bool p_pressed);
 	void set_pressed(bool p_pressed);
-	virtual bool is_pressed() const;
+	virtual bool is_pressed() const override;
 
 
-	virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const;
-	virtual String as_text() const;
+	virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const override;
+	virtual String as_text() const override;
 
 
 	InputEventScreenTouch() {}
 	InputEventScreenTouch() {}
 };
 };
@@ -483,8 +483,8 @@ public:
 	void set_speed(const Vector2 &p_speed);
 	void set_speed(const Vector2 &p_speed);
 	Vector2 get_speed() const;
 	Vector2 get_speed() const;
 
 
-	virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const;
-	virtual String as_text() const;
+	virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const override;
+	virtual String as_text() const override;
 
 
 	InputEventScreenDrag() {}
 	InputEventScreenDrag() {}
 };
 };
@@ -504,18 +504,18 @@ public:
 	StringName get_action() const;
 	StringName get_action() const;
 
 
 	void set_pressed(bool p_pressed);
 	void set_pressed(bool p_pressed);
-	virtual bool is_pressed() const;
+	virtual bool is_pressed() const override;
 
 
 	void set_strength(float p_strength);
 	void set_strength(float p_strength);
 	float get_strength() const;
 	float get_strength() const;
 
 
 	virtual bool is_action(const StringName &p_action) const;
 	virtual bool is_action(const StringName &p_action) const;
 
 
-	virtual bool action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const;
+	virtual bool action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const override;
 
 
-	virtual bool shortcut_match(const Ref<InputEvent> &p_event) const;
-	virtual bool is_action_type() const { return true; }
-	virtual String as_text() const;
+	virtual bool shortcut_match(const Ref<InputEvent> &p_event) const override;
+	virtual bool is_action_type() const override { return true; }
+	virtual String as_text() const override;
 
 
 	InputEventAction() {}
 	InputEventAction() {}
 };
 };
@@ -544,8 +544,8 @@ public:
 	void set_factor(real_t p_factor);
 	void set_factor(real_t p_factor);
 	real_t get_factor() const;
 	real_t get_factor() const;
 
 
-	virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const;
-	virtual String as_text() const;
+	virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const override;
+	virtual String as_text() const override;
 
 
 	InputEventMagnifyGesture() {}
 	InputEventMagnifyGesture() {}
 };
 };
@@ -561,8 +561,8 @@ public:
 	void set_delta(const Vector2 &p_delta);
 	void set_delta(const Vector2 &p_delta);
 	Vector2 get_delta() const;
 	Vector2 get_delta() const;
 
 
-	virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const;
-	virtual String as_text() const;
+	virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const override;
+	virtual String as_text() const override;
 
 
 	InputEventPanGesture() {}
 	InputEventPanGesture() {}
 };
 };
@@ -607,7 +607,7 @@ public:
 	void set_controller_value(const int p_controller_value);
 	void set_controller_value(const int p_controller_value);
 	int get_controller_value() const;
 	int get_controller_value() const;
 
 
-	virtual String as_text() const;
+	virtual String as_text() const override;
 
 
 	InputEventMIDI() {}
 	InputEventMIDI() {}
 };
 };

+ 4 - 4
core/io/packet_peer.h

@@ -90,11 +90,11 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual int get_available_packet_count() const;
-	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size);
-	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
+	virtual int get_available_packet_count() const override;
+	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) override;
+	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) override;
 
 
-	virtual int get_max_packet_size() const;
+	virtual int get_max_packet_size() const override;
 
 
 	void set_stream_peer(const Ref<StreamPeer> &p_peer);
 	void set_stream_peer(const Ref<StreamPeer> &p_peer);
 	Ref<StreamPeer> get_stream_peer() const;
 	Ref<StreamPeer> get_stream_peer() const;

+ 4 - 4
core/io/packet_peer_udp.h

@@ -80,10 +80,10 @@ public:
 	int get_packet_port() const;
 	int get_packet_port() const;
 	void set_dest_address(const IP_Address &p_address, int p_port);
 	void set_dest_address(const IP_Address &p_address, int p_port);
 
 
-	Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
-	Error get_packet(const uint8_t **r_buffer, int &r_buffer_size);
-	int get_available_packet_count() const;
-	int get_max_packet_size() const;
+	Error put_packet(const uint8_t *p_buffer, int p_buffer_size) override;
+	Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) override;
+	int get_available_packet_count() const override;
+	int get_max_packet_size() const override;
 	void set_broadcast_enabled(bool p_enabled);
 	void set_broadcast_enabled(bool p_enabled);
 	Error join_multicast_group(IP_Address p_multi_address, String p_if_name);
 	Error join_multicast_group(IP_Address p_multi_address, String p_if_name);
 	Error leave_multicast_group(IP_Address p_multi_address, String p_if_name);
 	Error leave_multicast_group(IP_Address p_multi_address, String p_if_name);

+ 5 - 5
core/io/stream_peer.h

@@ -102,13 +102,13 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	Error put_data(const uint8_t *p_data, int p_bytes);
-	Error put_partial_data(const uint8_t *p_data, int p_bytes, int &r_sent);
+	Error put_data(const uint8_t *p_data, int p_bytes) override;
+	Error put_partial_data(const uint8_t *p_data, int p_bytes, int &r_sent) override;
 
 
-	Error get_data(uint8_t *p_buffer, int p_bytes);
-	Error get_partial_data(uint8_t *p_buffer, int p_bytes, int &r_received);
+	Error get_data(uint8_t *p_buffer, int p_bytes) override;
+	Error get_partial_data(uint8_t *p_buffer, int p_bytes, int &r_received) override;
 
 
-	virtual int get_available_bytes() const;
+	virtual int get_available_bytes() const override;
 
 
 	void seek(int p_pos);
 	void seek(int p_pos);
 	int get_size() const;
 	int get_size() const;

+ 5 - 5
core/io/stream_peer_tcp.h

@@ -72,7 +72,7 @@ public:
 	uint16_t get_connected_port() const;
 	uint16_t get_connected_port() const;
 	void disconnect_from_host();
 	void disconnect_from_host();
 
 
-	int get_available_bytes() const;
+	int get_available_bytes() const override;
 	Status get_status();
 	Status get_status();
 
 
 	void set_no_delay(bool p_enabled);
 	void set_no_delay(bool p_enabled);
@@ -81,10 +81,10 @@ public:
 	Error poll(NetSocket::PollType p_type, int timeout = 0);
 	Error poll(NetSocket::PollType p_type, int timeout = 0);
 
 
 	// Read/Write from StreamPeer
 	// Read/Write from StreamPeer
-	Error put_data(const uint8_t *p_data, int p_bytes);
-	Error put_partial_data(const uint8_t *p_data, int p_bytes, int &r_sent);
-	Error get_data(uint8_t *p_buffer, int p_bytes);
-	Error get_partial_data(uint8_t *p_buffer, int p_bytes, int &r_received);
+	Error put_data(const uint8_t *p_data, int p_bytes) override;
+	Error put_partial_data(const uint8_t *p_data, int p_bytes, int &r_sent) override;
+	Error get_data(uint8_t *p_buffer, int p_bytes) override;
+	Error get_partial_data(uint8_t *p_buffer, int p_bytes, int &r_received) override;
 
 
 	StreamPeerTCP();
 	StreamPeerTCP();
 	~StreamPeerTCP();
 	~StreamPeerTCP();

+ 140 - 140
core/object.h

@@ -250,142 +250,142 @@ public:                                                             \
                                                                     \
                                                                     \
 private:
 private:
 
 
-#define GDCLASS(m_class, m_inherits)                                                                                                    \
-private:                                                                                                                                \
-	void operator=(const m_class &p_rval) {}                                                                                            \
-	mutable StringName _class_name;                                                                                                     \
-	friend class ClassDB;                                                                                                               \
-                                                                                                                                        \
-public:                                                                                                                                 \
-	virtual String get_class() const {                                                                                                  \
-		return String(#m_class);                                                                                                        \
-	}                                                                                                                                   \
-	virtual const StringName *_get_class_namev() const {                                                                                \
-		if (!_class_name) {                                                                                                             \
-			_class_name = get_class_static();                                                                                           \
-		}                                                                                                                               \
-		return &_class_name;                                                                                                            \
-	}                                                                                                                                   \
-	static _FORCE_INLINE_ void *get_class_ptr_static() {                                                                                \
-		static int ptr;                                                                                                                 \
-		return &ptr;                                                                                                                    \
-	}                                                                                                                                   \
-	static _FORCE_INLINE_ String get_class_static() {                                                                                   \
-		return String(#m_class);                                                                                                        \
-	}                                                                                                                                   \
-	static _FORCE_INLINE_ String get_parent_class_static() {                                                                            \
-		return m_inherits::get_class_static();                                                                                          \
-	}                                                                                                                                   \
-	static void get_inheritance_list_static(List<String> *p_inheritance_list) {                                                         \
-		m_inherits::get_inheritance_list_static(p_inheritance_list);                                                                    \
-		p_inheritance_list->push_back(String(#m_class));                                                                                \
-	}                                                                                                                                   \
-	static String get_category_static() {                                                                                               \
-		String category = m_inherits::get_category_static();                                                                            \
-		if (_get_category != m_inherits::_get_category) {                                                                               \
-			if (category != "") {                                                                                                       \
-				category += "/";                                                                                                        \
-			}                                                                                                                           \
-			category += _get_category();                                                                                                \
-		}                                                                                                                               \
-		return category;                                                                                                                \
-	}                                                                                                                                   \
-	static String inherits_static() {                                                                                                   \
-		return String(#m_inherits);                                                                                                     \
-	}                                                                                                                                   \
-	virtual bool is_class(const String &p_class) const { return (p_class == (#m_class)) ? true : m_inherits::is_class(p_class); }       \
-	virtual bool is_class_ptr(void *p_ptr) const { return (p_ptr == get_class_ptr_static()) ? true : m_inherits::is_class_ptr(p_ptr); } \
-                                                                                                                                        \
-	static void get_valid_parents_static(List<String> *p_parents) {                                                                     \
-		if (m_class::_get_valid_parents_static != m_inherits::_get_valid_parents_static) {                                              \
-			m_class::_get_valid_parents_static(p_parents);                                                                              \
-		}                                                                                                                               \
-                                                                                                                                        \
-		m_inherits::get_valid_parents_static(p_parents);                                                                                \
-	}                                                                                                                                   \
-                                                                                                                                        \
-protected:                                                                                                                              \
-	_FORCE_INLINE_ static void (*_get_bind_methods())() {                                                                               \
-		return &m_class::_bind_methods;                                                                                                 \
-	}                                                                                                                                   \
-                                                                                                                                        \
-public:                                                                                                                                 \
-	static void initialize_class() {                                                                                                    \
-		static bool initialized = false;                                                                                                \
-		if (initialized) {                                                                                                              \
-			return;                                                                                                                     \
-		}                                                                                                                               \
-		m_inherits::initialize_class();                                                                                                 \
-		ClassDB::_add_class<m_class>();                                                                                                 \
-		if (m_class::_get_bind_methods() != m_inherits::_get_bind_methods()) {                                                          \
-			_bind_methods();                                                                                                            \
-		}                                                                                                                               \
-		initialized = true;                                                                                                             \
-	}                                                                                                                                   \
-                                                                                                                                        \
-protected:                                                                                                                              \
-	virtual void _initialize_classv() {                                                                                                 \
-		initialize_class();                                                                                                             \
-	}                                                                                                                                   \
-	_FORCE_INLINE_ bool (Object::*_get_get() const)(const StringName &p_name, Variant &) const {                                        \
-		return (bool (Object::*)(const StringName &, Variant &) const) & m_class::_get;                                                 \
-	}                                                                                                                                   \
-	virtual bool _getv(const StringName &p_name, Variant &r_ret) const {                                                                \
-		if (m_class::_get_get() != m_inherits::_get_get()) {                                                                            \
-			if (_get(p_name, r_ret)) {                                                                                                  \
-				return true;                                                                                                            \
-			}                                                                                                                           \
-		}                                                                                                                               \
-		return m_inherits::_getv(p_name, r_ret);                                                                                        \
-	}                                                                                                                                   \
-	_FORCE_INLINE_ bool (Object::*_get_set() const)(const StringName &p_name, const Variant &p_property) {                              \
-		return (bool (Object::*)(const StringName &, const Variant &)) & m_class::_set;                                                 \
-	}                                                                                                                                   \
-	virtual bool _setv(const StringName &p_name, const Variant &p_property) {                                                           \
-		if (m_inherits::_setv(p_name, p_property)) {                                                                                    \
-			return true;                                                                                                                \
-		}                                                                                                                               \
-		if (m_class::_get_set() != m_inherits::_get_set()) {                                                                            \
-			return _set(p_name, p_property);                                                                                            \
-		}                                                                                                                               \
-		return false;                                                                                                                   \
-	}                                                                                                                                   \
-	_FORCE_INLINE_ void (Object::*_get_get_property_list() const)(List<PropertyInfo> * p_list) const {                                  \
-		return (void (Object::*)(List<PropertyInfo> *) const) & m_class::_get_property_list;                                            \
-	}                                                                                                                                   \
-	virtual void _get_property_listv(List<PropertyInfo> *p_list, bool p_reversed) const {                                               \
-		if (!p_reversed) {                                                                                                              \
-			m_inherits::_get_property_listv(p_list, p_reversed);                                                                        \
-		}                                                                                                                               \
-		p_list->push_back(PropertyInfo(Variant::NIL, get_class_static(), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));       \
-		if (!_is_gpl_reversed()) {                                                                                                      \
-			ClassDB::get_property_list(#m_class, p_list, true, this);                                                                   \
-		}                                                                                                                               \
-		if (m_class::_get_get_property_list() != m_inherits::_get_get_property_list()) {                                                \
-			_get_property_list(p_list);                                                                                                 \
-		}                                                                                                                               \
-		if (_is_gpl_reversed()) {                                                                                                       \
-			ClassDB::get_property_list(#m_class, p_list, true, this);                                                                   \
-		}                                                                                                                               \
-		if (p_reversed) {                                                                                                               \
-			m_inherits::_get_property_listv(p_list, p_reversed);                                                                        \
-		}                                                                                                                               \
-	}                                                                                                                                   \
-	_FORCE_INLINE_ void (Object::*_get_notification() const)(int) {                                                                     \
-		return (void (Object::*)(int)) & m_class::_notification;                                                                        \
-	}                                                                                                                                   \
-	virtual void _notificationv(int p_notification, bool p_reversed) {                                                                  \
-		if (!p_reversed) {                                                                                                              \
-			m_inherits::_notificationv(p_notification, p_reversed);                                                                     \
-		}                                                                                                                               \
-		if (m_class::_get_notification() != m_inherits::_get_notification()) {                                                          \
-			_notification(p_notification);                                                                                              \
-		}                                                                                                                               \
-		if (p_reversed) {                                                                                                               \
-			m_inherits::_notificationv(p_notification, p_reversed);                                                                     \
-		}                                                                                                                               \
-	}                                                                                                                                   \
-                                                                                                                                        \
+#define GDCLASS(m_class, m_inherits)                                                                                                             \
+private:                                                                                                                                         \
+	void operator=(const m_class &p_rval) {}                                                                                                     \
+	mutable StringName _class_name;                                                                                                              \
+	friend class ClassDB;                                                                                                                        \
+                                                                                                                                                 \
+public:                                                                                                                                          \
+	virtual String get_class() const override {                                                                                                  \
+		return String(#m_class);                                                                                                                 \
+	}                                                                                                                                            \
+	virtual const StringName *_get_class_namev() const override {                                                                                \
+		if (!_class_name) {                                                                                                                      \
+			_class_name = get_class_static();                                                                                                    \
+		}                                                                                                                                        \
+		return &_class_name;                                                                                                                     \
+	}                                                                                                                                            \
+	static _FORCE_INLINE_ void *get_class_ptr_static() {                                                                                         \
+		static int ptr;                                                                                                                          \
+		return &ptr;                                                                                                                             \
+	}                                                                                                                                            \
+	static _FORCE_INLINE_ String get_class_static() {                                                                                            \
+		return String(#m_class);                                                                                                                 \
+	}                                                                                                                                            \
+	static _FORCE_INLINE_ String get_parent_class_static() {                                                                                     \
+		return m_inherits::get_class_static();                                                                                                   \
+	}                                                                                                                                            \
+	static void get_inheritance_list_static(List<String> *p_inheritance_list) {                                                                  \
+		m_inherits::get_inheritance_list_static(p_inheritance_list);                                                                             \
+		p_inheritance_list->push_back(String(#m_class));                                                                                         \
+	}                                                                                                                                            \
+	static String get_category_static() {                                                                                                        \
+		String category = m_inherits::get_category_static();                                                                                     \
+		if (_get_category != m_inherits::_get_category) {                                                                                        \
+			if (category != "") {                                                                                                                \
+				category += "/";                                                                                                                 \
+			}                                                                                                                                    \
+			category += _get_category();                                                                                                         \
+		}                                                                                                                                        \
+		return category;                                                                                                                         \
+	}                                                                                                                                            \
+	static String inherits_static() {                                                                                                            \
+		return String(#m_inherits);                                                                                                              \
+	}                                                                                                                                            \
+	virtual bool is_class(const String &p_class) const override { return (p_class == (#m_class)) ? true : m_inherits::is_class(p_class); }       \
+	virtual bool is_class_ptr(void *p_ptr) const override { return (p_ptr == get_class_ptr_static()) ? true : m_inherits::is_class_ptr(p_ptr); } \
+                                                                                                                                                 \
+	static void get_valid_parents_static(List<String> *p_parents) {                                                                              \
+		if (m_class::_get_valid_parents_static != m_inherits::_get_valid_parents_static) {                                                       \
+			m_class::_get_valid_parents_static(p_parents);                                                                                       \
+		}                                                                                                                                        \
+                                                                                                                                                 \
+		m_inherits::get_valid_parents_static(p_parents);                                                                                         \
+	}                                                                                                                                            \
+                                                                                                                                                 \
+protected:                                                                                                                                       \
+	_FORCE_INLINE_ static void (*_get_bind_methods())() {                                                                                        \
+		return &m_class::_bind_methods;                                                                                                          \
+	}                                                                                                                                            \
+                                                                                                                                                 \
+public:                                                                                                                                          \
+	static void initialize_class() {                                                                                                             \
+		static bool initialized = false;                                                                                                         \
+		if (initialized) {                                                                                                                       \
+			return;                                                                                                                              \
+		}                                                                                                                                        \
+		m_inherits::initialize_class();                                                                                                          \
+		ClassDB::_add_class<m_class>();                                                                                                          \
+		if (m_class::_get_bind_methods() != m_inherits::_get_bind_methods()) {                                                                   \
+			_bind_methods();                                                                                                                     \
+		}                                                                                                                                        \
+		initialized = true;                                                                                                                      \
+	}                                                                                                                                            \
+                                                                                                                                                 \
+protected:                                                                                                                                       \
+	virtual void _initialize_classv() override {                                                                                                 \
+		initialize_class();                                                                                                                      \
+	}                                                                                                                                            \
+	_FORCE_INLINE_ bool (Object::*_get_get() const)(const StringName &p_name, Variant &) const {                                                 \
+		return (bool (Object::*)(const StringName &, Variant &) const) & m_class::_get;                                                          \
+	}                                                                                                                                            \
+	virtual bool _getv(const StringName &p_name, Variant &r_ret) const override {                                                                \
+		if (m_class::_get_get() != m_inherits::_get_get()) {                                                                                     \
+			if (_get(p_name, r_ret)) {                                                                                                           \
+				return true;                                                                                                                     \
+			}                                                                                                                                    \
+		}                                                                                                                                        \
+		return m_inherits::_getv(p_name, r_ret);                                                                                                 \
+	}                                                                                                                                            \
+	_FORCE_INLINE_ bool (Object::*_get_set() const)(const StringName &p_name, const Variant &p_property) {                                       \
+		return (bool (Object::*)(const StringName &, const Variant &)) & m_class::_set;                                                          \
+	}                                                                                                                                            \
+	virtual bool _setv(const StringName &p_name, const Variant &p_property) override {                                                           \
+		if (m_inherits::_setv(p_name, p_property)) {                                                                                             \
+			return true;                                                                                                                         \
+		}                                                                                                                                        \
+		if (m_class::_get_set() != m_inherits::_get_set()) {                                                                                     \
+			return _set(p_name, p_property);                                                                                                     \
+		}                                                                                                                                        \
+		return false;                                                                                                                            \
+	}                                                                                                                                            \
+	_FORCE_INLINE_ void (Object::*_get_get_property_list() const)(List<PropertyInfo> * p_list) const {                                           \
+		return (void (Object::*)(List<PropertyInfo> *) const) & m_class::_get_property_list;                                                     \
+	}                                                                                                                                            \
+	virtual void _get_property_listv(List<PropertyInfo> *p_list, bool p_reversed) const override {                                               \
+		if (!p_reversed) {                                                                                                                       \
+			m_inherits::_get_property_listv(p_list, p_reversed);                                                                                 \
+		}                                                                                                                                        \
+		p_list->push_back(PropertyInfo(Variant::NIL, get_class_static(), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));                \
+		if (!_is_gpl_reversed()) {                                                                                                               \
+			ClassDB::get_property_list(#m_class, p_list, true, this);                                                                            \
+		}                                                                                                                                        \
+		if (m_class::_get_get_property_list() != m_inherits::_get_get_property_list()) {                                                         \
+			_get_property_list(p_list);                                                                                                          \
+		}                                                                                                                                        \
+		if (_is_gpl_reversed()) {                                                                                                                \
+			ClassDB::get_property_list(#m_class, p_list, true, this);                                                                            \
+		}                                                                                                                                        \
+		if (p_reversed) {                                                                                                                        \
+			m_inherits::_get_property_listv(p_list, p_reversed);                                                                                 \
+		}                                                                                                                                        \
+	}                                                                                                                                            \
+	_FORCE_INLINE_ void (Object::*_get_notification() const)(int) {                                                                              \
+		return (void (Object::*)(int)) & m_class::_notification;                                                                                 \
+	}                                                                                                                                            \
+	virtual void _notificationv(int p_notification, bool p_reversed) override {                                                                  \
+		if (!p_reversed) {                                                                                                                       \
+			m_inherits::_notificationv(p_notification, p_reversed);                                                                              \
+		}                                                                                                                                        \
+		if (m_class::_get_notification() != m_inherits::_get_notification()) {                                                                   \
+			_notification(p_notification);                                                                                                       \
+		}                                                                                                                                        \
+		if (p_reversed) {                                                                                                                        \
+			m_inherits::_notificationv(p_notification, p_reversed);                                                                              \
+		}                                                                                                                                        \
+	}                                                                                                                                            \
+                                                                                                                                                 \
 private:
 private:
 
 
 #define OBJ_CATEGORY(m_category)                                        \
 #define OBJ_CATEGORY(m_category)                                        \
@@ -394,10 +394,10 @@ protected:                                                              \
                                                                         \
                                                                         \
 private:
 private:
 
 
-#define OBJ_SAVE_TYPE(m_class)                                 \
-public:                                                        \
-	virtual String get_save_class() const { return #m_class; } \
-                                                               \
+#define OBJ_SAVE_TYPE(m_class)                                          \
+public:                                                                 \
+	virtual String get_save_class() const override { return #m_class; } \
+                                                                        \
 private:
 private:
 
 
 class ScriptInstance;
 class ScriptInstance;

+ 2 - 2
core/packed_data_container.h

@@ -72,7 +72,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual Variant getvar(const Variant &p_key, bool *r_valid = nullptr) const;
+	virtual Variant getvar(const Variant &p_key, bool *r_valid = nullptr) const override;
 	Error pack(const Variant &p_data);
 	Error pack(const Variant &p_data);
 
 
 	int size() const;
 	int size() const;
@@ -97,7 +97,7 @@ public:
 	bool _is_dictionary() const;
 	bool _is_dictionary() const;
 
 
 	int size() const;
 	int size() const;
-	virtual Variant getvar(const Variant &p_key, bool *r_valid = nullptr) const;
+	virtual Variant getvar(const Variant &p_key, bool *r_valid = nullptr) const override;
 
 
 	PackedDataContainerRef() {}
 	PackedDataContainerRef() {}
 };
 };

+ 6 - 2
core/resource.h

@@ -40,15 +40,19 @@
 #define RES_BASE_EXTENSION(m_ext)                                                                                   \
 #define RES_BASE_EXTENSION(m_ext)                                                                                   \
 public:                                                                                                             \
 public:                                                                                                             \
 	static void register_custom_data_to_otdb() { ClassDB::add_resource_base_extension(m_ext, get_class_static()); } \
 	static void register_custom_data_to_otdb() { ClassDB::add_resource_base_extension(m_ext, get_class_static()); } \
-	virtual String get_base_extension() const { return m_ext; }                                                     \
+	virtual String get_base_extension() const override { return m_ext; }                                            \
                                                                                                                     \
                                                                                                                     \
 private:
 private:
 
 
 class Resource : public Reference {
 class Resource : public Reference {
 	GDCLASS(Resource, Reference);
 	GDCLASS(Resource, Reference);
 	OBJ_CATEGORY("Resources");
 	OBJ_CATEGORY("Resources");
-	RES_BASE_EXTENSION("res");
 
 
+public:
+	static void register_custom_data_to_otdb() { ClassDB::add_resource_base_extension("res", get_class_static()); }
+	virtual String get_base_extension() const { return "res"; }
+
+private:
 	Set<ObjectID> owners;
 	Set<ObjectID> owners;
 
 
 	friend class ResBase;
 	friend class ResBase;

+ 1 - 1
core/script_language.h

@@ -116,7 +116,7 @@ class Script : public Resource {
 	OBJ_SAVE_TYPE(Script);
 	OBJ_SAVE_TYPE(Script);
 
 
 protected:
 protected:
-	virtual bool editor_can_reload_from_file() { return false; } // this is handled by editor better
+	virtual bool editor_can_reload_from_file() override { return false; } // this is handled by editor better
 	void _notification(int p_what);
 	void _notification(int p_what);
 	static void _bind_methods();
 	static void _bind_methods();
 
 

+ 2 - 2
drivers/unix/ip_unix.h

@@ -38,12 +38,12 @@
 class IP_Unix : public IP {
 class IP_Unix : public IP {
 	GDCLASS(IP_Unix, IP);
 	GDCLASS(IP_Unix, IP);
 
 
-	virtual IP_Address _resolve_hostname(const String &p_hostname, IP::Type p_type);
+	virtual IP_Address _resolve_hostname(const String &p_hostname, IP::Type p_type) override;
 
 
 	static IP *_create_unix();
 	static IP *_create_unix();
 
 
 public:
 public:
-	virtual void get_local_interfaces(Map<String, Interface_Info> *r_interfaces) const;
+	virtual void get_local_interfaces(Map<String, Interface_Info> *r_interfaces) const override;
 
 
 	static void make_default();
 	static void make_default();
 	IP_Unix();
 	IP_Unix();

+ 2 - 2
editor/animation_bezier_editor.h

@@ -143,12 +143,12 @@ protected:
 	void _notification(int p_what);
 	void _notification(int p_what);
 
 
 public:
 public:
-	virtual String get_tooltip(const Point2 &p_pos) const;
+	virtual String get_tooltip(const Point2 &p_pos) const override;
 
 
 	Ref<Animation> get_animation() const;
 	Ref<Animation> get_animation() const;
 
 
 	void set_animation_and_track(const Ref<Animation> &p_animation, int p_track);
 	void set_animation_and_track(const Ref<Animation> &p_animation, int p_track);
-	virtual Size2 get_minimum_size() const;
+	virtual Size2 get_minimum_size() const override;
 
 
 	void set_undo_redo(UndoRedo *p_undo_redo);
 	void set_undo_redo(UndoRedo *p_undo_redo);
 	void set_timeline(AnimationTimelineEdit *p_timeline);
 	void set_timeline(AnimationTimelineEdit *p_timeline);

+ 7 - 7
editor/animation_track_editor.h

@@ -97,7 +97,7 @@ public:
 
 
 	float get_zoom_scale() const;
 	float get_zoom_scale() const;
 
 
-	virtual Size2 get_minimum_size() const;
+	virtual Size2 get_minimum_size() const override;
 	void set_animation(const Ref<Animation> &p_animation);
 	void set_animation(const Ref<Animation> &p_animation);
 	void set_zoom(Range *p_zoom);
 	void set_zoom(Range *p_zoom);
 	Range *get_zoom() const { return zoom; }
 	Range *get_zoom() const { return zoom; }
@@ -192,11 +192,11 @@ protected:
 	virtual void _gui_input(const Ref<InputEvent> &p_event);
 	virtual void _gui_input(const Ref<InputEvent> &p_event);
 
 
 public:
 public:
-	virtual Variant get_drag_data(const Point2 &p_point);
-	virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const;
-	virtual void drop_data(const Point2 &p_point, const Variant &p_data);
+	virtual Variant get_drag_data(const Point2 &p_point) override;
+	virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const override;
+	virtual void drop_data(const Point2 &p_point, const Variant &p_data) override;
 
 
-	virtual String get_tooltip(const Point2 &p_pos) const;
+	virtual String get_tooltip(const Point2 &p_pos) const override;
 
 
 	virtual int get_key_height() const;
 	virtual int get_key_height() const;
 	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec);
 	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec);
@@ -218,7 +218,7 @@ public:
 	UndoRedo *get_undo_redo() const { return undo_redo; }
 	UndoRedo *get_undo_redo() const { return undo_redo; }
 	NodePath get_path() const;
 	NodePath get_path() const;
 	void set_animation_and_track(const Ref<Animation> &p_animation, int p_track);
 	void set_animation_and_track(const Ref<Animation> &p_animation, int p_track);
-	virtual Size2 get_minimum_size() const;
+	virtual Size2 get_minimum_size() const override;
 
 
 	void set_undo_redo(UndoRedo *p_undo_redo);
 	void set_undo_redo(UndoRedo *p_undo_redo);
 	void set_timeline(AnimationTimelineEdit *p_timeline);
 	void set_timeline(AnimationTimelineEdit *p_timeline);
@@ -264,7 +264,7 @@ protected:
 
 
 public:
 public:
 	void set_type_and_name(const Ref<Texture2D> &p_type, const String &p_name, const NodePath &p_node);
 	void set_type_and_name(const Ref<Texture2D> &p_type, const String &p_name, const NodePath &p_node);
-	virtual Size2 get_minimum_size() const;
+	virtual Size2 get_minimum_size() const override;
 	void set_timeline(AnimationTimelineEdit *p_timeline);
 	void set_timeline(AnimationTimelineEdit *p_timeline);
 	void set_root(Node *p_root);
 	void set_root(Node *p_root);
 
 

+ 39 - 39
editor/animation_track_editor_plugins.h

@@ -39,21 +39,21 @@ class AnimationTrackEditBool : public AnimationTrackEdit {
 	Ref<Texture2D> icon_unchecked;
 	Ref<Texture2D> icon_unchecked;
 
 
 public:
 public:
-	virtual int get_key_height() const;
-	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec);
-	virtual bool is_key_selectable_by_distance() const;
-	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right);
+	virtual int get_key_height() const override;
+	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec) override;
+	virtual bool is_key_selectable_by_distance() const override;
+	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right) override;
 };
 };
 
 
 class AnimationTrackEditColor : public AnimationTrackEdit {
 class AnimationTrackEditColor : public AnimationTrackEdit {
 	GDCLASS(AnimationTrackEditColor, AnimationTrackEdit);
 	GDCLASS(AnimationTrackEditColor, AnimationTrackEdit);
 
 
 public:
 public:
-	virtual int get_key_height() const;
-	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec);
-	virtual bool is_key_selectable_by_distance() const;
-	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right);
-	virtual void draw_key_link(int p_index, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right);
+	virtual int get_key_height() const override;
+	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec) override;
+	virtual bool is_key_selectable_by_distance() const override;
+	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right) override;
+	virtual void draw_key_link(int p_index, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right) override;
 };
 };
 
 
 class AnimationTrackEditAudio : public AnimationTrackEdit {
 class AnimationTrackEditAudio : public AnimationTrackEdit {
@@ -67,10 +67,10 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual int get_key_height() const;
-	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec);
-	virtual bool is_key_selectable_by_distance() const;
-	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right);
+	virtual int get_key_height() const override;
+	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec) override;
+	virtual bool is_key_selectable_by_distance() const override;
+	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right) override;
 
 
 	void set_node(Object *p_object);
 	void set_node(Object *p_object);
 
 
@@ -84,10 +84,10 @@ class AnimationTrackEditSpriteFrame : public AnimationTrackEdit {
 	bool is_coords;
 	bool is_coords;
 
 
 public:
 public:
-	virtual int get_key_height() const;
-	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec);
-	virtual bool is_key_selectable_by_distance() const;
-	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right);
+	virtual int get_key_height() const override;
+	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec) override;
+	virtual bool is_key_selectable_by_distance() const override;
+	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right) override;
 
 
 	void set_node(Object *p_object);
 	void set_node(Object *p_object);
 	void set_as_coords();
 	void set_as_coords();
@@ -101,10 +101,10 @@ class AnimationTrackEditSubAnim : public AnimationTrackEdit {
 	ObjectID id;
 	ObjectID id;
 
 
 public:
 public:
-	virtual int get_key_height() const;
-	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec);
-	virtual bool is_key_selectable_by_distance() const;
-	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right);
+	virtual int get_key_height() const override;
+	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec) override;
+	virtual bool is_key_selectable_by_distance() const override;
+	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right) override;
 
 
 	void set_node(Object *p_object);
 	void set_node(Object *p_object);
 };
 };
@@ -124,15 +124,15 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void _gui_input(const Ref<InputEvent> &p_event);
+	virtual void _gui_input(const Ref<InputEvent> &p_event) override;
 
 
-	virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const;
-	virtual void drop_data(const Point2 &p_point, const Variant &p_data);
+	virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const override;
+	virtual void drop_data(const Point2 &p_point, const Variant &p_data) override;
 
 
-	virtual int get_key_height() const;
-	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec);
-	virtual bool is_key_selectable_by_distance() const;
-	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right);
+	virtual int get_key_height() const override;
+	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec) override;
+	virtual bool is_key_selectable_by_distance() const override;
+	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right) override;
 
 
 	AnimationTrackEditTypeAudio();
 	AnimationTrackEditTypeAudio();
 };
 };
@@ -143,10 +143,10 @@ class AnimationTrackEditTypeAnimation : public AnimationTrackEdit {
 	ObjectID id;
 	ObjectID id;
 
 
 public:
 public:
-	virtual int get_key_height() const;
-	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec);
-	virtual bool is_key_selectable_by_distance() const;
-	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right);
+	virtual int get_key_height() const override;
+	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec) override;
+	virtual bool is_key_selectable_by_distance() const override;
+	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right) override;
 
 
 	void set_node(Object *p_object);
 	void set_node(Object *p_object);
 	AnimationTrackEditTypeAnimation();
 	AnimationTrackEditTypeAnimation();
@@ -156,19 +156,19 @@ class AnimationTrackEditVolumeDB : public AnimationTrackEdit {
 	GDCLASS(AnimationTrackEditVolumeDB, AnimationTrackEdit);
 	GDCLASS(AnimationTrackEditVolumeDB, AnimationTrackEdit);
 
 
 public:
 public:
-	virtual void draw_bg(int p_clip_left, int p_clip_right);
-	virtual void draw_fg(int p_clip_left, int p_clip_right);
-	virtual int get_key_height() const;
-	virtual void draw_key_link(int p_index, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right);
+	virtual void draw_bg(int p_clip_left, int p_clip_right) override;
+	virtual void draw_fg(int p_clip_left, int p_clip_right) override;
+	virtual int get_key_height() const override;
+	virtual void draw_key_link(int p_index, float p_pixels_sec, int p_x, int p_next_x, int p_clip_left, int p_clip_right) override;
 };
 };
 
 
 class AnimationTrackEditDefaultPlugin : public AnimationTrackEditPlugin {
 class AnimationTrackEditDefaultPlugin : public AnimationTrackEditPlugin {
 	GDCLASS(AnimationTrackEditDefaultPlugin, AnimationTrackEditPlugin);
 	GDCLASS(AnimationTrackEditDefaultPlugin, AnimationTrackEditPlugin);
 
 
 public:
 public:
-	virtual AnimationTrackEdit *create_value_track_edit(Object *p_object, Variant::Type p_type, const String &p_property, PropertyHint p_hint, const String &p_hint_string, int p_usage);
-	virtual AnimationTrackEdit *create_audio_track_edit();
-	virtual AnimationTrackEdit *create_animation_track_edit(Object *p_object);
+	virtual AnimationTrackEdit *create_value_track_edit(Object *p_object, Variant::Type p_type, const String &p_property, PropertyHint p_hint, const String &p_hint_string, int p_usage) override;
+	virtual AnimationTrackEdit *create_audio_track_edit() override;
+	virtual AnimationTrackEdit *create_animation_track_edit(Object *p_object) override;
 };
 };
 
 
 #endif // ANIMATION_TRACK_EDITOR_PLUGINS_H
 #endif // ANIMATION_TRACK_EDITOR_PLUGINS_H

+ 1 - 1
editor/code_editor.h

@@ -47,7 +47,7 @@ class GotoLineDialog : public ConfirmationDialog {
 
 
 	TextEdit *text_editor;
 	TextEdit *text_editor;
 
 
-	virtual void ok_pressed();
+	virtual void ok_pressed() override;
 
 
 public:
 public:
 	void popup_find_line(TextEdit *p_edit);
 	void popup_find_line(TextEdit *p_edit);

+ 1 - 1
editor/connections_dialog.h

@@ -102,7 +102,7 @@ private:
 
 
 	Label *error_label;
 	Label *error_label;
 
 
-	void ok_pressed();
+	void ok_pressed() override;
 	void _cancel_pressed();
 	void _cancel_pressed();
 	void _item_activated();
 	void _item_activated();
 	void _text_entered(const String &_text);
 	void _text_entered(const String &_text);

+ 1 - 1
editor/create_dialog.h

@@ -78,7 +78,7 @@ class CreateDialog : public ConfirmationDialog {
 	void _hide_requested();
 	void _hide_requested();
 
 
 	void _confirmed();
 	void _confirmed();
-	virtual void cancel_pressed();
+	virtual void cancel_pressed() override;
 
 
 	void _favorite_toggled();
 	void _favorite_toggled();
 
 

+ 1 - 1
editor/debugger/script_editor_debugger.h

@@ -252,7 +252,7 @@ public:
 
 
 	bool is_skip_breakpoints();
 	bool is_skip_breakpoints();
 
 
-	virtual Size2 get_minimum_size() const;
+	virtual Size2 get_minimum_size() const override;
 	ScriptEditorDebugger(EditorNode *p_editor = nullptr);
 	ScriptEditorDebugger(EditorNode *p_editor = nullptr);
 	~ScriptEditorDebugger();
 	~ScriptEditorDebugger();
 };
 };

+ 4 - 4
editor/dependency_editor.h

@@ -123,7 +123,7 @@ class DependencyRemoveDialog : public ConfirmationDialog {
 	void _find_all_removed_dependencies(EditorFileSystemDirectory *efsd, Vector<RemovedDependency> &p_removed);
 	void _find_all_removed_dependencies(EditorFileSystemDirectory *efsd, Vector<RemovedDependency> &p_removed);
 	void _build_removed_dependency_tree(const Vector<RemovedDependency> &p_removed);
 	void _build_removed_dependency_tree(const Vector<RemovedDependency> &p_removed);
 
 
-	void ok_pressed();
+	void ok_pressed() override;
 
 
 	static void _bind_methods();
 	static void _bind_methods();
 
 
@@ -147,8 +147,8 @@ private:
 	Button *fdep;
 	Button *fdep;
 	Label *text;
 	Label *text;
 	Tree *files;
 	Tree *files;
-	void ok_pressed();
-	void custom_action(const String &);
+	void ok_pressed() override;
+	void custom_action(const String &) override;
 
 
 public:
 public:
 	void show(Mode p_mode, const String &p_for_file, const Vector<String> &report);
 	void show(Mode p_mode, const String &p_for_file, const Vector<String> &report);
@@ -161,7 +161,7 @@ class OrphanResourcesDialog : public ConfirmationDialog {
 	DependencyEditor *dep_edit;
 	DependencyEditor *dep_edit;
 	Tree *files;
 	Tree *files;
 	ConfirmationDialog *delete_confirm;
 	ConfirmationDialog *delete_confirm;
-	void ok_pressed();
+	void ok_pressed() override;
 
 
 	bool _fill_owners(EditorFileSystemDirectory *efsd, HashMap<String, int> &refs, TreeItem *p_parent);
 	bool _fill_owners(EditorFileSystemDirectory *efsd, HashMap<String, int> &refs, TreeItem *p_parent);
 
 

+ 1 - 1
editor/editor_asset_installer.h

@@ -43,7 +43,7 @@ class EditorAssetInstaller : public ConfirmationDialog {
 	bool updating;
 	bool updating;
 	void _update_subitems(TreeItem *p_item, bool p_check, bool p_first = false);
 	void _update_subitems(TreeItem *p_item, bool p_check, bool p_first = false);
 	void _item_edited();
 	void _item_edited();
-	virtual void ok_pressed();
+	virtual void ok_pressed() override;
 
 
 protected:
 protected:
 	static void _bind_methods();
 	static void _bind_methods();

+ 11 - 11
editor/editor_audio_buses.h

@@ -112,9 +112,9 @@ class EditorAudioBus : public PanelContainer {
 	void _effect_rmb(const Vector2 &p_pos);
 	void _effect_rmb(const Vector2 &p_pos);
 	void _update_visible_channels();
 	void _update_visible_channels();
 
 
-	virtual Variant get_drag_data(const Point2 &p_point);
-	virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const;
-	virtual void drop_data(const Point2 &p_point, const Variant &p_data);
+	virtual Variant get_drag_data(const Point2 &p_point) override;
+	virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const override;
+	virtual void drop_data(const Point2 &p_point, const Variant &p_data) override;
 
 
 	Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
 	Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
 	bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
 	bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
@@ -138,8 +138,8 @@ public:
 class EditorAudioBusDrop : public Control {
 class EditorAudioBusDrop : public Control {
 	GDCLASS(EditorAudioBusDrop, Control);
 	GDCLASS(EditorAudioBusDrop, Control);
 
 
-	virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const;
-	virtual void drop_data(const Point2 &p_point, const Variant &p_data);
+	virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const override;
+	virtual void drop_data(const Point2 &p_point, const Variant &p_data) override;
 
 
 	mutable bool hovering_drop;
 	mutable bool hovering_drop;
 
 
@@ -250,7 +250,7 @@ public:
 	Color notch_color;
 	Color notch_color;
 
 
 	void add_notch(float p_normalized_offset, float p_db_value, bool p_render_value = false);
 	void add_notch(float p_normalized_offset, float p_db_value, bool p_render_value = false);
-	Size2 get_minimum_size() const;
+	Size2 get_minimum_size() const override;
 
 
 private:
 private:
 	static void _bind_methods();
 	static void _bind_methods();
@@ -267,11 +267,11 @@ class AudioBusesEditorPlugin : public EditorPlugin {
 	EditorAudioBuses *audio_bus_editor;
 	EditorAudioBuses *audio_bus_editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "SampleLibrary"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "SampleLibrary"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_node) override;
+	virtual bool handles(Object *p_node) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	AudioBusesEditorPlugin(EditorAudioBuses *p_node);
 	AudioBusesEditorPlugin(EditorAudioBuses *p_node);
 	~AudioBusesEditorPlugin();
 	~AudioBusesEditorPlugin();

+ 1 - 1
editor/editor_dir_dialog.h

@@ -56,7 +56,7 @@ class EditorDirDialog : public ConfirmationDialog {
 	void _make_dir();
 	void _make_dir();
 	void _make_dir_confirm();
 	void _make_dir_confirm();
 
 
-	void ok_pressed();
+	void ok_pressed() override;
 
 
 	bool must_reload;
 	bool must_reload;
 
 

+ 11 - 11
editor/editor_export.h

@@ -417,17 +417,17 @@ private:
 	FixUpEmbeddedPckFunc fixup_embedded_pck_func;
 	FixUpEmbeddedPckFunc fixup_embedded_pck_func;
 
 
 public:
 public:
-	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features);
+	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) override;
 
 
-	virtual void get_export_options(List<ExportOption> *r_options);
+	virtual void get_export_options(List<ExportOption> *r_options) override;
 
 
-	virtual String get_name() const;
-	virtual String get_os_name() const;
-	virtual Ref<Texture2D> get_logo() const;
+	virtual String get_name() const override;
+	virtual String get_os_name() const override;
+	virtual Ref<Texture2D> get_logo() const override;
 
 
-	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const;
-	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const;
-	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0);
+	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override;
+	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override;
 	virtual Error sign_shared_object(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path);
 	virtual Error sign_shared_object(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path);
 
 
 	void set_extension(const String &p_extension, const String &p_feature_key = "default");
 	void set_extension(const String &p_extension, const String &p_feature_key = "default");
@@ -442,8 +442,8 @@ public:
 	void set_debug_32(const String &p_file);
 	void set_debug_32(const String &p_file);
 
 
 	void add_platform_feature(const String &p_feature);
 	void add_platform_feature(const String &p_feature);
-	virtual void get_platform_features(List<String> *r_features);
-	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features);
+	virtual void get_platform_features(List<String> *r_features) override;
+	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) override;
 
 
 	int get_chmod_flags() const;
 	int get_chmod_flags() const;
 	void set_chmod_flags(int p_flags);
 	void set_chmod_flags(int p_flags);
@@ -458,7 +458,7 @@ class EditorExportTextSceneToBinaryPlugin : public EditorExportPlugin {
 	GDCLASS(EditorExportTextSceneToBinaryPlugin, EditorExportPlugin);
 	GDCLASS(EditorExportTextSceneToBinaryPlugin, EditorExportPlugin);
 
 
 public:
 public:
-	virtual void _export_file(const String &p_path, const String &p_type, const Set<String> &p_features);
+	virtual void _export_file(const String &p_path, const String &p_type, const Set<String> &p_features) override;
 	EditorExportTextSceneToBinaryPlugin();
 	EditorExportTextSceneToBinaryPlugin();
 };
 };
 
 

+ 1 - 1
editor/editor_file_dialog.h

@@ -185,7 +185,7 @@ private:
 	void _go_back();
 	void _go_back();
 	void _go_forward();
 	void _go_forward();
 
 
-	virtual void _post_popup();
+	virtual void _post_popup() override;
 
 
 	void _save_to_recent();
 	void _save_to_recent();
 	//callback function is callback(String p_path,Ref<Texture2D> preview,Variant udata) preview null if could not load
 	//callback function is callback(String p_path,Ref<Texture2D> preview,Variant udata) preview null if could not load

+ 7 - 7
editor/editor_inspector.h

@@ -107,7 +107,7 @@ protected:
 public:
 public:
 	void emit_changed(const StringName &p_property, const Variant &p_value, const StringName &p_field = StringName(), bool p_changing = false);
 	void emit_changed(const StringName &p_property, const Variant &p_value, const StringName &p_field = StringName(), bool p_changing = false);
 
 
-	virtual Size2 get_minimum_size() const;
+	virtual Size2 get_minimum_size() const override;
 
 
 	void set_label(const String &p_label);
 	void set_label(const String &p_label);
 	String get_label() const;
 	String get_label() const;
@@ -151,7 +151,7 @@ public:
 	virtual void expand_all_folding();
 	virtual void expand_all_folding();
 	virtual void collapse_all_folding();
 	virtual void collapse_all_folding();
 
 
-	virtual Variant get_drag_data(const Point2 &p_point);
+	virtual Variant get_drag_data(const Point2 &p_point) override;
 
 
 	void set_selectable(bool p_selectable);
 	void set_selectable(bool p_selectable);
 	bool is_selectable() const;
 	bool is_selectable() const;
@@ -160,7 +160,7 @@ public:
 	float get_name_split_ratio() const;
 	float get_name_split_ratio() const;
 
 
 	void set_object_and_property(Object *p_object, const StringName &p_property);
 	void set_object_and_property(Object *p_object, const StringName &p_property);
-	virtual Control *make_custom_tooltip(const String &p_text) const;
+	virtual Control *make_custom_tooltip(const String &p_text) const override;
 
 
 	String get_tooltip_text() const;
 	String get_tooltip_text() const;
 
 
@@ -212,8 +212,8 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual Size2 get_minimum_size() const;
-	virtual Control *make_custom_tooltip(const String &p_text) const;
+	virtual Size2 get_minimum_size() const override;
+	virtual Control *make_custom_tooltip(const String &p_text) const override;
 
 
 	String get_tooltip_text() const;
 	String get_tooltip_text() const;
 
 
@@ -239,7 +239,7 @@ protected:
 	void _gui_input(const Ref<InputEvent> &p_event);
 	void _gui_input(const Ref<InputEvent> &p_event);
 
 
 public:
 public:
-	virtual Size2 get_minimum_size() const;
+	virtual Size2 get_minimum_size() const override;
 
 
 	void setup(const String &p_section, const String &p_label, Object *p_object, const Color &p_bg_color, bool p_foldable);
 	void setup(const String &p_section, const String &p_label, Object *p_object, const Color &p_bg_color, bool p_foldable);
 	VBoxContainer *get_vbox();
 	VBoxContainer *get_vbox();
@@ -323,7 +323,7 @@ class EditorInspector : public ScrollContainer {
 
 
 	void _node_removed(Node *p_node);
 	void _node_removed(Node *p_node);
 
 
-	void _changed_callback(Object *p_changed, const char *p_prop);
+	void _changed_callback(Object *p_changed, const char *p_prop) override;
 	void _edit_request_change(Object *p_object, const String &p_prop);
 	void _edit_request_change(Object *p_object, const String &p_prop);
 
 
 	void _filter_changed(const String &p_text);
 	void _filter_changed(const String &p_text);

+ 2 - 2
editor/editor_layouts_dialog.h

@@ -47,8 +47,8 @@ class EditorLayoutsDialog : public ConfirmationDialog {
 
 
 protected:
 protected:
 	static void _bind_methods();
 	static void _bind_methods();
-	virtual void ok_pressed();
-	virtual void _post_popup();
+	virtual void ok_pressed() override;
+	virtual void _post_popup() override;
 
 
 public:
 public:
 	EditorLayoutsDialog();
 	EditorLayoutsDialog();

+ 2 - 2
editor/editor_properties.cpp

@@ -584,12 +584,12 @@ public:
 	Vector<String> tooltips;
 	Vector<String> tooltips;
 	int hovered_index;
 	int hovered_index;
 
 
-	virtual Size2 get_minimum_size() const {
+	virtual Size2 get_minimum_size() const override {
 		Ref<Font> font = get_theme_font("font", "Label");
 		Ref<Font> font = get_theme_font("font", "Label");
 		return Vector2(0, font->get_height() * 2);
 		return Vector2(0, font->get_height() * 2);
 	}
 	}
 
 
-	virtual String get_tooltip(const Point2 &p_pos) const {
+	virtual String get_tooltip(const Point2 &p_pos) const override {
 		for (int i = 0; i < flag_rects.size(); i++) {
 		for (int i = 0; i < flag_rects.size(); i++) {
 			if (i < tooltips.size() && flag_rects[i].has_point(p_pos)) {
 			if (i < tooltips.size() && flag_rects[i].has_point(p_pos)) {
 				return tooltips[i];
 				return tooltips[i];

+ 37 - 37
editor/editor_properties.h

@@ -44,7 +44,7 @@ class EditorPropertyNil : public EditorProperty {
 	LineEdit *text;
 	LineEdit *text;
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	EditorPropertyNil();
 	EditorPropertyNil();
 };
 };
 
 
@@ -62,7 +62,7 @@ protected:
 
 
 public:
 public:
 	void set_string_name(bool p_enabled);
 	void set_string_name(bool p_enabled);
-	virtual void update_property();
+	virtual void update_property() override;
 	void set_placeholder(const String &p_string);
 	void set_placeholder(const String &p_string);
 	EditorPropertyText();
 	EditorPropertyText();
 };
 };
@@ -84,7 +84,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	EditorPropertyMultilineText();
 	EditorPropertyMultilineText();
 };
 };
 
 
@@ -100,7 +100,7 @@ protected:
 
 
 public:
 public:
 	void setup(const Vector<String> &p_options, bool p_string_name = false);
 	void setup(const Vector<String> &p_options, bool p_string_name = false);
-	virtual void update_property();
+	virtual void update_property() override;
 	EditorPropertyTextEnum();
 	EditorPropertyTextEnum();
 };
 };
 
 
@@ -125,7 +125,7 @@ protected:
 public:
 public:
 	void setup(const Vector<String> &p_extensions, bool p_folder, bool p_global);
 	void setup(const Vector<String> &p_extensions, bool p_folder, bool p_global);
 	void set_save_mode();
 	void set_save_mode();
-	virtual void update_property();
+	virtual void update_property() override;
 	EditorPropertyPath();
 	EditorPropertyPath();
 };
 };
 
 
@@ -145,7 +145,7 @@ protected:
 
 
 public:
 public:
 	void setup(const String &p_base_type, const String &p_selected_type);
 	void setup(const String &p_base_type, const String &p_selected_type);
-	virtual void update_property();
+	virtual void update_property() override;
 	EditorPropertyClassName();
 	EditorPropertyClassName();
 };
 };
 
 
@@ -179,7 +179,7 @@ protected:
 
 
 public:
 public:
 	void setup(Type p_hint, const String &p_hint_text);
 	void setup(Type p_hint, const String &p_hint_text);
-	virtual void update_property();
+	virtual void update_property() override;
 	EditorPropertyMember();
 	EditorPropertyMember();
 };
 };
 
 
@@ -193,7 +193,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	EditorPropertyCheck();
 	EditorPropertyCheck();
 };
 };
 
 
@@ -208,7 +208,7 @@ protected:
 
 
 public:
 public:
 	void setup(const Vector<String> &p_options);
 	void setup(const Vector<String> &p_options);
-	virtual void update_property();
+	virtual void update_property() override;
 	void set_option_button_clip(bool p_enable);
 	void set_option_button_clip(bool p_enable);
 	EditorPropertyEnum();
 	EditorPropertyEnum();
 };
 };
@@ -226,7 +226,7 @@ protected:
 
 
 public:
 public:
 	void setup(const Vector<String> &p_options);
 	void setup(const Vector<String> &p_options);
-	virtual void update_property();
+	virtual void update_property() override;
 	EditorPropertyFlags();
 	EditorPropertyFlags();
 };
 };
 
 
@@ -258,7 +258,7 @@ protected:
 
 
 public:
 public:
 	void setup(LayerType p_layer_type);
 	void setup(LayerType p_layer_type);
-	virtual void update_property();
+	virtual void update_property() override;
 	EditorPropertyLayers();
 	EditorPropertyLayers();
 };
 };
 
 
@@ -272,7 +272,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(int64_t p_min, int64_t p_max, int64_t p_step, bool p_allow_greater, bool p_allow_lesser);
 	void setup(int64_t p_min, int64_t p_max, int64_t p_step, bool p_allow_greater, bool p_allow_lesser);
 	EditorPropertyInteger();
 	EditorPropertyInteger();
 };
 };
@@ -287,7 +287,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(const String &p_base_type);
 	void setup(const String &p_base_type);
 	EditorPropertyObjectID();
 	EditorPropertyObjectID();
 };
 };
@@ -302,7 +302,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider, bool p_exp_range, bool p_greater, bool p_lesser);
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider, bool p_exp_range, bool p_greater, bool p_lesser);
 	EditorPropertyFloat();
 	EditorPropertyFloat();
 };
 };
@@ -343,7 +343,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(bool p_full, bool p_flip);
 	void setup(bool p_full, bool p_flip);
 	EditorPropertyEasing();
 	EditorPropertyEasing();
 };
 };
@@ -359,7 +359,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	EditorPropertyVector2(bool p_force_wide = false);
 	EditorPropertyVector2(bool p_force_wide = false);
 };
 };
@@ -375,7 +375,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	EditorPropertyRect2(bool p_force_wide = false);
 	EditorPropertyRect2(bool p_force_wide = false);
 };
 };
@@ -391,7 +391,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	virtual void update_using_vector(Vector3 p_vector);
 	virtual void update_using_vector(Vector3 p_vector);
 	virtual Vector3 get_vector();
 	virtual Vector3 get_vector();
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
@@ -409,7 +409,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(int p_min, int p_max, bool p_no_slider);
 	void setup(int p_min, int p_max, bool p_no_slider);
 	EditorPropertyVector2i(bool p_force_wide = false);
 	EditorPropertyVector2i(bool p_force_wide = false);
 };
 };
@@ -425,7 +425,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(int p_min, int p_max, bool p_no_slider);
 	void setup(int p_min, int p_max, bool p_no_slider);
 	EditorPropertyRect2i(bool p_force_wide = false);
 	EditorPropertyRect2i(bool p_force_wide = false);
 };
 };
@@ -441,7 +441,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(int p_min, int p_max, bool p_no_slider);
 	void setup(int p_min, int p_max, bool p_no_slider);
 	EditorPropertyVector3i(bool p_force_wide = false);
 	EditorPropertyVector3i(bool p_force_wide = false);
 };
 };
@@ -457,7 +457,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	EditorPropertyPlane(bool p_force_wide = false);
 	EditorPropertyPlane(bool p_force_wide = false);
 };
 };
@@ -473,7 +473,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	EditorPropertyQuat();
 	EditorPropertyQuat();
 };
 };
@@ -489,7 +489,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	EditorPropertyAABB();
 	EditorPropertyAABB();
 };
 };
@@ -505,7 +505,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	EditorPropertyTransform2D();
 	EditorPropertyTransform2D();
 };
 };
@@ -521,7 +521,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	EditorPropertyBasis();
 	EditorPropertyBasis();
 };
 };
@@ -537,7 +537,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	virtual void update_using_transform(Transform p_transform);
 	virtual void update_using_transform(Transform p_transform);
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	void setup(double p_min, double p_max, double p_step, bool p_no_slider);
 	EditorPropertyTransform();
 	EditorPropertyTransform();
@@ -554,7 +554,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(bool p_show_alpha);
 	void setup(bool p_show_alpha);
 	EditorPropertyColor();
 	EditorPropertyColor();
 };
 };
@@ -577,7 +577,7 @@ protected:
 	void _notification(int p_what);
 	void _notification(int p_what);
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(const NodePath &p_base_hint, Vector<StringName> p_valid_types, bool p_use_path_from_scene_root = true);
 	void setup(const NodePath &p_base_hint, Vector<StringName> p_valid_types, bool p_use_path_from_scene_root = true);
 	EditorPropertyNodePath();
 	EditorPropertyNodePath();
 };
 };
@@ -587,7 +587,7 @@ class EditorPropertyRID : public EditorProperty {
 	Label *label;
 	Label *label;
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	EditorPropertyRID();
 	EditorPropertyRID();
 };
 };
 
 
@@ -657,11 +657,11 @@ protected:
 	void _notification(int p_what);
 	void _notification(int p_what);
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(const String &p_base_type);
 	void setup(const String &p_base_type);
 
 
-	void collapse_all_folding();
-	void expand_all_folding();
+	void collapse_all_folding() override;
+	void expand_all_folding() override;
 
 
 	void set_use_sub_inspector(bool p_enable);
 	void set_use_sub_inspector(bool p_enable);
 
 
@@ -675,10 +675,10 @@ class EditorInspectorDefaultPlugin : public EditorInspectorPlugin {
 	GDCLASS(EditorInspectorDefaultPlugin, EditorInspectorPlugin);
 	GDCLASS(EditorInspectorDefaultPlugin, EditorInspectorPlugin);
 
 
 public:
 public:
-	virtual bool can_handle(Object *p_object);
-	virtual void parse_begin(Object *p_object);
-	virtual bool parse_property(Object *p_object, Variant::Type p_type, const String &p_path, PropertyHint p_hint, const String &p_hint_text, int p_usage, bool p_wide = false);
-	virtual void parse_end();
+	virtual bool can_handle(Object *p_object) override;
+	virtual void parse_begin(Object *p_object) override;
+	virtual bool parse_property(Object *p_object, Variant::Type p_type, const String &p_path, PropertyHint p_hint, const String &p_hint_text, int p_usage, bool p_wide = false) override;
+	virtual void parse_end() override;
 };
 };
 
 
 #endif // EDITOR_PROPERTIES_H
 #endif // EDITOR_PROPERTIES_H

+ 2 - 2
editor/editor_properties_array_dict.h

@@ -118,7 +118,7 @@ protected:
 
 
 public:
 public:
 	void setup(Variant::Type p_array_type, const String &p_hint_string = "");
 	void setup(Variant::Type p_array_type, const String &p_hint_string = "");
-	virtual void update_property();
+	virtual void update_property() override;
 	EditorPropertyArray();
 	EditorPropertyArray();
 };
 };
 
 
@@ -152,7 +152,7 @@ protected:
 	void _notification(int p_what);
 	void _notification(int p_what);
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	EditorPropertyDictionary();
 	EditorPropertyDictionary();
 };
 };
 
 

+ 2 - 2
editor/editor_spin_slider.h

@@ -87,7 +87,7 @@ protected:
 	void _focus_entered();
 	void _focus_entered();
 
 
 public:
 public:
-	String get_tooltip(const Point2 &p_pos) const;
+	String get_tooltip(const Point2 &p_pos) const override;
 
 
 	String get_text_value() const;
 	String get_text_value() const;
 	void set_label(const String &p_label);
 	void set_label(const String &p_label);
@@ -107,7 +107,7 @@ public:
 	void setup_and_show() { _focus_entered(); }
 	void setup_and_show() { _focus_entered(); }
 	LineEdit *get_line_edit() { return value_input; }
 	LineEdit *get_line_edit() { return value_input; }
 
 
-	virtual Size2 get_minimum_size() const;
+	virtual Size2 get_minimum_size() const override;
 	EditorSpinSlider();
 	EditorSpinSlider();
 };
 };
 
 

+ 1 - 1
editor/editor_sub_scene.h

@@ -53,7 +53,7 @@ class EditorSubScene : public ConfirmationDialog {
 	void _remove_selection_child(Node *p_node);
 	void _remove_selection_child(Node *p_node);
 	void _reown(Node *p_node, List<Node *> *p_to_reown);
 	void _reown(Node *p_node, List<Node *> *p_to_reown);
 
 
-	void ok_pressed();
+	void ok_pressed() override;
 
 
 protected:
 protected:
 	void _notification(int p_what);
 	void _notification(int p_what);

+ 1 - 1
editor/export_template_manager.h

@@ -69,7 +69,7 @@ class ExportTemplateManager : public ConfirmationDialog {
 	void _uninstall_template(const String &p_version);
 	void _uninstall_template(const String &p_version);
 	void _uninstall_template_confirm();
 	void _uninstall_template_confirm();
 
 
-	virtual void ok_pressed();
+	virtual void ok_pressed() override;
 	bool _install_from_file(const String &p_file, bool p_use_progress = true);
 	bool _install_from_file(const String &p_file, bool p_use_progress = true);
 
 
 	void _http_download_mirror_completed(int p_status, int p_code, const PackedStringArray &headers, const PackedByteArray &p_data);
 	void _http_download_mirror_completed(int p_status, int p_code, const PackedStringArray &headers, const PackedByteArray &p_data);

+ 1 - 1
editor/find_in_files.h

@@ -123,7 +123,7 @@ protected:
 	void _notification(int p_what);
 	void _notification(int p_what);
 
 
 	void _visibility_changed();
 	void _visibility_changed();
-	void custom_action(const String &p_action);
+	void custom_action(const String &p_action) override;
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 private:
 private:

+ 4 - 4
editor/import/editor_import_collada.h

@@ -37,10 +37,10 @@ class EditorSceneImporterCollada : public EditorSceneImporter {
 	GDCLASS(EditorSceneImporterCollada, EditorSceneImporter);
 	GDCLASS(EditorSceneImporterCollada, EditorSceneImporter);
 
 
 public:
 public:
-	virtual uint32_t get_import_flags() const;
-	virtual void get_extensions(List<String> *r_extensions) const;
-	virtual Node *import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps = nullptr, Error *r_err = nullptr);
-	virtual Ref<Animation> import_animation(const String &p_path, uint32_t p_flags, int p_bake_fps);
+	virtual uint32_t get_import_flags() const override;
+	virtual void get_extensions(List<String> *r_extensions) const override;
+	virtual Node *import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps = nullptr, Error *r_err = nullptr) override;
+	virtual Ref<Animation> import_animation(const String &p_path, uint32_t p_flags, int p_bake_fps) override;
 
 
 	EditorSceneImporterCollada();
 	EditorSceneImporterCollada();
 };
 };

+ 12 - 12
editor/import/editor_import_plugin.h

@@ -41,18 +41,18 @@ protected:
 
 
 public:
 public:
 	EditorImportPlugin();
 	EditorImportPlugin();
-	virtual String get_importer_name() const;
-	virtual String get_visible_name() const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual String get_preset_name(int p_idx) const;
-	virtual int get_preset_count() const;
-	virtual String get_save_extension() const;
-	virtual String get_resource_type() const;
-	virtual float get_priority() const;
-	virtual int get_import_order() const;
-	virtual void get_import_options(List<ImportOption> *r_options, int p_preset) const;
-	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const;
-	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata = nullptr);
+	virtual String get_importer_name() const override;
+	virtual String get_visible_name() const override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual String get_preset_name(int p_idx) const override;
+	virtual int get_preset_count() const override;
+	virtual String get_save_extension() const override;
+	virtual String get_resource_type() const override;
+	virtual float get_priority() const override;
+	virtual int get_import_order() const override;
+	virtual void get_import_options(List<ImportOption> *r_options, int p_preset) const override;
+	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
+	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata = nullptr) override;
 };
 };
 
 
 #endif //EDITOR_IMPORT_PLUGIN_H
 #endif //EDITOR_IMPORT_PLUGIN_H

+ 4 - 4
editor/import/editor_scene_importer_gltf.h

@@ -387,10 +387,10 @@ class EditorSceneImporterGLTF : public EditorSceneImporter {
 	void _import_animation(GLTFState &state, AnimationPlayer *ap, const GLTFAnimationIndex index, const int bake_fps);
 	void _import_animation(GLTFState &state, AnimationPlayer *ap, const GLTFAnimationIndex index, const int bake_fps);
 
 
 public:
 public:
-	virtual uint32_t get_import_flags() const;
-	virtual void get_extensions(List<String> *r_extensions) const;
-	virtual Node *import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps = nullptr, Error *r_err = nullptr);
-	virtual Ref<Animation> import_animation(const String &p_path, uint32_t p_flags, int p_bake_fps);
+	virtual uint32_t get_import_flags() const override;
+	virtual void get_extensions(List<String> *r_extensions) const override;
+	virtual Node *import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps = nullptr, Error *r_err = nullptr) override;
+	virtual Ref<Animation> import_animation(const String &p_path, uint32_t p_flags, int p_bake_fps) override;
 
 
 	EditorSceneImporterGLTF();
 	EditorSceneImporterGLTF();
 };
 };

+ 12 - 12
editor/import/resource_importer_bitmask.h

@@ -40,18 +40,18 @@ class ResourceImporterBitMap : public ResourceImporter {
 	GDCLASS(ResourceImporterBitMap, ResourceImporter);
 	GDCLASS(ResourceImporterBitMap, ResourceImporter);
 
 
 public:
 public:
-	virtual String get_importer_name() const;
-	virtual String get_visible_name() const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual String get_save_extension() const;
-	virtual String get_resource_type() const;
-
-	virtual int get_preset_count() const;
-	virtual String get_preset_name(int p_idx) const;
-
-	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const;
-	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const;
-	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr);
+	virtual String get_importer_name() const override;
+	virtual String get_visible_name() const override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual String get_save_extension() const override;
+	virtual String get_resource_type() const override;
+
+	virtual int get_preset_count() const override;
+	virtual String get_preset_name(int p_idx) const override;
+
+	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const override;
+	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
+	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 
 	ResourceImporterBitMap();
 	ResourceImporterBitMap();
 	~ResourceImporterBitMap();
 	~ResourceImporterBitMap();

+ 10 - 10
editor/import/resource_importer_csv.h

@@ -37,19 +37,19 @@ class ResourceImporterCSV : public ResourceImporter {
 	GDCLASS(ResourceImporterCSV, ResourceImporter);
 	GDCLASS(ResourceImporterCSV, ResourceImporter);
 
 
 public:
 public:
-	virtual String get_importer_name() const;
-	virtual String get_visible_name() const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual String get_save_extension() const;
-	virtual String get_resource_type() const;
+	virtual String get_importer_name() const override;
+	virtual String get_visible_name() const override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual String get_save_extension() const override;
+	virtual String get_resource_type() const override;
 
 
-	virtual int get_preset_count() const;
-	virtual String get_preset_name(int p_idx) const;
+	virtual int get_preset_count() const override;
+	virtual String get_preset_name(int p_idx) const override;
 
 
-	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const;
-	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const;
+	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const override;
+	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
 
 
-	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr);
+	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 
 	ResourceImporterCSV();
 	ResourceImporterCSV();
 };
 };

+ 10 - 10
editor/import/resource_importer_csv_translation.h

@@ -37,19 +37,19 @@ class ResourceImporterCSVTranslation : public ResourceImporter {
 	GDCLASS(ResourceImporterCSVTranslation, ResourceImporter);
 	GDCLASS(ResourceImporterCSVTranslation, ResourceImporter);
 
 
 public:
 public:
-	virtual String get_importer_name() const;
-	virtual String get_visible_name() const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual String get_save_extension() const;
-	virtual String get_resource_type() const;
+	virtual String get_importer_name() const override;
+	virtual String get_visible_name() const override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual String get_save_extension() const override;
+	virtual String get_resource_type() const override;
 
 
-	virtual int get_preset_count() const;
-	virtual String get_preset_name(int p_idx) const;
+	virtual int get_preset_count() const override;
+	virtual String get_preset_name(int p_idx) const override;
 
 
-	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const;
-	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const;
+	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const override;
+	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
 
 
-	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr);
+	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 
 	ResourceImporterCSVTranslation();
 	ResourceImporterCSVTranslation();
 };
 };

+ 10 - 10
editor/import/resource_importer_image.h

@@ -38,19 +38,19 @@ class ResourceImporterImage : public ResourceImporter {
 	GDCLASS(ResourceImporterImage, ResourceImporter);
 	GDCLASS(ResourceImporterImage, ResourceImporter);
 
 
 public:
 public:
-	virtual String get_importer_name() const;
-	virtual String get_visible_name() const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual String get_save_extension() const;
-	virtual String get_resource_type() const;
+	virtual String get_importer_name() const override;
+	virtual String get_visible_name() const override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual String get_save_extension() const override;
+	virtual String get_resource_type() const override;
 
 
-	virtual int get_preset_count() const;
-	virtual String get_preset_name(int p_idx) const;
+	virtual int get_preset_count() const override;
+	virtual String get_preset_name(int p_idx) const override;
 
 
-	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const;
-	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const;
+	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const override;
+	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
 
 
-	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr);
+	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 
 	ResourceImporterImage();
 	ResourceImporterImage();
 };
 };

+ 12 - 12
editor/import/resource_importer_layered_texture.h

@@ -101,11 +101,11 @@ protected:
 
 
 public:
 public:
 	static ResourceImporterLayeredTexture *get_singleton() { return singleton; }
 	static ResourceImporterLayeredTexture *get_singleton() { return singleton; }
-	virtual String get_importer_name() const;
-	virtual String get_visible_name() const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual String get_save_extension() const;
-	virtual String get_resource_type() const;
+	virtual String get_importer_name() const override;
+	virtual String get_visible_name() const override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual String get_save_extension() const override;
+	virtual String get_resource_type() const override;
 
 
 	enum CompressMode {
 	enum CompressMode {
 		COMPRESS_LOSSLESS,
 		COMPRESS_LOSSLESS,
@@ -115,20 +115,20 @@ public:
 		COMPRESS_BASIS_UNIVERSAL
 		COMPRESS_BASIS_UNIVERSAL
 	};
 	};
 
 
-	virtual int get_preset_count() const;
-	virtual String get_preset_name(int p_idx) const;
+	virtual int get_preset_count() const override;
+	virtual String get_preset_name(int p_idx) const override;
 
 
-	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const;
-	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const;
+	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const override;
+	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
 
 
 	void _save_tex(Vector<Ref<Image>> p_images, const String &p_to_path, int p_compress_mode, float p_lossy, Image::CompressMode p_vram_compression, Image::CompressSource p_csource, Image::UsedChannels used_channels, bool p_mipmaps, bool p_force_po2);
 	void _save_tex(Vector<Ref<Image>> p_images, const String &p_to_path, int p_compress_mode, float p_lossy, Image::CompressMode p_vram_compression, Image::CompressSource p_csource, Image::UsedChannels used_channels, bool p_mipmaps, bool p_force_po2);
 
 
-	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr);
+	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 
 	void update_imports();
 	void update_imports();
 
 
-	virtual bool are_import_settings_valid(const String &p_path) const;
-	virtual String get_import_settings_string() const;
+	virtual bool are_import_settings_valid(const String &p_path) const override;
+	virtual String get_import_settings_string() const override;
 
 
 	void set_mode(Mode p_mode) { mode = p_mode; }
 	void set_mode(Mode p_mode) { mode = p_mode; }
 
 

+ 14 - 14
editor/import/resource_importer_obj.h

@@ -37,10 +37,10 @@ class EditorOBJImporter : public EditorSceneImporter {
 	GDCLASS(EditorOBJImporter, EditorSceneImporter);
 	GDCLASS(EditorOBJImporter, EditorSceneImporter);
 
 
 public:
 public:
-	virtual uint32_t get_import_flags() const;
-	virtual void get_extensions(List<String> *r_extensions) const;
-	virtual Node *import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps, Error *r_err = nullptr);
-	virtual Ref<Animation> import_animation(const String &p_path, uint32_t p_flags, int p_bake_fps);
+	virtual uint32_t get_import_flags() const override;
+	virtual void get_extensions(List<String> *r_extensions) const override;
+	virtual Node *import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps, Error *r_err = nullptr) override;
+	virtual Ref<Animation> import_animation(const String &p_path, uint32_t p_flags, int p_bake_fps) override;
 
 
 	EditorOBJImporter();
 	EditorOBJImporter();
 };
 };
@@ -49,19 +49,19 @@ class ResourceImporterOBJ : public ResourceImporter {
 	GDCLASS(ResourceImporterOBJ, ResourceImporter);
 	GDCLASS(ResourceImporterOBJ, ResourceImporter);
 
 
 public:
 public:
-	virtual String get_importer_name() const;
-	virtual String get_visible_name() const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual String get_save_extension() const;
-	virtual String get_resource_type() const;
+	virtual String get_importer_name() const override;
+	virtual String get_visible_name() const override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual String get_save_extension() const override;
+	virtual String get_resource_type() const override;
 
 
-	virtual int get_preset_count() const;
-	virtual String get_preset_name(int p_idx) const;
+	virtual int get_preset_count() const override;
+	virtual String get_preset_name(int p_idx) const override;
 
 
-	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const;
-	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const;
+	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const override;
+	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
 
 
-	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr);
+	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 
 	ResourceImporterOBJ();
 	ResourceImporterOBJ();
 };
 };

+ 15 - 15
editor/import/resource_importer_scene.h

@@ -128,18 +128,18 @@ public:
 	void add_importer(Ref<EditorSceneImporter> p_importer) { importers.insert(p_importer); }
 	void add_importer(Ref<EditorSceneImporter> p_importer) { importers.insert(p_importer); }
 	void remove_importer(Ref<EditorSceneImporter> p_importer) { importers.erase(p_importer); }
 	void remove_importer(Ref<EditorSceneImporter> p_importer) { importers.erase(p_importer); }
 
 
-	virtual String get_importer_name() const;
-	virtual String get_visible_name() const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual String get_save_extension() const;
-	virtual String get_resource_type() const;
+	virtual String get_importer_name() const override;
+	virtual String get_visible_name() const override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual String get_save_extension() const override;
+	virtual String get_resource_type() const override;
 
 
-	virtual int get_preset_count() const;
-	virtual String get_preset_name(int p_idx) const;
+	virtual int get_preset_count() const override;
+	virtual String get_preset_name(int p_idx) const override;
 
 
-	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const;
-	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const;
-	virtual int get_import_order() const { return 100; } //after everything
+	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const override;
+	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
+	virtual int get_import_order() const override { return 100; } //after everything
 
 
 	void _find_meshes(Node *p_node, Map<Ref<ArrayMesh>, Transform> &meshes);
 	void _find_meshes(Node *p_node, Map<Ref<ArrayMesh>, Transform> &meshes);
 
 
@@ -152,7 +152,7 @@ public:
 	void _filter_tracks(Node *scene, const String &p_text);
 	void _filter_tracks(Node *scene, const String &p_text);
 	void _optimize_animations(Node *scene, float p_max_lin_error, float p_max_ang_error, float p_max_angle);
 	void _optimize_animations(Node *scene, float p_max_lin_error, float p_max_ang_error, float p_max_angle);
 
 
-	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr);
+	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 
 	Node *import_scene_from_other_importer(EditorSceneImporter *p_exception, const String &p_path, uint32_t p_flags, int p_bake_fps);
 	Node *import_scene_from_other_importer(EditorSceneImporter *p_exception, const String &p_path, uint32_t p_flags, int p_bake_fps);
 	Ref<Animation> import_animation_from_other_importer(EditorSceneImporter *p_exception, const String &p_path, uint32_t p_flags, int p_bake_fps);
 	Ref<Animation> import_animation_from_other_importer(EditorSceneImporter *p_exception, const String &p_path, uint32_t p_flags, int p_bake_fps);
@@ -164,10 +164,10 @@ class EditorSceneImporterESCN : public EditorSceneImporter {
 	GDCLASS(EditorSceneImporterESCN, EditorSceneImporter);
 	GDCLASS(EditorSceneImporterESCN, EditorSceneImporter);
 
 
 public:
 public:
-	virtual uint32_t get_import_flags() const;
-	virtual void get_extensions(List<String> *r_extensions) const;
-	virtual Node *import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps, Error *r_err = nullptr);
-	virtual Ref<Animation> import_animation(const String &p_path, uint32_t p_flags, int p_bake_fps);
+	virtual uint32_t get_import_flags() const override;
+	virtual void get_extensions(List<String> *r_extensions) const override;
+	virtual Node *import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps, Error *r_err = nullptr) override;
+	virtual Ref<Animation> import_animation(const String &p_path, uint32_t p_flags, int p_bake_fps) override;
 };
 };
 
 
 #endif // RESOURCEIMPORTERSCENE_H
 #endif // RESOURCEIMPORTERSCENE_H

+ 10 - 10
editor/import/resource_importer_shader_file.h

@@ -37,19 +37,19 @@ class ResourceImporterShaderFile : public ResourceImporter {
 	GDCLASS(ResourceImporterShaderFile, ResourceImporter);
 	GDCLASS(ResourceImporterShaderFile, ResourceImporter);
 
 
 public:
 public:
-	virtual String get_importer_name() const;
-	virtual String get_visible_name() const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual String get_save_extension() const;
-	virtual String get_resource_type() const;
+	virtual String get_importer_name() const override;
+	virtual String get_visible_name() const override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual String get_save_extension() const override;
+	virtual String get_resource_type() const override;
 
 
-	virtual int get_preset_count() const;
-	virtual String get_preset_name(int p_idx) const;
+	virtual int get_preset_count() const override;
+	virtual String get_preset_name(int p_idx) const override;
 
 
-	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const;
-	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const;
+	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const override;
+	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
 
 
-	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr);
+	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 
 	ResourceImporterShaderFile();
 	ResourceImporterShaderFile();
 };
 };

+ 12 - 12
editor/import/resource_importer_texture.h

@@ -84,11 +84,11 @@ public:
 	static void save_to_stex_format(FileAccess *f, const Ref<Image> &p_image, CompressMode p_compress_mode, Image::UsedChannels p_channels, Image::CompressMode p_compress_format, float p_lossy_quality);
 	static void save_to_stex_format(FileAccess *f, const Ref<Image> &p_image, CompressMode p_compress_mode, Image::UsedChannels p_channels, Image::CompressMode p_compress_format, float p_lossy_quality);
 
 
 	static ResourceImporterTexture *get_singleton() { return singleton; }
 	static ResourceImporterTexture *get_singleton() { return singleton; }
-	virtual String get_importer_name() const;
-	virtual String get_visible_name() const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual String get_save_extension() const;
-	virtual String get_resource_type() const;
+	virtual String get_importer_name() const override;
+	virtual String get_visible_name() const override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual String get_save_extension() const override;
+	virtual String get_resource_type() const override;
 
 
 	enum Preset {
 	enum Preset {
 		PRESET_DETECT,
 		PRESET_DETECT,
@@ -96,18 +96,18 @@ public:
 		PRESET_3D,
 		PRESET_3D,
 	};
 	};
 
 
-	virtual int get_preset_count() const;
-	virtual String get_preset_name(int p_idx) const;
+	virtual int get_preset_count() const override;
+	virtual String get_preset_name(int p_idx) const override;
 
 
-	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const;
-	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const;
+	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const override;
+	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
 
 
-	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr);
+	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 
 	void update_imports();
 	void update_imports();
 
 
-	virtual bool are_import_settings_valid(const String &p_path) const;
-	virtual String get_import_settings_string() const;
+	virtual bool are_import_settings_valid(const String &p_path) const override;
+	virtual String get_import_settings_string() const override;
 
 
 	ResourceImporterTexture();
 	ResourceImporterTexture();
 	~ResourceImporterTexture();
 	~ResourceImporterTexture();

+ 12 - 12
editor/import/resource_importer_texture_atlas.h

@@ -50,21 +50,21 @@ public:
 		IMPORT_MODE_2D_MESH
 		IMPORT_MODE_2D_MESH
 	};
 	};
 
 
-	virtual String get_importer_name() const;
-	virtual String get_visible_name() const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual String get_save_extension() const;
-	virtual String get_resource_type() const;
+	virtual String get_importer_name() const override;
+	virtual String get_visible_name() const override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual String get_save_extension() const override;
+	virtual String get_resource_type() const override;
 
 
-	virtual int get_preset_count() const;
-	virtual String get_preset_name(int p_idx) const;
+	virtual int get_preset_count() const override;
+	virtual String get_preset_name(int p_idx) const override;
 
 
-	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const;
-	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const;
-	virtual String get_option_group_file() const;
+	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const override;
+	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
+	virtual String get_option_group_file() const override;
 
 
-	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr);
-	virtual Error import_group_file(const String &p_group_file, const Map<String, Map<StringName, Variant>> &p_source_file_options, const Map<String, String> &p_base_paths);
+	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
+	virtual Error import_group_file(const String &p_group_file, const Map<String, Map<StringName, Variant>> &p_source_file_options, const Map<String, String> &p_base_paths) override;
 
 
 	ResourceImporterTextureAtlas();
 	ResourceImporterTextureAtlas();
 };
 };

+ 10 - 10
editor/import/resource_importer_wav.h

@@ -37,17 +37,17 @@ class ResourceImporterWAV : public ResourceImporter {
 	GDCLASS(ResourceImporterWAV, ResourceImporter);
 	GDCLASS(ResourceImporterWAV, ResourceImporter);
 
 
 public:
 public:
-	virtual String get_importer_name() const;
-	virtual String get_visible_name() const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual String get_save_extension() const;
-	virtual String get_resource_type() const;
+	virtual String get_importer_name() const override;
+	virtual String get_visible_name() const override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual String get_save_extension() const override;
+	virtual String get_resource_type() const override;
 
 
-	virtual int get_preset_count() const;
-	virtual String get_preset_name(int p_idx) const;
+	virtual int get_preset_count() const override;
+	virtual String get_preset_name(int p_idx) const override;
 
 
-	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const;
-	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const;
+	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const override;
+	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
 
 
 	static void _compress_ima_adpcm(const Vector<float> &p_data, Vector<uint8_t> &dst_data) {
 	static void _compress_ima_adpcm(const Vector<float> &p_data, Vector<uint8_t> &dst_data) {
 		/*p_sample_data->data = (void*)malloc(len);
 		/*p_sample_data->data = (void*)malloc(len);
@@ -162,7 +162,7 @@ public:
 		}
 		}
 	}
 	}
 
 
-	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr);
+	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 
 	ResourceImporterWAV();
 	ResourceImporterWAV();
 };
 };

+ 149 - 149
editor/node_3d_editor_gizmos.h

@@ -40,15 +40,15 @@ class Light3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(Light3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(Light3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
 
 
-	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
-	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) override;
+	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false) override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
 	Light3DGizmoPlugin();
 	Light3DGizmoPlugin();
 };
 };
@@ -57,15 +57,15 @@ class AudioStreamPlayer3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(AudioStreamPlayer3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(AudioStreamPlayer3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
 
 
-	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
-	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) override;
+	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false) override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
 	AudioStreamPlayer3DGizmoPlugin();
 	AudioStreamPlayer3DGizmoPlugin();
 };
 };
@@ -74,15 +74,15 @@ class Camera3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(Camera3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(Camera3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
 
 
-	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
-	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) override;
+	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false) override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
 	Camera3DGizmoPlugin();
 	Camera3DGizmoPlugin();
 };
 };
@@ -91,11 +91,11 @@ class MeshInstance3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(MeshInstance3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(MeshInstance3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	bool can_be_hidden() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	bool can_be_hidden() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
 	MeshInstance3DGizmoPlugin();
 	MeshInstance3DGizmoPlugin();
 };
 };
@@ -104,11 +104,11 @@ class Sprite3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(Sprite3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(Sprite3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	bool can_be_hidden() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	bool can_be_hidden() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
 	Sprite3DGizmoPlugin();
 	Sprite3DGizmoPlugin();
 };
 };
@@ -120,10 +120,10 @@ class Position3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	Vector<Vector3> cursor_points;
 	Vector<Vector3> cursor_points;
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
 	Position3DGizmoPlugin();
 	Position3DGizmoPlugin();
 };
 };
@@ -132,10 +132,10 @@ class Skeleton3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(Skeleton3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(Skeleton3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
 	Skeleton3DGizmoPlugin();
 	Skeleton3DGizmoPlugin();
 };
 };
@@ -144,10 +144,10 @@ class PhysicalBone3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(PhysicalBone3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(PhysicalBone3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
 	PhysicalBone3DGizmoPlugin();
 	PhysicalBone3DGizmoPlugin();
 };
 };
@@ -156,10 +156,10 @@ class RayCast3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(RayCast3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(RayCast3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
 	RayCast3DGizmoPlugin();
 	RayCast3DGizmoPlugin();
 };
 };
@@ -168,10 +168,10 @@ class SpringArm3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(SpringArm3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(SpringArm3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
 	SpringArm3DGizmoPlugin();
 	SpringArm3DGizmoPlugin();
 };
 };
@@ -180,10 +180,10 @@ class VehicleWheel3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(VehicleWheel3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(VehicleWheel3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
 	VehicleWheel3DGizmoPlugin();
 	VehicleWheel3DGizmoPlugin();
 };
 };
@@ -192,16 +192,16 @@ class SoftBody3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(SoftBody3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(SoftBody3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	bool is_selectable_when_hidden() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	bool is_selectable_when_hidden() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
-	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel);
-	bool is_handle_highlighted(const EditorNode3DGizmo *p_gizmo, int idx) const;
+	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel) override;
+	bool is_handle_highlighted(const EditorNode3DGizmo *p_gizmo, int idx) const override;
 
 
 	SoftBody3DGizmoPlugin();
 	SoftBody3DGizmoPlugin();
 };
 };
@@ -210,15 +210,15 @@ class VisibilityNotifier3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(VisibilityNotifier3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(VisibilityNotifier3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
-	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
-	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
+	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) override;
+	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false) override;
 
 
 	VisibilityNotifier3DGizmoPlugin();
 	VisibilityNotifier3DGizmoPlugin();
 };
 };
@@ -227,11 +227,11 @@ class CPUParticles3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(CPUParticles3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(CPUParticles3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	bool is_selectable_when_hidden() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	bool is_selectable_when_hidden() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 	CPUParticles3DGizmoPlugin();
 	CPUParticles3DGizmoPlugin();
 };
 };
 
 
@@ -239,16 +239,16 @@ class GPUParticles3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(GPUParticles3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(GPUParticles3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	bool is_selectable_when_hidden() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	bool is_selectable_when_hidden() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
-	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
-	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
+	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) override;
+	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false) override;
 
 
 	GPUParticles3DGizmoPlugin();
 	GPUParticles3DGizmoPlugin();
 };
 };
@@ -257,15 +257,15 @@ class ReflectionProbeGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(ReflectionProbeGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(ReflectionProbeGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
-	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
-	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
+	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) override;
+	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false) override;
 
 
 	ReflectionProbeGizmoPlugin();
 	ReflectionProbeGizmoPlugin();
 };
 };
@@ -274,15 +274,15 @@ class DecalGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(DecalGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(DecalGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
-	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
-	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
+	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) override;
+	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false) override;
 
 
 	DecalGizmoPlugin();
 	DecalGizmoPlugin();
 };
 };
@@ -291,15 +291,15 @@ class GIProbeGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(GIProbeGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(GIProbeGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
-	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
-	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
+	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) override;
+	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false) override;
 
 
 	GIProbeGizmoPlugin();
 	GIProbeGizmoPlugin();
 };
 };
@@ -308,15 +308,15 @@ class BakedLightmapGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(BakedLightmapGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(BakedLightmapGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
-	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
-	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
+	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) override;
+	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false) override;
 
 
 	BakedLightmapGizmoPlugin();
 	BakedLightmapGizmoPlugin();
 };
 };
@@ -325,15 +325,15 @@ class LightmapProbeGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(LightmapProbeGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(LightmapProbeGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
-	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
-	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
+	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) override;
+	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false) override;
 
 
 	LightmapProbeGizmoPlugin();
 	LightmapProbeGizmoPlugin();
 };
 };
@@ -342,15 +342,15 @@ class CollisionShape3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(CollisionShape3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(CollisionShape3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
-	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const;
-	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
-	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
+	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) override;
+	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false) override;
 
 
 	CollisionShape3DGizmoPlugin();
 	CollisionShape3DGizmoPlugin();
 };
 };
@@ -359,10 +359,10 @@ class CollisionPolygon3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(CollisionPolygon3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(CollisionPolygon3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 	CollisionPolygon3DGizmoPlugin();
 	CollisionPolygon3DGizmoPlugin();
 };
 };
 
 
@@ -377,10 +377,10 @@ class NavigationRegion3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	};
 	};
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
 	NavigationRegion3DGizmoPlugin();
 	NavigationRegion3DGizmoPlugin();
 };
 };
@@ -409,10 +409,10 @@ class Joint3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	void incremental_update_gizmos();
 	void incremental_update_gizmos();
 
 
 public:
 public:
-	bool has_gizmo(Node3D *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	void redraw(EditorNode3DGizmo *p_gizmo);
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
 
 
 	static void CreatePinJointGizmo(const Transform &p_offset, Vector<Vector3> &r_cursor_points);
 	static void CreatePinJointGizmo(const Transform &p_offset, Vector<Vector3> &r_cursor_points);
 	static void CreateHingeJointGizmo(const Transform &p_offset, const Transform &p_trs_joint, const Transform &p_trs_body_a, const Transform &p_trs_body_b, real_t p_limit_lower, real_t p_limit_upper, bool p_use_limit, Vector<Vector3> &r_common_points, Vector<Vector3> *r_body_a_points, Vector<Vector3> *r_body_b_points);
 	static void CreateHingeJointGizmo(const Transform &p_offset, const Transform &p_trs_joint, const Transform &p_trs_body_a, const Transform &p_trs_body_b, real_t p_limit_lower, real_t p_limit_upper, bool p_use_limit, Vector<Vector3> &r_common_points, Vector<Vector3> *r_body_a_points, Vector<Vector3> *r_body_b_points);

+ 8 - 8
editor/plugins/abstract_polygon_2d_editor.h

@@ -156,14 +156,14 @@ class AbstractPolygon2DEditorPlugin : public EditorPlugin {
 	String klass;
 	String klass;
 
 
 public:
 public:
-	virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) { return polygon_editor->forward_gui_input(p_event); }
-	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) { polygon_editor->forward_canvas_draw_over_viewport(p_overlay); }
-
-	bool has_main_screen() const { return false; }
-	virtual String get_name() const { return klass; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) override { return polygon_editor->forward_gui_input(p_event); }
+	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { polygon_editor->forward_canvas_draw_over_viewport(p_overlay); }
+
+	bool has_main_screen() const override { return false; }
+	virtual String get_name() const override { return klass; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	AbstractPolygon2DEditorPlugin(EditorNode *p_node, AbstractPolygon2DEditor *p_polygon_editor, String p_class);
 	AbstractPolygon2DEditorPlugin(EditorNode *p_node, AbstractPolygon2DEditor *p_polygon_editor, String p_class);
 	~AbstractPolygon2DEditorPlugin();
 	~AbstractPolygon2DEditorPlugin();

+ 2 - 2
editor/plugins/animation_blend_space_1d_editor.h

@@ -129,8 +129,8 @@ protected:
 
 
 public:
 public:
 	static AnimationNodeBlendSpace1DEditor *get_singleton() { return singleton; }
 	static AnimationNodeBlendSpace1DEditor *get_singleton() { return singleton; }
-	virtual bool can_edit(const Ref<AnimationNode> &p_node);
-	virtual void edit(const Ref<AnimationNode> &p_node);
+	virtual bool can_edit(const Ref<AnimationNode> &p_node) override;
+	virtual void edit(const Ref<AnimationNode> &p_node) override;
 	AnimationNodeBlendSpace1DEditor();
 	AnimationNodeBlendSpace1DEditor();
 };
 };
 
 

+ 2 - 2
editor/plugins/animation_blend_space_2d_editor.h

@@ -142,8 +142,8 @@ protected:
 
 
 public:
 public:
 	static AnimationNodeBlendSpace2DEditor *get_singleton() { return singleton; }
 	static AnimationNodeBlendSpace2DEditor *get_singleton() { return singleton; }
-	virtual bool can_edit(const Ref<AnimationNode> &p_node);
-	virtual void edit(const Ref<AnimationNode> &p_node);
+	virtual bool can_edit(const Ref<AnimationNode> &p_node) override;
+	virtual void edit(const Ref<AnimationNode> &p_node) override;
 	AnimationNodeBlendSpace2DEditor();
 	AnimationNodeBlendSpace2DEditor();
 };
 };
 
 

+ 3 - 3
editor/plugins/animation_blend_tree_editor_plugin.h

@@ -129,10 +129,10 @@ public:
 	void add_custom_type(const String &p_name, const Ref<Script> &p_script);
 	void add_custom_type(const String &p_name, const Ref<Script> &p_script);
 	void remove_custom_type(const Ref<Script> &p_script);
 	void remove_custom_type(const Ref<Script> &p_script);
 
 
-	virtual Size2 get_minimum_size() const;
+	virtual Size2 get_minimum_size() const override;
 
 
-	virtual bool can_edit(const Ref<AnimationNode> &p_node);
-	virtual void edit(const Ref<AnimationNode> &p_node);
+	virtual bool can_edit(const Ref<AnimationNode> &p_node) override;
+	virtual void edit(const Ref<AnimationNode> &p_node) override;
 
 
 	AnimationNodeBlendTreeEditor();
 	AnimationNodeBlendTreeEditor();
 };
 };

+ 8 - 8
editor/plugins/animation_player_editor_plugin.h

@@ -251,16 +251,16 @@ protected:
 	void _notification(int p_what);
 	void _notification(int p_what);
 
 
 public:
 public:
-	virtual Dictionary get_state() const { return anim_editor->get_state(); }
-	virtual void set_state(const Dictionary &p_state) { anim_editor->set_state(p_state); }
+	virtual Dictionary get_state() const override { return anim_editor->get_state(); }
+	virtual void set_state(const Dictionary &p_state) override { anim_editor->set_state(p_state); }
 
 
-	virtual String get_name() const { return "Anim"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "Anim"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
-	virtual void forward_canvas_force_draw_over_viewport(Control *p_overlay) { anim_editor->forward_canvas_force_draw_over_viewport(p_overlay); }
+	virtual void forward_canvas_force_draw_over_viewport(Control *p_overlay) override { anim_editor->forward_canvas_force_draw_over_viewport(p_overlay); }
 
 
 	AnimationPlayerEditorPlugin(EditorNode *p_node);
 	AnimationPlayerEditorPlugin(EditorNode *p_node);
 	~AnimationPlayerEditorPlugin();
 	~AnimationPlayerEditorPlugin();

+ 2 - 2
editor/plugins/animation_state_machine_editor.h

@@ -182,8 +182,8 @@ protected:
 
 
 public:
 public:
 	static AnimationNodeStateMachineEditor *get_singleton() { return singleton; }
 	static AnimationNodeStateMachineEditor *get_singleton() { return singleton; }
-	virtual bool can_edit(const Ref<AnimationNode> &p_node);
-	virtual void edit(const Ref<AnimationNode> &p_node);
+	virtual bool can_edit(const Ref<AnimationNode> &p_node) override;
+	virtual void edit(const Ref<AnimationNode> &p_node) override;
 	AnimationNodeStateMachineEditor();
 	AnimationNodeStateMachineEditor();
 };
 };
 
 

+ 5 - 5
editor/plugins/animation_tree_editor_plugin.h

@@ -101,11 +101,11 @@ class AnimationTreeEditorPlugin : public EditorPlugin {
 	Button *button;
 	Button *button;
 
 
 public:
 public:
-	virtual String get_name() const { return "AnimationTree"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "AnimationTree"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	AnimationTreeEditorPlugin(EditorNode *p_node);
 	AnimationTreeEditorPlugin(EditorNode *p_node);
 	~AnimationTreeEditorPlugin();
 	~AnimationTreeEditorPlugin();

+ 5 - 5
editor/plugins/asset_library_editor_plugin.h

@@ -311,11 +311,11 @@ class AssetLibraryEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "AssetLib"; }
-	bool has_main_screen() const { return true; }
-	virtual void edit(Object *p_object) {}
-	virtual bool handles(Object *p_object) const { return false; }
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "AssetLib"; }
+	bool has_main_screen() const override { return true; }
+	virtual void edit(Object *p_object) override {}
+	virtual bool handles(Object *p_object) const override { return false; }
+	virtual void make_visible(bool p_visible) override;
 	//virtual bool get_remove_list(List<Node*> *p_list) { return canvas_item_editor->get_remove_list(p_list); }
 	//virtual bool get_remove_list(List<Node*> *p_list) { return canvas_item_editor->get_remove_list(p_list); }
 	//virtual Dictionary get_state() const;
 	//virtual Dictionary get_state() const;
 	//virtual void set_state(const Dictionary& p_state);
 	//virtual void set_state(const Dictionary& p_state);

+ 6 - 6
editor/plugins/audio_stream_editor_plugin.h

@@ -63,7 +63,7 @@ protected:
 	void _draw_indicator();
 	void _draw_indicator();
 	void _on_input_indicator(Ref<InputEvent> p_event);
 	void _on_input_indicator(Ref<InputEvent> p_event);
 	void _seek_to(real_t p_x);
 	void _seek_to(real_t p_x);
-	void _changed_callback(Object *p_changed, const char *p_prop);
+	void _changed_callback(Object *p_changed, const char *p_prop) override;
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
@@ -78,11 +78,11 @@ class AudioStreamEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "Audio"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "Audio"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	AudioStreamEditorPlugin(EditorNode *p_node);
 	AudioStreamEditorPlugin(EditorNode *p_node);
 	~AudioStreamEditorPlugin();
 	~AudioStreamEditorPlugin();

+ 5 - 5
editor/plugins/baked_lightmap_editor_plugin.h

@@ -56,11 +56,11 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual String get_name() const { return "BakedLightmap"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "BakedLightmap"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	BakedLightmapEditorPlugin(EditorNode *p_node);
 	BakedLightmapEditorPlugin(EditorNode *p_node);
 	~BakedLightmapEditorPlugin();
 	~BakedLightmapEditorPlugin();

+ 5 - 5
editor/plugins/camera_3d_editor_plugin.h

@@ -60,11 +60,11 @@ class Camera3DEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "Camera3D"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "Camera3D"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	Camera3DEditorPlugin(EditorNode *p_node);
 	Camera3DEditorPlugin(EditorNode *p_node);
 	~Camera3DEditorPlugin();
 	~Camera3DEditorPlugin();

+ 9 - 9
editor/plugins/canvas_item_editor_plugin.h

@@ -649,13 +649,13 @@ class CanvasItemEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "2D"; }
-	bool has_main_screen() const { return true; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
-	virtual Dictionary get_state() const;
-	virtual void set_state(const Dictionary &p_state);
+	virtual String get_name() const override { return "2D"; }
+	bool has_main_screen() const override { return true; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
+	virtual Dictionary get_state() const override;
+	virtual void set_state(const Dictionary &p_state) override;
 
 
 	CanvasItemEditor *get_canvas_item_editor() { return canvas_item_editor; }
 	CanvasItemEditor *get_canvas_item_editor() { return canvas_item_editor; }
 
 
@@ -706,8 +706,8 @@ protected:
 	void _notification(int p_what);
 	void _notification(int p_what);
 
 
 public:
 public:
-	virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const;
-	virtual void drop_data(const Point2 &p_point, const Variant &p_data);
+	virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const override;
+	virtual void drop_data(const Point2 &p_point, const Variant &p_data) override;
 
 
 	CanvasItemEditorViewport(EditorNode *p_node, CanvasItemEditor *p_canvas_item_editor);
 	CanvasItemEditorViewport(EditorNode *p_node, CanvasItemEditor *p_canvas_item_editor);
 	~CanvasItemEditorViewport();
 	~CanvasItemEditorViewport();

+ 2 - 2
editor/plugins/collision_polygon_2d_editor_plugin.h

@@ -40,8 +40,8 @@ class CollisionPolygon2DEditor : public AbstractPolygon2DEditor {
 	CollisionPolygon2D *node;
 	CollisionPolygon2D *node;
 
 
 protected:
 protected:
-	virtual Node2D *_get_node() const;
-	virtual void _set_node(Node *p_polygon);
+	virtual Node2D *_get_node() const override;
+	virtual void _set_node(Node *p_polygon) override;
 
 
 public:
 public:
 	CollisionPolygon2DEditor(EditorNode *p_editor);
 	CollisionPolygon2DEditor(EditorNode *p_editor);

+ 6 - 6
editor/plugins/collision_polygon_3d_editor_plugin.h

@@ -101,13 +101,13 @@ class Polygon3DEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual bool forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) { return collision_polygon_editor->forward_spatial_gui_input(p_camera, p_event); }
+	virtual bool forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override { return collision_polygon_editor->forward_spatial_gui_input(p_camera, p_event); }
 
 
-	virtual String get_name() const { return "Polygon3DEditor"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "Polygon3DEditor"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	Polygon3DEditorPlugin(EditorNode *p_node);
 	Polygon3DEditorPlugin(EditorNode *p_node);
 	~Polygon3DEditorPlugin();
 	~Polygon3DEditorPlugin();

+ 8 - 8
editor/plugins/collision_shape_2d_editor_plugin.h

@@ -90,14 +90,14 @@ class CollisionShape2DEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) { return collision_shape_2d_editor->forward_canvas_gui_input(p_event); }
-	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) { collision_shape_2d_editor->forward_canvas_draw_over_viewport(p_overlay); }
-
-	virtual String get_name() const { return "CollisionShape2D"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_obj);
-	virtual bool handles(Object *p_obj) const;
-	virtual void make_visible(bool visible);
+	virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) override { return collision_shape_2d_editor->forward_canvas_gui_input(p_event); }
+	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { collision_shape_2d_editor->forward_canvas_draw_over_viewport(p_overlay); }
+
+	virtual String get_name() const override { return "CollisionShape2D"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_obj) override;
+	virtual bool handles(Object *p_obj) const override;
+	virtual void make_visible(bool visible) override;
 
 
 	CollisionShape2DEditorPlugin(EditorNode *p_editor);
 	CollisionShape2DEditorPlugin(EditorNode *p_editor);
 	~CollisionShape2DEditorPlugin();
 	~CollisionShape2DEditorPlugin();

+ 5 - 5
editor/plugins/cpu_particles_2d_editor_plugin.h

@@ -79,11 +79,11 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual String get_name() const { return "CPUParticles2D"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "CPUParticles2D"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	CPUParticles2DEditorPlugin(EditorNode *p_node);
 	CPUParticles2DEditorPlugin(EditorNode *p_node);
 	~CPUParticles2DEditorPlugin();
 	~CPUParticles2DEditorPlugin();

+ 6 - 6
editor/plugins/cpu_particles_3d_editor_plugin.h

@@ -51,7 +51,7 @@ class CPUParticles3DEditor : public GPUParticles3DEditorBase {
 
 
 	friend class CPUParticles3DEditorPlugin;
 	friend class CPUParticles3DEditorPlugin;
 
 
-	virtual void _generate_emission_points();
+	virtual void _generate_emission_points() override;
 
 
 protected:
 protected:
 	void _notification(int p_notification);
 	void _notification(int p_notification);
@@ -70,11 +70,11 @@ class CPUParticles3DEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "CPUParticles3D"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "CPUParticles3D"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	CPUParticles3DEditorPlugin(EditorNode *p_node);
 	CPUParticles3DEditorPlugin(EditorNode *p_node);
 	~CPUParticles3DEditorPlugin();
 	~CPUParticles3DEditorPlugin();

+ 6 - 6
editor/plugins/curve_editor_plugin.h

@@ -43,7 +43,7 @@ class CurveEditor : public Control {
 public:
 public:
 	CurveEditor();
 	CurveEditor();
 
 
-	Size2 get_minimum_size() const;
+	Size2 get_minimum_size() const override;
 
 
 	void set_curve(Ref<Curve> curve);
 	void set_curve(Ref<Curve> curve);
 
 
@@ -123,8 +123,8 @@ class EditorInspectorPluginCurve : public EditorInspectorPlugin {
 	GDCLASS(EditorInspectorPluginCurve, EditorInspectorPlugin);
 	GDCLASS(EditorInspectorPluginCurve, EditorInspectorPlugin);
 
 
 public:
 public:
-	virtual bool can_handle(Object *p_object);
-	virtual void parse_begin(Object *p_object);
+	virtual bool can_handle(Object *p_object) override;
+	virtual void parse_begin(Object *p_object) override;
 };
 };
 
 
 class CurveEditorPlugin : public EditorPlugin {
 class CurveEditorPlugin : public EditorPlugin {
@@ -133,15 +133,15 @@ class CurveEditorPlugin : public EditorPlugin {
 public:
 public:
 	CurveEditorPlugin(EditorNode *p_node);
 	CurveEditorPlugin(EditorNode *p_node);
 
 
-	virtual String get_name() const { return "Curve"; }
+	virtual String get_name() const override { return "Curve"; }
 };
 };
 
 
 class CurvePreviewGenerator : public EditorResourcePreviewGenerator {
 class CurvePreviewGenerator : public EditorResourcePreviewGenerator {
 	GDCLASS(CurvePreviewGenerator, EditorResourcePreviewGenerator);
 	GDCLASS(CurvePreviewGenerator, EditorResourcePreviewGenerator);
 
 
 public:
 public:
-	virtual bool handles(const String &p_type) const;
-	virtual Ref<Texture2D> generate(const Ref<Resource> &p_from, const Size2 &p_size) const;
+	virtual bool handles(const String &p_type) const override;
+	virtual Ref<Texture2D> generate(const Ref<Resource> &p_from, const Size2 &p_size) const override;
 };
 };
 
 
 #endif // CURVE_EDITOR_PLUGIN_H
 #endif // CURVE_EDITOR_PLUGIN_H

+ 2 - 2
editor/plugins/debugger_editor_plugin.h

@@ -61,8 +61,8 @@ private:
 	void _menu_option(int p_option);
 	void _menu_option(int p_option);
 
 
 public:
 public:
-	virtual String get_name() const { return "Debugger"; }
-	bool has_main_screen() const { return false; }
+	virtual String get_name() const override { return "Debugger"; }
+	bool has_main_screen() const override { return false; }
 
 
 	DebuggerEditorPlugin(EditorNode *p_node, MenuButton *p_menu);
 	DebuggerEditorPlugin(EditorNode *p_node, MenuButton *p_menu);
 	~DebuggerEditorPlugin();
 	~DebuggerEditorPlugin();

+ 17 - 17
editor/plugins/editor_preview_plugins.h

@@ -39,9 +39,9 @@ class EditorTexturePreviewPlugin : public EditorResourcePreviewGenerator {
 	GDCLASS(EditorTexturePreviewPlugin, EditorResourcePreviewGenerator);
 	GDCLASS(EditorTexturePreviewPlugin, EditorResourcePreviewGenerator);
 
 
 public:
 public:
-	virtual bool handles(const String &p_type) const;
-	virtual bool generate_small_preview_automatically() const;
-	virtual Ref<Texture2D> generate(const RES &p_from, const Size2 &p_size) const;
+	virtual bool handles(const String &p_type) const override;
+	virtual bool generate_small_preview_automatically() const override;
+	virtual Ref<Texture2D> generate(const RES &p_from, const Size2 &p_size) const override;
 
 
 	EditorTexturePreviewPlugin();
 	EditorTexturePreviewPlugin();
 };
 };
@@ -50,9 +50,9 @@ class EditorImagePreviewPlugin : public EditorResourcePreviewGenerator {
 	GDCLASS(EditorImagePreviewPlugin, EditorResourcePreviewGenerator);
 	GDCLASS(EditorImagePreviewPlugin, EditorResourcePreviewGenerator);
 
 
 public:
 public:
-	virtual bool handles(const String &p_type) const;
-	virtual bool generate_small_preview_automatically() const;
-	virtual Ref<Texture2D> generate(const RES &p_from, const Size2 &p_size) const;
+	virtual bool handles(const String &p_type) const override;
+	virtual bool generate_small_preview_automatically() const override;
+	virtual Ref<Texture2D> generate(const RES &p_from, const Size2 &p_size) const override;
 
 
 	EditorImagePreviewPlugin();
 	EditorImagePreviewPlugin();
 };
 };
@@ -61,9 +61,9 @@ class EditorBitmapPreviewPlugin : public EditorResourcePreviewGenerator {
 	GDCLASS(EditorBitmapPreviewPlugin, EditorResourcePreviewGenerator);
 	GDCLASS(EditorBitmapPreviewPlugin, EditorResourcePreviewGenerator);
 
 
 public:
 public:
-	virtual bool handles(const String &p_type) const;
-	virtual bool generate_small_preview_automatically() const;
-	virtual Ref<Texture2D> generate(const RES &p_from, const Size2 &p_size) const;
+	virtual bool handles(const String &p_type) const override;
+	virtual bool generate_small_preview_automatically() const override;
+	virtual Ref<Texture2D> generate(const RES &p_from, const Size2 &p_size) const override;
 
 
 	EditorBitmapPreviewPlugin();
 	EditorBitmapPreviewPlugin();
 };
 };
@@ -98,9 +98,9 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual bool handles(const String &p_type) const;
-	virtual bool generate_small_preview_automatically() const;
-	virtual Ref<Texture2D> generate(const RES &p_from, const Size2 &p_size) const;
+	virtual bool handles(const String &p_type) const override;
+	virtual bool generate_small_preview_automatically() const override;
+	virtual Ref<Texture2D> generate(const RES &p_from, const Size2 &p_size) const override;
 
 
 	EditorMaterialPreviewPlugin();
 	EditorMaterialPreviewPlugin();
 	~EditorMaterialPreviewPlugin();
 	~EditorMaterialPreviewPlugin();
@@ -142,8 +142,8 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual bool handles(const String &p_type) const;
-	virtual Ref<Texture2D> generate(const RES &p_from, const Size2 &p_size) const;
+	virtual bool handles(const String &p_type) const override;
+	virtual Ref<Texture2D> generate(const RES &p_from, const Size2 &p_size) const override;
 
 
 	EditorMeshPreviewPlugin();
 	EditorMeshPreviewPlugin();
 	~EditorMeshPreviewPlugin();
 	~EditorMeshPreviewPlugin();
@@ -164,9 +164,9 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual bool handles(const String &p_type) const;
-	virtual Ref<Texture2D> generate(const RES &p_from, const Size2 &p_size) const;
-	virtual Ref<Texture2D> generate_from_path(const String &p_path, const Size2 &p_size) const;
+	virtual bool handles(const String &p_type) const override;
+	virtual Ref<Texture2D> generate(const RES &p_from, const Size2 &p_size) const override;
+	virtual Ref<Texture2D> generate_from_path(const String &p_path, const Size2 &p_size) const override;
 
 
 	EditorFontPreviewPlugin();
 	EditorFontPreviewPlugin();
 	~EditorFontPreviewPlugin();
 	~EditorFontPreviewPlugin();

+ 5 - 5
editor/plugins/gi_probe_editor_plugin.h

@@ -61,11 +61,11 @@ protected:
 	void _notification(int p_what);
 	void _notification(int p_what);
 
 
 public:
 public:
-	virtual String get_name() const { return "GIProbe"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "GIProbe"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	GIProbeEditorPlugin(EditorNode *p_node);
 	GIProbeEditorPlugin(EditorNode *p_node);
 	~GIProbeEditorPlugin();
 	~GIProbeEditorPlugin();

+ 5 - 5
editor/plugins/gpu_particles_2d_editor_plugin.h

@@ -86,11 +86,11 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual String get_name() const { return "GPUParticles2D"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "GPUParticles2D"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	GPUParticles2DEditorPlugin(EditorNode *p_node);
 	GPUParticles2DEditorPlugin(EditorNode *p_node);
 	~GPUParticles2DEditorPlugin();
 	~GPUParticles2DEditorPlugin();

+ 6 - 6
editor/plugins/gpu_particles_3d_editor_plugin.h

@@ -86,7 +86,7 @@ class GPUParticles3DEditor : public GPUParticles3DEditorBase {
 
 
 	friend class GPUParticles3DEditorPlugin;
 	friend class GPUParticles3DEditorPlugin;
 
 
-	virtual void _generate_emission_points();
+	virtual void _generate_emission_points() override;
 
 
 protected:
 protected:
 	void _notification(int p_notification);
 	void _notification(int p_notification);
@@ -105,11 +105,11 @@ class GPUParticles3DEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "GPUParticles3D"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "GPUParticles3D"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	GPUParticles3DEditorPlugin(EditorNode *p_node);
 	GPUParticles3DEditorPlugin(EditorNode *p_node);
 	~GPUParticles3DEditorPlugin();
 	~GPUParticles3DEditorPlugin();

+ 4 - 4
editor/plugins/gradient_editor_plugin.h

@@ -48,7 +48,7 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual Size2 get_minimum_size() const;
+	virtual Size2 get_minimum_size() const override;
 	void set_gradient(const Ref<Gradient> &p_gradient);
 	void set_gradient(const Ref<Gradient> &p_gradient);
 	GradientEditor();
 	GradientEditor();
 };
 };
@@ -57,15 +57,15 @@ class EditorInspectorPluginGradient : public EditorInspectorPlugin {
 	GDCLASS(EditorInspectorPluginGradient, EditorInspectorPlugin);
 	GDCLASS(EditorInspectorPluginGradient, EditorInspectorPlugin);
 
 
 public:
 public:
-	virtual bool can_handle(Object *p_object);
-	virtual void parse_begin(Object *p_object);
+	virtual bool can_handle(Object *p_object) override;
+	virtual void parse_begin(Object *p_object) override;
 };
 };
 
 
 class GradientEditorPlugin : public EditorPlugin {
 class GradientEditorPlugin : public EditorPlugin {
 	GDCLASS(GradientEditorPlugin, EditorPlugin);
 	GDCLASS(GradientEditorPlugin, EditorPlugin);
 
 
 public:
 public:
-	virtual String get_name() const { return "ColorRamp"; }
+	virtual String get_name() const override { return "ColorRamp"; }
 
 
 	GradientEditorPlugin(EditorNode *p_node);
 	GradientEditorPlugin(EditorNode *p_node);
 };
 };

+ 53 - 53
editor/plugins/item_list_editor_plugin.h

@@ -100,25 +100,25 @@ class ItemListOptionButtonPlugin : public ItemListPlugin {
 	OptionButton *ob;
 	OptionButton *ob;
 
 
 public:
 public:
-	virtual void set_object(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual int get_flags() const;
+	virtual void set_object(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual int get_flags() const override;
 
 
-	virtual void set_item_text(int p_idx, const String &p_text) { ob->set_item_text(p_idx, p_text); }
-	virtual String get_item_text(int p_idx) const { return ob->get_item_text(p_idx); }
+	virtual void set_item_text(int p_idx, const String &p_text) override { ob->set_item_text(p_idx, p_text); }
+	virtual String get_item_text(int p_idx) const override { return ob->get_item_text(p_idx); }
 
 
-	virtual void set_item_icon(int p_idx, const Ref<Texture2D> &p_tex) { ob->set_item_icon(p_idx, p_tex); }
-	virtual Ref<Texture2D> get_item_icon(int p_idx) const { return ob->get_item_icon(p_idx); }
+	virtual void set_item_icon(int p_idx, const Ref<Texture2D> &p_tex) override { ob->set_item_icon(p_idx, p_tex); }
+	virtual Ref<Texture2D> get_item_icon(int p_idx) const override { return ob->get_item_icon(p_idx); }
 
 
-	virtual void set_item_enabled(int p_idx, int p_enabled) { ob->set_item_disabled(p_idx, !p_enabled); }
-	virtual bool is_item_enabled(int p_idx) const { return !ob->is_item_disabled(p_idx); }
+	virtual void set_item_enabled(int p_idx, int p_enabled) override { ob->set_item_disabled(p_idx, !p_enabled); }
+	virtual bool is_item_enabled(int p_idx) const override { return !ob->is_item_disabled(p_idx); }
 
 
-	virtual void set_item_id(int p_idx, int p_id) { ob->set_item_id(p_idx, p_id); }
-	virtual int get_item_id(int p_idx) const { return ob->get_item_id(p_idx); }
+	virtual void set_item_id(int p_idx, int p_id) override { ob->set_item_id(p_idx, p_id); }
+	virtual int get_item_id(int p_idx) const override { return ob->get_item_id(p_idx); }
 
 
-	virtual void add_item();
-	virtual int get_item_count() const;
-	virtual void erase(int p_idx);
+	virtual void add_item() override;
+	virtual int get_item_count() const override;
+	virtual void erase(int p_idx) override;
 
 
 	ItemListOptionButtonPlugin();
 	ItemListOptionButtonPlugin();
 };
 };
@@ -129,36 +129,36 @@ class ItemListPopupMenuPlugin : public ItemListPlugin {
 	PopupMenu *pp;
 	PopupMenu *pp;
 
 
 public:
 public:
-	virtual void set_object(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual int get_flags() const;
+	virtual void set_object(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual int get_flags() const override;
 
 
-	virtual void set_item_text(int p_idx, const String &p_text) { pp->set_item_text(p_idx, p_text); }
-	virtual String get_item_text(int p_idx) const { return pp->get_item_text(p_idx); }
+	virtual void set_item_text(int p_idx, const String &p_text) override { pp->set_item_text(p_idx, p_text); }
+	virtual String get_item_text(int p_idx) const override { return pp->get_item_text(p_idx); }
 
 
-	virtual void set_item_icon(int p_idx, const Ref<Texture2D> &p_tex) { pp->set_item_icon(p_idx, p_tex); }
-	virtual Ref<Texture2D> get_item_icon(int p_idx) const { return pp->get_item_icon(p_idx); }
+	virtual void set_item_icon(int p_idx, const Ref<Texture2D> &p_tex) override { pp->set_item_icon(p_idx, p_tex); }
+	virtual Ref<Texture2D> get_item_icon(int p_idx) const override { return pp->get_item_icon(p_idx); }
 
 
-	virtual void set_item_checkable(int p_idx, bool p_check) { pp->set_item_as_checkable(p_idx, p_check); }
-	virtual void set_item_radio_checkable(int p_idx, bool p_check) { pp->set_item_as_radio_checkable(p_idx, p_check); }
-	virtual bool is_item_checkable(int p_idx) const { return pp->is_item_checkable(p_idx); }
-	virtual bool is_item_radio_checkable(int p_idx) const { return pp->is_item_radio_checkable(p_idx); }
+	virtual void set_item_checkable(int p_idx, bool p_check) override { pp->set_item_as_checkable(p_idx, p_check); }
+	virtual void set_item_radio_checkable(int p_idx, bool p_check) override { pp->set_item_as_radio_checkable(p_idx, p_check); }
+	virtual bool is_item_checkable(int p_idx) const override { return pp->is_item_checkable(p_idx); }
+	virtual bool is_item_radio_checkable(int p_idx) const override { return pp->is_item_radio_checkable(p_idx); }
 
 
-	virtual void set_item_checked(int p_idx, bool p_checked) { pp->set_item_checked(p_idx, p_checked); }
-	virtual bool is_item_checked(int p_idx) const { return pp->is_item_checked(p_idx); }
+	virtual void set_item_checked(int p_idx, bool p_checked) override { pp->set_item_checked(p_idx, p_checked); }
+	virtual bool is_item_checked(int p_idx) const override { return pp->is_item_checked(p_idx); }
 
 
-	virtual void set_item_enabled(int p_idx, int p_enabled) { pp->set_item_disabled(p_idx, !p_enabled); }
-	virtual bool is_item_enabled(int p_idx) const { return !pp->is_item_disabled(p_idx); }
+	virtual void set_item_enabled(int p_idx, int p_enabled) override { pp->set_item_disabled(p_idx, !p_enabled); }
+	virtual bool is_item_enabled(int p_idx) const override { return !pp->is_item_disabled(p_idx); }
 
 
-	virtual void set_item_id(int p_idx, int p_id) { pp->set_item_id(p_idx, p_id); }
-	virtual int get_item_id(int p_idx) const { return pp->get_item_id(p_idx); }
+	virtual void set_item_id(int p_idx, int p_id) override { pp->set_item_id(p_idx, p_id); }
+	virtual int get_item_id(int p_idx) const override { return pp->get_item_id(p_idx); }
 
 
-	virtual void set_item_separator(int p_idx, bool p_separator) { pp->set_item_as_separator(p_idx, p_separator); }
-	virtual bool is_item_separator(int p_idx) const { return pp->is_item_separator(p_idx); }
+	virtual void set_item_separator(int p_idx, bool p_separator) override { pp->set_item_as_separator(p_idx, p_separator); }
+	virtual bool is_item_separator(int p_idx) const override { return pp->is_item_separator(p_idx); }
 
 
-	virtual void add_item();
-	virtual int get_item_count() const;
-	virtual void erase(int p_idx);
+	virtual void add_item() override;
+	virtual int get_item_count() const override;
+	virtual void erase(int p_idx) override;
 
 
 	ItemListPopupMenuPlugin();
 	ItemListPopupMenuPlugin();
 };
 };
@@ -171,22 +171,22 @@ class ItemListItemListPlugin : public ItemListPlugin {
 	ItemList *pp;
 	ItemList *pp;
 
 
 public:
 public:
-	virtual void set_object(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual int get_flags() const;
+	virtual void set_object(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual int get_flags() const override;
 
 
-	virtual void set_item_text(int p_idx, const String &p_text) { pp->set_item_text(p_idx, p_text); }
-	virtual String get_item_text(int p_idx) const { return pp->get_item_text(p_idx); }
+	virtual void set_item_text(int p_idx, const String &p_text) override { pp->set_item_text(p_idx, p_text); }
+	virtual String get_item_text(int p_idx) const override { return pp->get_item_text(p_idx); }
 
 
-	virtual void set_item_icon(int p_idx, const Ref<Texture2D> &p_tex) { pp->set_item_icon(p_idx, p_tex); }
-	virtual Ref<Texture2D> get_item_icon(int p_idx) const { return pp->get_item_icon(p_idx); }
+	virtual void set_item_icon(int p_idx, const Ref<Texture2D> &p_tex) override { pp->set_item_icon(p_idx, p_tex); }
+	virtual Ref<Texture2D> get_item_icon(int p_idx) const override { return pp->get_item_icon(p_idx); }
 
 
-	virtual void set_item_enabled(int p_idx, int p_enabled) { pp->set_item_disabled(p_idx, !p_enabled); }
-	virtual bool is_item_enabled(int p_idx) const { return !pp->is_item_disabled(p_idx); }
+	virtual void set_item_enabled(int p_idx, int p_enabled) override { pp->set_item_disabled(p_idx, !p_enabled); }
+	virtual bool is_item_enabled(int p_idx) const override { return !pp->is_item_disabled(p_idx); }
 
 
-	virtual void add_item();
-	virtual int get_item_count() const;
-	virtual void erase(int p_idx);
+	virtual void add_item() override;
+	virtual int get_item_count() const override;
+	virtual void erase(int p_idx) override;
 
 
 	ItemListItemListPlugin();
 	ItemListItemListPlugin();
 };
 };
@@ -236,11 +236,11 @@ class ItemListEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "ItemList"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "ItemList"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	ItemListEditorPlugin(EditorNode *p_node);
 	ItemListEditorPlugin(EditorNode *p_node);
 	~ItemListEditorPlugin();
 	~ItemListEditorPlugin();

+ 9 - 9
editor/plugins/light_occluder_2d_editor_plugin.h

@@ -42,18 +42,18 @@ class LightOccluder2DEditor : public AbstractPolygon2DEditor {
 	Ref<OccluderPolygon2D> _ensure_occluder() const;
 	Ref<OccluderPolygon2D> _ensure_occluder() const;
 
 
 protected:
 protected:
-	virtual Node2D *_get_node() const;
-	virtual void _set_node(Node *p_polygon);
+	virtual Node2D *_get_node() const override;
+	virtual void _set_node(Node *p_polygon) override;
 
 
-	virtual bool _is_line() const;
-	virtual int _get_polygon_count() const;
-	virtual Variant _get_polygon(int p_idx) const;
-	virtual void _set_polygon(int p_idx, const Variant &p_polygon) const;
+	virtual bool _is_line() const override;
+	virtual int _get_polygon_count() const override;
+	virtual Variant _get_polygon(int p_idx) const override;
+	virtual void _set_polygon(int p_idx, const Variant &p_polygon) const override;
 
 
-	virtual void _action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon);
+	virtual void _action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon) override;
 
 
-	virtual bool _has_resource() const;
-	virtual void _create_resource();
+	virtual bool _has_resource() const override;
+	virtual void _create_resource() override;
 
 
 public:
 public:
 	LightOccluder2DEditor(EditorNode *p_editor);
 	LightOccluder2DEditor(EditorNode *p_editor);

+ 6 - 6
editor/plugins/line_2d_editor_plugin.h

@@ -40,13 +40,13 @@ class Line2DEditor : public AbstractPolygon2DEditor {
 	Line2D *node;
 	Line2D *node;
 
 
 protected:
 protected:
-	virtual Node2D *_get_node() const;
-	virtual void _set_node(Node *p_line);
+	virtual Node2D *_get_node() const override;
+	virtual void _set_node(Node *p_line) override;
 
 
-	virtual bool _is_line() const;
-	virtual Variant _get_polygon(int p_idx) const;
-	virtual void _set_polygon(int p_idx, const Variant &p_polygon) const;
-	virtual void _action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon);
+	virtual bool _is_line() const override;
+	virtual Variant _get_polygon(int p_idx) const override;
+	virtual void _set_polygon(int p_idx, const Variant &p_polygon) const override;
+	virtual void _action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon) override;
 
 
 public:
 public:
 	Line2DEditor(EditorNode *p_editor);
 	Line2DEditor(EditorNode *p_editor);

+ 21 - 21
editor/plugins/material_editor_plugin.h

@@ -83,8 +83,8 @@ class EditorInspectorPluginMaterial : public EditorInspectorPlugin {
 	Ref<Environment> env;
 	Ref<Environment> env;
 
 
 public:
 public:
-	virtual bool can_handle(Object *p_object);
-	virtual void parse_begin(Object *p_object);
+	virtual bool can_handle(Object *p_object) override;
+	virtual void parse_begin(Object *p_object) override;
 
 
 	EditorInspectorPluginMaterial();
 	EditorInspectorPluginMaterial();
 };
 };
@@ -93,7 +93,7 @@ class MaterialEditorPlugin : public EditorPlugin {
 	GDCLASS(MaterialEditorPlugin, EditorPlugin);
 	GDCLASS(MaterialEditorPlugin, EditorPlugin);
 
 
 public:
 public:
-	virtual String get_name() const { return "Material"; }
+	virtual String get_name() const override { return "Material"; }
 
 
 	MaterialEditorPlugin(EditorNode *p_node);
 	MaterialEditorPlugin(EditorNode *p_node);
 };
 };
@@ -102,54 +102,54 @@ class StandardMaterial3DConversionPlugin : public EditorResourceConversionPlugin
 	GDCLASS(StandardMaterial3DConversionPlugin, EditorResourceConversionPlugin);
 	GDCLASS(StandardMaterial3DConversionPlugin, EditorResourceConversionPlugin);
 
 
 public:
 public:
-	virtual String converts_to() const;
-	virtual bool handles(const Ref<Resource> &p_resource) const;
-	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const;
+	virtual String converts_to() const override;
+	virtual bool handles(const Ref<Resource> &p_resource) const override;
+	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const override;
 };
 };
 
 
 class ParticlesMaterialConversionPlugin : public EditorResourceConversionPlugin {
 class ParticlesMaterialConversionPlugin : public EditorResourceConversionPlugin {
 	GDCLASS(ParticlesMaterialConversionPlugin, EditorResourceConversionPlugin);
 	GDCLASS(ParticlesMaterialConversionPlugin, EditorResourceConversionPlugin);
 
 
 public:
 public:
-	virtual String converts_to() const;
-	virtual bool handles(const Ref<Resource> &p_resource) const;
-	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const;
+	virtual String converts_to() const override;
+	virtual bool handles(const Ref<Resource> &p_resource) const override;
+	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const override;
 };
 };
 
 
 class CanvasItemMaterialConversionPlugin : public EditorResourceConversionPlugin {
 class CanvasItemMaterialConversionPlugin : public EditorResourceConversionPlugin {
 	GDCLASS(CanvasItemMaterialConversionPlugin, EditorResourceConversionPlugin);
 	GDCLASS(CanvasItemMaterialConversionPlugin, EditorResourceConversionPlugin);
 
 
 public:
 public:
-	virtual String converts_to() const;
-	virtual bool handles(const Ref<Resource> &p_resource) const;
-	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const;
+	virtual String converts_to() const override;
+	virtual bool handles(const Ref<Resource> &p_resource) const override;
+	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const override;
 };
 };
 
 
 class ProceduralSkyMaterialConversionPlugin : public EditorResourceConversionPlugin {
 class ProceduralSkyMaterialConversionPlugin : public EditorResourceConversionPlugin {
 	GDCLASS(ProceduralSkyMaterialConversionPlugin, EditorResourceConversionPlugin);
 	GDCLASS(ProceduralSkyMaterialConversionPlugin, EditorResourceConversionPlugin);
 
 
 public:
 public:
-	virtual String converts_to() const;
-	virtual bool handles(const Ref<Resource> &p_resource) const;
-	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const;
+	virtual String converts_to() const override;
+	virtual bool handles(const Ref<Resource> &p_resource) const override;
+	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const override;
 };
 };
 
 
 class PanoramaSkyMaterialConversionPlugin : public EditorResourceConversionPlugin {
 class PanoramaSkyMaterialConversionPlugin : public EditorResourceConversionPlugin {
 	GDCLASS(PanoramaSkyMaterialConversionPlugin, EditorResourceConversionPlugin);
 	GDCLASS(PanoramaSkyMaterialConversionPlugin, EditorResourceConversionPlugin);
 
 
 public:
 public:
-	virtual String converts_to() const;
-	virtual bool handles(const Ref<Resource> &p_resource) const;
-	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const;
+	virtual String converts_to() const override;
+	virtual bool handles(const Ref<Resource> &p_resource) const override;
+	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const override;
 };
 };
 
 
 class PhysicalSkyMaterialConversionPlugin : public EditorResourceConversionPlugin {
 class PhysicalSkyMaterialConversionPlugin : public EditorResourceConversionPlugin {
 	GDCLASS(PhysicalSkyMaterialConversionPlugin, EditorResourceConversionPlugin);
 	GDCLASS(PhysicalSkyMaterialConversionPlugin, EditorResourceConversionPlugin);
 
 
 public:
 public:
-	virtual String converts_to() const;
-	virtual bool handles(const Ref<Resource> &p_resource) const;
-	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const;
+	virtual String converts_to() const override;
+	virtual bool handles(const Ref<Resource> &p_resource) const override;
+	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const override;
 };
 };
 
 
 #endif // MATERIAL_EDITOR_PLUGIN_H
 #endif // MATERIAL_EDITOR_PLUGIN_H

+ 3 - 3
editor/plugins/mesh_editor_plugin.h

@@ -76,15 +76,15 @@ class EditorInspectorPluginMesh : public EditorInspectorPlugin {
 	GDCLASS(EditorInspectorPluginMesh, EditorInspectorPlugin);
 	GDCLASS(EditorInspectorPluginMesh, EditorInspectorPlugin);
 
 
 public:
 public:
-	virtual bool can_handle(Object *p_object);
-	virtual void parse_begin(Object *p_object);
+	virtual bool can_handle(Object *p_object) override;
+	virtual void parse_begin(Object *p_object) override;
 };
 };
 
 
 class MeshEditorPlugin : public EditorPlugin {
 class MeshEditorPlugin : public EditorPlugin {
 	GDCLASS(MeshEditorPlugin, EditorPlugin);
 	GDCLASS(MeshEditorPlugin, EditorPlugin);
 
 
 public:
 public:
-	virtual String get_name() const { return "Mesh"; }
+	virtual String get_name() const override { return "Mesh"; }
 
 
 	MeshEditorPlugin(EditorNode *p_node);
 	MeshEditorPlugin(EditorNode *p_node);
 };
 };

+ 5 - 5
editor/plugins/mesh_instance_3d_editor_plugin.h

@@ -89,11 +89,11 @@ class MeshInstance3DEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "MeshInstance3D"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "MeshInstance3D"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	MeshInstance3DEditorPlugin(EditorNode *p_node);
 	MeshInstance3DEditorPlugin(EditorNode *p_node);
 	~MeshInstance3DEditorPlugin();
 	~MeshInstance3DEditorPlugin();

+ 5 - 5
editor/plugins/mesh_library_editor_plugin.h

@@ -79,11 +79,11 @@ class MeshLibraryEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "MeshLibrary"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "MeshLibrary"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_node) override;
+	virtual bool handles(Object *p_node) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	MeshLibraryEditorPlugin(EditorNode *p_node);
 	MeshLibraryEditorPlugin(EditorNode *p_node);
 };
 };

+ 5 - 5
editor/plugins/multimesh_editor_plugin.h

@@ -88,11 +88,11 @@ class MultiMeshEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "MultiMesh"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "MultiMesh"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	MultiMeshEditorPlugin(EditorNode *p_node);
 	MultiMeshEditorPlugin(EditorNode *p_node);
 	~MultiMeshEditorPlugin();
 	~MultiMeshEditorPlugin();

+ 10 - 10
editor/plugins/navigation_polygon_editor_plugin.h

@@ -42,19 +42,19 @@ class NavigationPolygonEditor : public AbstractPolygon2DEditor {
 	Ref<NavigationPolygon> _ensure_navpoly() const;
 	Ref<NavigationPolygon> _ensure_navpoly() const;
 
 
 protected:
 protected:
-	virtual Node2D *_get_node() const;
-	virtual void _set_node(Node *p_polygon);
+	virtual Node2D *_get_node() const override;
+	virtual void _set_node(Node *p_polygon) override;
 
 
-	virtual int _get_polygon_count() const;
-	virtual Variant _get_polygon(int p_idx) const;
-	virtual void _set_polygon(int p_idx, const Variant &p_polygon) const;
+	virtual int _get_polygon_count() const override;
+	virtual Variant _get_polygon(int p_idx) const override;
+	virtual void _set_polygon(int p_idx, const Variant &p_polygon) const override;
 
 
-	virtual void _action_add_polygon(const Variant &p_polygon);
-	virtual void _action_remove_polygon(int p_idx);
-	virtual void _action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon);
+	virtual void _action_add_polygon(const Variant &p_polygon) override;
+	virtual void _action_remove_polygon(int p_idx) override;
+	virtual void _action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon) override;
 
 
-	virtual bool _has_resource() const;
-	virtual void _create_resource();
+	virtual bool _has_resource() const override;
+	virtual void _create_resource() override;
 
 
 public:
 public:
 	NavigationPolygonEditor(EditorNode *p_editor);
 	NavigationPolygonEditor(EditorNode *p_editor);

+ 14 - 14
editor/plugins/node_3d_editor_plugin.h

@@ -122,11 +122,11 @@ public:
 	bool intersect_frustum(const Camera3D *p_camera, const Vector<Plane> &p_frustum);
 	bool intersect_frustum(const Camera3D *p_camera, const Vector<Plane> &p_frustum);
 	bool intersect_ray(Camera3D *p_camera, const Point2 &p_point, Vector3 &r_pos, Vector3 &r_normal, int *r_gizmo_handle = nullptr, bool p_sec_first = false);
 	bool intersect_ray(Camera3D *p_camera, const Point2 &p_point, Vector3 &r_pos, Vector3 &r_normal, int *r_gizmo_handle = nullptr, bool p_sec_first = false);
 
 
-	virtual void clear();
-	virtual void create();
-	virtual void transform();
-	virtual void redraw();
-	virtual void free();
+	virtual void clear() override;
+	virtual void create() override;
+	virtual void transform() override;
+	virtual void redraw() override;
+	virtual void free() override;
 
 
 	virtual bool is_editable() const;
 	virtual bool is_editable() const;
 
 
@@ -826,17 +826,17 @@ public:
 	void snap_cursor_to_plane(const Plane &p_plane);
 	void snap_cursor_to_plane(const Plane &p_plane);
 
 
 	Node3DEditor *get_spatial_editor() { return spatial_editor; }
 	Node3DEditor *get_spatial_editor() { return spatial_editor; }
-	virtual String get_name() const { return "3D"; }
-	bool has_main_screen() const { return true; }
-	virtual void make_visible(bool p_visible);
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
+	virtual String get_name() const override { return "3D"; }
+	bool has_main_screen() const override { return true; }
+	virtual void make_visible(bool p_visible) override;
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
 
 
-	virtual Dictionary get_state() const;
-	virtual void set_state(const Dictionary &p_state);
-	virtual void clear() { spatial_editor->clear(); }
+	virtual Dictionary get_state() const override;
+	virtual void set_state(const Dictionary &p_state) override;
+	virtual void clear() override { spatial_editor->clear(); }
 
 
-	virtual void edited_scene_changed();
+	virtual void edited_scene_changed() override;
 
 
 	Node3DEditorPlugin(EditorNode *p_node);
 	Node3DEditorPlugin(EditorNode *p_node);
 	~Node3DEditorPlugin();
 	~Node3DEditorPlugin();

+ 2 - 2
editor/plugins/packed_scene_translation_parser_plugin.h

@@ -40,8 +40,8 @@ class PackedSceneEditorTranslationParserPlugin : public EditorTranslationParserP
 	Set<String> lookup_properties;
 	Set<String> lookup_properties;
 
 
 public:
 public:
-	virtual Error parse_file(const String &p_path, Vector<String> *r_extracted_strings);
-	virtual void get_recognized_extensions(List<String> *r_extensions) const;
+	virtual Error parse_file(const String &p_path, Vector<String> *r_extracted_strings) override;
+	virtual void get_recognized_extensions(List<String> *r_extensions) const override;
 
 
 	PackedSceneEditorTranslationParserPlugin();
 	PackedSceneEditorTranslationParserPlugin();
 };
 };

+ 8 - 8
editor/plugins/path_2d_editor_plugin.h

@@ -116,14 +116,14 @@ class Path2DEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) { return path2d_editor->forward_gui_input(p_event); }
-	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) { path2d_editor->forward_canvas_draw_over_viewport(p_overlay); }
-
-	virtual String get_name() const { return "Path2D"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) override { return path2d_editor->forward_gui_input(p_event); }
+	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { path2d_editor->forward_canvas_draw_over_viewport(p_overlay); }
+
+	virtual String get_name() const override { return "Path2D"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	Path2DEditorPlugin(EditorNode *p_node);
 	Path2DEditorPlugin(EditorNode *p_node);
 	~Path2DEditorPlugin();
 	~Path2DEditorPlugin();

+ 14 - 14
editor/plugins/path_3d_editor_plugin.h

@@ -43,12 +43,12 @@ class Path3DGizmo : public EditorNode3DGizmo {
 	mutable float orig_out_length;
 	mutable float orig_out_length;
 
 
 public:
 public:
-	virtual String get_handle_name(int p_idx) const;
-	virtual Variant get_handle_value(int p_idx);
-	virtual void set_handle(int p_idx, Camera3D *p_camera, const Point2 &p_point);
-	virtual void commit_handle(int p_idx, const Variant &p_restore, bool p_cancel = false);
+	virtual String get_handle_name(int p_idx) const override;
+	virtual Variant get_handle_value(int p_idx) override;
+	virtual void set_handle(int p_idx, Camera3D *p_camera, const Point2 &p_point) override;
+	virtual void commit_handle(int p_idx, const Variant &p_restore, bool p_cancel = false) override;
 
 
-	virtual void redraw();
+	virtual void redraw() override;
 	Path3DGizmo(Path3D *p_path = nullptr);
 	Path3DGizmo(Path3D *p_path = nullptr);
 };
 };
 
 
@@ -56,11 +56,11 @@ class Path3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(Path3DGizmoPlugin, EditorNode3DGizmoPlugin);
 	GDCLASS(Path3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 
 protected:
 protected:
-	Ref<EditorNode3DGizmo> create_gizmo(Node3D *p_spatial);
+	Ref<EditorNode3DGizmo> create_gizmo(Node3D *p_spatial) override;
 
 
 public:
 public:
-	String get_name() const;
-	int get_priority() const;
+	String get_name() const override;
+	int get_priority() const override;
 	Path3DGizmoPlugin();
 	Path3DGizmoPlugin();
 };
 };
 
 
@@ -98,13 +98,13 @@ public:
 	Path3D *get_edited_path() { return path; }
 	Path3D *get_edited_path() { return path; }
 
 
 	static Path3DEditorPlugin *singleton;
 	static Path3DEditorPlugin *singleton;
-	virtual bool forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event);
+	virtual bool forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override;
 
 
-	virtual String get_name() const { return "Path3D"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "Path3D"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	bool mirror_angle_enabled() { return mirror_handle_angle; }
 	bool mirror_angle_enabled() { return mirror_handle_angle; }
 	bool mirror_length_enabled() { return mirror_handle_length; }
 	bool mirror_length_enabled() { return mirror_handle_length; }

+ 4 - 4
editor/plugins/physical_bone_3d_editor_plugin.h

@@ -67,10 +67,10 @@ class PhysicalBone3DEditorPlugin : public EditorPlugin {
 	PhysicalBone3DEditor physical_bone_editor;
 	PhysicalBone3DEditor physical_bone_editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "PhysicalBone3D"; }
-	virtual bool handles(Object *p_object) const { return p_object->is_class("PhysicalBone3D"); }
-	virtual void make_visible(bool p_visible);
-	virtual void edit(Object *p_node);
+	virtual String get_name() const override { return "PhysicalBone3D"; }
+	virtual bool handles(Object *p_object) const override { return p_object->is_class("PhysicalBone3D"); }
+	virtual void make_visible(bool p_visible) override;
+	virtual void edit(Object *p_node) override;
 
 
 	PhysicalBone3DEditorPlugin(EditorNode *p_editor);
 	PhysicalBone3DEditorPlugin(EditorNode *p_editor);
 };
 };

+ 7 - 7
editor/plugins/polygon_2d_editor_plugin.h

@@ -122,7 +122,7 @@ class Polygon2DEditor : public AbstractPolygon2DEditor {
 	Vector2 snap_offset;
 	Vector2 snap_offset;
 	Vector2 snap_step;
 	Vector2 snap_step;
 
 
-	virtual void _menu_option(int p_option);
+	virtual void _menu_option(int p_option) override;
 
 
 	void _cancel_editing();
 	void _cancel_editing();
 	void _update_polygon_editing_state();
 	void _update_polygon_editing_state();
@@ -143,16 +143,16 @@ class Polygon2DEditor : public AbstractPolygon2DEditor {
 	void _uv_edit_popup_hide();
 	void _uv_edit_popup_hide();
 	void _bone_paint_selected(int p_index);
 	void _bone_paint_selected(int p_index);
 
 
-	int _get_polygon_count() const;
+	int _get_polygon_count() const override;
 
 
 protected:
 protected:
-	virtual Node2D *_get_node() const;
-	virtual void _set_node(Node *p_polygon);
+	virtual Node2D *_get_node() const override;
+	virtual void _set_node(Node *p_polygon) override;
 
 
-	virtual Vector2 _get_offset(int p_idx) const;
+	virtual Vector2 _get_offset(int p_idx) const override;
 
 
-	virtual bool _has_uv() const { return true; };
-	virtual void _commit_action();
+	virtual bool _has_uv() const override { return true; };
+	virtual void _commit_action() override;
 
 
 	void _notification(int p_what);
 	void _notification(int p_what);
 	static void _bind_methods();
 	static void _bind_methods();

+ 5 - 5
editor/plugins/resource_preloader_editor_plugin.h

@@ -93,11 +93,11 @@ class ResourcePreloaderEditorPlugin : public EditorPlugin {
 	Button *button;
 	Button *button;
 
 
 public:
 public:
-	virtual String get_name() const { return "ResourcePreloader"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "ResourcePreloader"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	ResourcePreloaderEditorPlugin(EditorNode *p_node);
 	ResourcePreloaderEditorPlugin(EditorNode *p_node);
 	~ResourcePreloaderEditorPlugin();
 	~ResourcePreloaderEditorPlugin();

+ 5 - 5
editor/plugins/root_motion_editor_plugin.h

@@ -54,7 +54,7 @@ protected:
 	void _notification(int p_what);
 	void _notification(int p_what);
 
 
 public:
 public:
-	virtual void update_property();
+	virtual void update_property() override;
 	void setup(const NodePath &p_base_hint);
 	void setup(const NodePath &p_base_hint);
 	EditorPropertyRootMotion();
 	EditorPropertyRootMotion();
 };
 };
@@ -63,10 +63,10 @@ class EditorInspectorRootMotionPlugin : public EditorInspectorPlugin {
 	GDCLASS(EditorInspectorRootMotionPlugin, EditorInspectorPlugin);
 	GDCLASS(EditorInspectorRootMotionPlugin, EditorInspectorPlugin);
 
 
 public:
 public:
-	virtual bool can_handle(Object *p_object);
-	virtual void parse_begin(Object *p_object);
-	virtual bool parse_property(Object *p_object, Variant::Type p_type, const String &p_path, PropertyHint p_hint, const String &p_hint_text, int p_usage, bool p_wide = false);
-	virtual void parse_end();
+	virtual bool can_handle(Object *p_object) override;
+	virtual void parse_begin(Object *p_object) override;
+	virtual bool parse_property(Object *p_object, Variant::Type p_type, const String &p_path, PropertyHint p_hint, const String &p_hint_text, int p_usage, bool p_wide = false) override;
+	virtual void parse_end() override;
 };
 };
 
 
 #endif // ROOT_MOTION_EDITOR_PLUGIN_H
 #endif // ROOT_MOTION_EDITOR_PLUGIN_H

+ 14 - 14
editor/plugins/script_editor_plugin.h

@@ -455,25 +455,25 @@ class ScriptEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "Script"; }
-	bool has_main_screen() const { return true; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
-	virtual void selected_notify();
+	virtual String get_name() const override { return "Script"; }
+	bool has_main_screen() const override { return true; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
+	virtual void selected_notify() override;
 
 
-	virtual void save_external_data();
-	virtual void apply_changes();
+	virtual void save_external_data() override;
+	virtual void apply_changes() override;
 
 
-	virtual void restore_global_state();
-	virtual void save_global_state();
+	virtual void restore_global_state() override;
+	virtual void save_global_state() override;
 
 
-	virtual void set_window_layout(Ref<ConfigFile> p_layout);
-	virtual void get_window_layout(Ref<ConfigFile> p_layout);
+	virtual void set_window_layout(Ref<ConfigFile> p_layout) override;
+	virtual void get_window_layout(Ref<ConfigFile> p_layout) override;
 
 
-	virtual void get_breakpoints(List<String> *p_breakpoints);
+	virtual void get_breakpoints(List<String> *p_breakpoints) override;
 
 
-	virtual void edited_scene_changed();
+	virtual void edited_scene_changed() override;
 
 
 	ScriptEditorPlugin(EditorNode *p_node);
 	ScriptEditorPlugin(EditorNode *p_node);
 	~ScriptEditorPlugin();
 	~ScriptEditorPlugin();

+ 33 - 33
editor/plugins/script_text_editor.h

@@ -42,7 +42,7 @@ class ConnectionInfoDialog : public AcceptDialog {
 	Label *method;
 	Label *method;
 	Tree *tree;
 	Tree *tree;
 
 
-	virtual void ok_pressed();
+	virtual void ok_pressed() override;
 
 
 public:
 public:
 	void popup_connections(String p_method, Vector<Node *> p_nodes);
 	void popup_connections(String p_method, Vector<Node *> p_nodes);
@@ -190,50 +190,50 @@ protected:
 public:
 public:
 	void _update_connected_methods();
 	void _update_connected_methods();
 
 
-	virtual void add_syntax_highlighter(SyntaxHighlighter *p_highlighter);
-	virtual void set_syntax_highlighter(SyntaxHighlighter *p_highlighter);
+	virtual void add_syntax_highlighter(SyntaxHighlighter *p_highlighter) override;
+	virtual void set_syntax_highlighter(SyntaxHighlighter *p_highlighter) override;
 	void update_toggle_scripts_button();
 	void update_toggle_scripts_button();
 
 
-	virtual void apply_code();
-	virtual RES get_edited_resource() const;
-	virtual void set_edited_resource(const RES &p_res);
-	virtual Vector<String> get_functions();
-	virtual void reload_text();
-	virtual String get_name();
-	virtual Ref<Texture2D> get_theme_icon();
-	virtual bool is_unsaved();
-	virtual Variant get_edit_state();
-	virtual void set_edit_state(const Variant &p_state);
-	virtual void ensure_focus();
-	virtual void trim_trailing_whitespace();
-	virtual void insert_final_newline();
-	virtual void convert_indent_to_spaces();
-	virtual void convert_indent_to_tabs();
-	virtual void tag_saved_version();
-
-	virtual void goto_line(int p_line, bool p_with_error = false);
+	virtual void apply_code() override;
+	virtual RES get_edited_resource() const override;
+	virtual void set_edited_resource(const RES &p_res) override;
+	virtual Vector<String> get_functions() override;
+	virtual void reload_text() override;
+	virtual String get_name() override;
+	virtual Ref<Texture2D> get_theme_icon() override;
+	virtual bool is_unsaved() override;
+	virtual Variant get_edit_state() override;
+	virtual void set_edit_state(const Variant &p_state) override;
+	virtual void ensure_focus() override;
+	virtual void trim_trailing_whitespace() override;
+	virtual void insert_final_newline() override;
+	virtual void convert_indent_to_spaces() override;
+	virtual void convert_indent_to_tabs() override;
+	virtual void tag_saved_version() override;
+
+	virtual void goto_line(int p_line, bool p_with_error = false) override;
 	void goto_line_selection(int p_line, int p_begin, int p_end);
 	void goto_line_selection(int p_line, int p_begin, int p_end);
 	void goto_line_centered(int p_line);
 	void goto_line_centered(int p_line);
-	virtual void set_executing_line(int p_line);
-	virtual void clear_executing_line();
+	virtual void set_executing_line(int p_line) override;
+	virtual void clear_executing_line() override;
 
 
-	virtual void reload(bool p_soft);
-	virtual void get_breakpoints(List<int> *p_breakpoints);
+	virtual void reload(bool p_soft) override;
+	virtual void get_breakpoints(List<int> *p_breakpoints) override;
 
 
-	virtual void add_callback(const String &p_function, PackedStringArray p_args);
-	virtual void update_settings();
+	virtual void add_callback(const String &p_function, PackedStringArray p_args) override;
+	virtual void update_settings() override;
 
 
-	virtual bool show_members_overview();
+	virtual bool show_members_overview() 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 void set_debugger_active(bool p_active);
+	virtual void set_debugger_active(bool p_active) override;
 
 
-	Control *get_edit_menu();
-	virtual void clear_edit_menu();
+	Control *get_edit_menu() override;
+	virtual void clear_edit_menu() override;
 	static void register_editor();
 	static void register_editor();
 
 
-	virtual void validate();
+	virtual void validate() override;
 
 
 	ScriptTextEditor();
 	ScriptTextEditor();
 	~ScriptTextEditor();
 	~ScriptTextEditor();

+ 12 - 12
editor/plugins/shader_editor_plugin.h

@@ -50,12 +50,12 @@ class ShaderTextEditor : public CodeTextEditor {
 
 
 protected:
 protected:
 	static void _bind_methods();
 	static void _bind_methods();
-	virtual void _load_theme_settings();
+	virtual void _load_theme_settings() override;
 
 
-	virtual void _code_complete_script(const String &p_code, List<ScriptCodeCompletionOption> *r_options);
+	virtual void _code_complete_script(const String &p_code, List<ScriptCodeCompletionOption> *r_options) override;
 
 
 public:
 public:
-	virtual void _validate_script();
+	virtual void _validate_script() override;
 
 
 	void reload_text();
 	void reload_text();
 
 
@@ -134,7 +134,7 @@ public:
 
 
 	void goto_line_selection(int p_line, int p_begin, int p_end);
 	void goto_line_selection(int p_line, int p_begin, int p_end);
 
 
-	virtual Size2 get_minimum_size() const { return Size2(0, 200); }
+	virtual Size2 get_minimum_size() const override { return Size2(0, 200); }
 	void save_external_data(const String &p_str = "");
 	void save_external_data(const String &p_str = "");
 
 
 	ShaderEditor(EditorNode *p_node);
 	ShaderEditor(EditorNode *p_node);
@@ -149,17 +149,17 @@ class ShaderEditorPlugin : public EditorPlugin {
 	Button *button;
 	Button *button;
 
 
 public:
 public:
-	virtual String get_name() const { return "Shader"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
-	virtual void selected_notify();
+	virtual String get_name() const override { return "Shader"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
+	virtual void selected_notify() override;
 
 
 	ShaderEditor *get_shader_editor() const { return shader_editor; }
 	ShaderEditor *get_shader_editor() const { return shader_editor; }
 
 
-	virtual void save_external_data();
-	virtual void apply_changes();
+	virtual void save_external_data() override;
+	virtual void apply_changes() override;
 
 
 	ShaderEditorPlugin(EditorNode *p_node);
 	ShaderEditorPlugin(EditorNode *p_node);
 	~ShaderEditorPlugin();
 	~ShaderEditorPlugin();

+ 5 - 5
editor/plugins/shader_file_editor_plugin.h

@@ -77,11 +77,11 @@ class ShaderFileEditorPlugin : public EditorPlugin {
 	Button *button;
 	Button *button;
 
 
 public:
 public:
-	virtual String get_name() const { return "ShaderFile"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "ShaderFile"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	ShaderFileEditor *get_shader_editor() const { return shader_editor; }
 	ShaderFileEditor *get_shader_editor() const { return shader_editor; }
 
 

+ 5 - 5
editor/plugins/skeleton_2d_editor_plugin.h

@@ -70,11 +70,11 @@ class Skeleton2DEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "Skeleton2D"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "Skeleton2D"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	Skeleton2DEditorPlugin(EditorNode *p_node);
 	Skeleton2DEditorPlugin(EditorNode *p_node);
 	~Skeleton2DEditorPlugin();
 	~Skeleton2DEditorPlugin();

+ 3 - 3
editor/plugins/skeleton_3d_editor_plugin.h

@@ -190,8 +190,8 @@ class EditorInspectorPluginSkeleton : public EditorInspectorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual bool can_handle(Object *p_object);
-	virtual void parse_begin(Object *p_object);
+	virtual bool can_handle(Object *p_object) override;
+	virtual void parse_begin(Object *p_object) override;
 };
 };
 
 
 class Skeleton3DEditorPlugin : public EditorPlugin {
 class Skeleton3DEditorPlugin : public EditorPlugin {
@@ -202,7 +202,7 @@ class Skeleton3DEditorPlugin : public EditorPlugin {
 public:
 public:
 	Skeleton3DEditorPlugin(EditorNode *p_node);
 	Skeleton3DEditorPlugin(EditorNode *p_node);
 
 
-	virtual String get_name() const { return "Skeleton3D"; }
+	virtual String get_name() const override { return "Skeleton3D"; }
 };
 };
 
 
 #endif // SKELETON_3D_EDITOR_PLUGIN_H
 #endif // SKELETON_3D_EDITOR_PLUGIN_H

+ 5 - 5
editor/plugins/skeleton_ik_3d_editor_plugin.h

@@ -50,11 +50,11 @@ protected:
 	static void _bind_methods();
 	static void _bind_methods();
 
 
 public:
 public:
-	virtual String get_name() const { return "SkeletonIK3D"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "SkeletonIK3D"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	SkeletonIK3DEditorPlugin(EditorNode *p_node);
 	SkeletonIK3DEditorPlugin(EditorNode *p_node);
 	~SkeletonIK3DEditorPlugin();
 	~SkeletonIK3DEditorPlugin();

+ 5 - 5
editor/plugins/sprite_2d_editor_plugin.h

@@ -102,11 +102,11 @@ class Sprite2DEditorPlugin : public EditorPlugin {
 	EditorNode *editor;
 	EditorNode *editor;
 
 
 public:
 public:
-	virtual String get_name() const { return "Sprite2D"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "Sprite2D"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	Sprite2DEditorPlugin(EditorNode *p_node);
 	Sprite2DEditorPlugin(EditorNode *p_node);
 	~Sprite2DEditorPlugin();
 	~Sprite2DEditorPlugin();

+ 5 - 5
editor/plugins/sprite_frames_editor_plugin.h

@@ -140,11 +140,11 @@ class SpriteFramesEditorPlugin : public EditorPlugin {
 	Button *button;
 	Button *button;
 
 
 public:
 public:
-	virtual String get_name() const { return "SpriteFrames"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "SpriteFrames"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 
 	SpriteFramesEditorPlugin(EditorNode *p_node);
 	SpriteFramesEditorPlugin(EditorNode *p_node);
 	~SpriteFramesEditorPlugin();
 	~SpriteFramesEditorPlugin();

Some files were not shown because too many files changed in this diff