From 57153f4a332adcbf40ebc78d436563459fcf1d91 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Sun, 4 Jun 2023 13:11:04 +0200
Subject: [PATCH] Make overrides consistent again.

---
 .../editor/navigation_mesh_editor_plugin.h    | 10 +++++-----
 .../editor/navigation_polygon_editor_plugin.h | 20 +++++++++----------
 .../navigation/navigation_mesh_generator.h    |  6 ++++--
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/modules/navigation_mesh_generator/editor/navigation_mesh_editor_plugin.h b/modules/navigation_mesh_generator/editor/navigation_mesh_editor_plugin.h
index b73d8d2e6..caeec71ef 100644
--- a/modules/navigation_mesh_generator/editor/navigation_mesh_editor_plugin.h
+++ b/modules/navigation_mesh_generator/editor/navigation_mesh_editor_plugin.h
@@ -75,11 +75,11 @@ class NavigationMeshEditorPlugin : public EditorPlugin {
 	NavigationMeshEditor *navigation_mesh_editor = nullptr;
 
 public:
-	virtual String get_name() const override { return "NavigationMesh"; }
-	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 String get_name() const { return "NavigationMesh"; }
+	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);
 
 	NavigationMeshEditorPlugin();
 	~NavigationMeshEditorPlugin();
diff --git a/modules/navigation_mesh_generator/editor/navigation_polygon_editor_plugin.h b/modules/navigation_mesh_generator/editor/navigation_polygon_editor_plugin.h
index 43c9094c0..9a333d142 100644
--- a/modules/navigation_mesh_generator/editor/navigation_polygon_editor_plugin.h
+++ b/modules/navigation_mesh_generator/editor/navigation_polygon_editor_plugin.h
@@ -64,19 +64,19 @@ class NavigationPolygonEditor : public AbstractPolygon2DEditor {
 protected:
 	void _notification(int p_what);
 
-	virtual Node2D *_get_node() const override;
-	virtual void _set_node(Node *p_polygon) override;
+	virtual Node2D *_get_node() const;
+	virtual void _set_node(Node *p_polygon);
 
-	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 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 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 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 bool _has_resource() const override;
-	virtual void _create_resource() override;
+	virtual bool _has_resource() const;
+	virtual void _create_resource();
 
 public:
 	NavigationPolygonEditor();
diff --git a/servers/navigation/navigation_mesh_generator.h b/servers/navigation/navigation_mesh_generator.h
index 940dc3f1e..cc0cfcbaa 100644
--- a/servers/navigation/navigation_mesh_generator.h
+++ b/servers/navigation/navigation_mesh_generator.h
@@ -31,6 +31,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#include "core/object/object.h"
+
 #include "core/containers/rid.h"
 #include "core/object/class_db.h"
 #include "core/object/func_ref.h"
@@ -84,7 +86,7 @@ public:
 #endif // _3D_DISABLED
 
 	NavigationMeshGenerator();
-	~NavigationMeshGenerator() override;
+	~NavigationMeshGenerator();
 };
 
 /// NavigationMeshGeneratorManager ////////////////////////////////////////////////////
@@ -123,7 +125,7 @@ public:
 	NavigationMeshGenerator *new_server(const String &p_name) const;
 
 	NavigationMeshGeneratorManager();
-	~NavigationMeshGeneratorManager() override;
+	~NavigationMeshGeneratorManager();
 };
 
 #endif // NAVIGATION_MESH_GENERATOR_H