Make overrides consistent again.

This commit is contained in:
Relintai 2023-06-04 13:11:04 +02:00
parent 45c0147f66
commit 57153f4a33
3 changed files with 19 additions and 17 deletions

View File

@ -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();

View File

@ -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();

View File

@ -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