diff options
| -rw-r--r-- | src/DI/auto_wirable.hpp | 9 | ||||
| -rw-r--r-- | src/DI/container.hpp | 2 | ||||
| -rw-r--r-- | src/DI/object_type.hpp | 10 | ||||
| -rw-r--r-- | src/interfaces/engine.hpp | 3 | ||||
| -rw-r--r-- | src/interfaces/window.hpp | 3 |
5 files changed, 10 insertions, 17 deletions
diff --git a/src/DI/auto_wirable.hpp b/src/DI/auto_wirable.hpp index a903242..178158a 100644 --- a/src/DI/auto_wirable.hpp +++ b/src/DI/auto_wirable.hpp @@ -4,15 +4,8 @@ #include <memory> -// NOLINTNEXTLINE(cppcoreguidelines-special-member-functions) -class IGenericAutoWirable -{ -public: - virtual ~IGenericAutoWirable() noexcept = default; -}; - template <class Interface> -class IAutoWirable : public IGenericAutoWirable +class IAutoWirable { public: static Interface resolve() noexcept; diff --git a/src/DI/container.hpp b/src/DI/container.hpp index 974780a..2efb265 100644 --- a/src/DI/container.hpp +++ b/src/DI/container.hpp @@ -34,7 +34,7 @@ public: template <class Interface> BindingBuilder<Interface> bind() noexcept; - template <class Interface, class = std::enable_if_t<std::is_class_v<Interface>>> + template <class Interface, class = std::enable_if_t<std::is_abstract_v<Interface>>> std::shared_ptr<Interface> get() const noexcept; template <typename Interface, typename = std::enable_if_t<is_func_v<Interface>>> diff --git a/src/DI/object_type.hpp b/src/DI/object_type.hpp index 84bb287..6b27682 100644 --- a/src/DI/object_type.hpp +++ b/src/DI/object_type.hpp @@ -25,14 +25,8 @@ public: ObjectType() noexcept : BaseObjectType(typeid(Object)) {} }; -class IObjectTypeHasher +class ObjectTypeHasher { public: - virtual std::size_t operator()(const BaseObjectType &object_type) const noexcept = 0; -}; - -class ObjectTypeHasher : public IObjectTypeHasher -{ -public: - std::size_t operator()(const BaseObjectType &object_type) const noexcept override; + std::size_t operator()(const BaseObjectType &object_type) const noexcept; }; diff --git a/src/interfaces/engine.hpp b/src/interfaces/engine.hpp index 6830340..72d8f81 100644 --- a/src/interfaces/engine.hpp +++ b/src/interfaces/engine.hpp @@ -2,8 +2,11 @@ #include <unordered_map> +// NOLINTNEXTLINE(cppcoreguidelines-special-member-functions) class ICLIGameEngine { public: + virtual ~ICLIGameEngine() noexcept = default; + virtual void start() noexcept = 0; }; diff --git a/src/interfaces/window.hpp b/src/interfaces/window.hpp index 5da9aff..d880762 100644 --- a/src/interfaces/window.hpp +++ b/src/interfaces/window.hpp @@ -2,8 +2,11 @@ #include "engine/data/bounds.hpp" +// NOLINTNEXTLINE(cppcoreguidelines-special-member-functions) class IWindow { public: + virtual ~IWindow() noexcept = default; + [[nodiscard]] virtual Bounds size() const noexcept = 0; }; |