From 8a74c65812127c1be33deba3816ce347dfee0793 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 2 Apr 2025 17:54:28 +0300 Subject: [PATCH] refactor: remove unused 'virtual' keywords --- src/graphics/ui/elements/UINode.hpp | 6 +++--- src/graphics/ui/gui_util.hpp | 6 +++++- src/logic/EngineController.cpp | 1 + src/logic/scripting/lua/libs/libgui.cpp | 1 + src/logic/scripting/lua/libs/libpack.cpp | 1 + 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/graphics/ui/elements/UINode.hpp b/src/graphics/ui/elements/UINode.hpp index abbb331e..aad04343 100644 --- a/src/graphics/ui/elements/UINode.hpp +++ b/src/graphics/ui/elements/UINode.hpp @@ -225,11 +225,11 @@ namespace gui { virtual glm::vec2 calcPos() const; virtual void setPos(glm::vec2 pos); virtual glm::vec2 getPos() const; - virtual glm::vec2 getSize() const; + glm::vec2 getSize() const; virtual void setSize(glm::vec2 size); - virtual glm::vec2 getMinSize() const; + glm::vec2 getMinSize() const; virtual void setMinSize(glm::vec2 size); - virtual glm::vec2 getMaxSize() const; + glm::vec2 getMaxSize() const; virtual void setMaxSize(glm::vec2 size); /// @brief Called in containers when new element added virtual void refresh() {}; diff --git a/src/graphics/ui/gui_util.hpp b/src/graphics/ui/gui_util.hpp index 09f55af3..31d7525c 100644 --- a/src/graphics/ui/gui_util.hpp +++ b/src/graphics/ui/gui_util.hpp @@ -3,12 +3,16 @@ #include #include -#include "GUI.hpp" #include "delegates.hpp" #include "typedefs.hpp" class Engine; +namespace gui { + class GUI; + class UINode; +} + namespace guiutil { /// @brief Create element from XML /// @param source XML diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp index 4d9f8953..ec125909 100644 --- a/src/logic/EngineController.cpp +++ b/src/logic/EngineController.cpp @@ -16,6 +16,7 @@ #include "frontend/menu.hpp" #include "frontend/screens/LevelScreen.hpp" #include "frontend/screens/MenuScreen.hpp" +#include "graphics/ui/GUI.hpp" #include "graphics/ui/elements/Menu.hpp" #include "graphics/ui/gui_util.hpp" #include "objects/Players.hpp" diff --git a/src/logic/scripting/lua/libs/libgui.cpp b/src/logic/scripting/lua/libs/libgui.cpp index 00c5fd4b..4a5f4ec9 100644 --- a/src/logic/scripting/lua/libs/libgui.cpp +++ b/src/logic/scripting/lua/libs/libgui.cpp @@ -2,6 +2,7 @@ #include "assets/Assets.hpp" #include "engine/Engine.hpp" #include "frontend/locale.hpp" +#include "graphics/ui/GUI.hpp" #include "graphics/ui/elements/Button.hpp" #include "graphics/ui/elements/Canvas.hpp" #include "graphics/ui/elements/CheckBox.hpp" diff --git a/src/logic/scripting/lua/libs/libpack.cpp b/src/logic/scripting/lua/libs/libpack.cpp index dcbbd50d..e95cf2ba 100644 --- a/src/logic/scripting/lua/libs/libpack.cpp +++ b/src/logic/scripting/lua/libs/libpack.cpp @@ -9,6 +9,7 @@ #include "content/ContentControl.hpp" #include "content/PacksManager.hpp" #include "engine/Engine.hpp" +#include "graphics/ui/GUI.hpp" #include "graphics/ui/gui_util.hpp" #include "graphics/ui/elements/Menu.hpp" #include "frontend/locale.hpp"