From 72346162a5777592a5c1906e697d4b3ecdec2aa6 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 30 Sep 2023 13:34:45 -0500 Subject: [PATCH] [keel,nostalgia] Add id() function to Keel modules --- src/keel/module.hpp | 2 ++ src/nostalgia/modules/core/src/keel/keelmodule.cpp | 7 ++++++- src/nostalgia/modules/scene/src/keel/keelmodule.cpp | 7 ++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/keel/module.hpp b/src/keel/module.hpp index c8c2cb2f..78b8865e 100644 --- a/src/keel/module.hpp +++ b/src/keel/module.hpp @@ -27,6 +27,8 @@ class Module { Module &operator=(Module&&) noexcept = delete; constexpr virtual ~Module() noexcept = default; + [[nodiscard]] + virtual ox::String id() const noexcept = 0; [[nodiscard]] virtual ox::Vector types() const noexcept; [[nodiscard]] diff --git a/src/nostalgia/modules/core/src/keel/keelmodule.cpp b/src/nostalgia/modules/core/src/keel/keelmodule.cpp index f7d78cb5..b7ee013f 100644 --- a/src/nostalgia/modules/core/src/keel/keelmodule.cpp +++ b/src/nostalgia/modules/core/src/keel/keelmodule.cpp @@ -22,6 +22,11 @@ class KeelModule: public keel::Module { TileSheetV2ToTileSheetConverter m_tileSheetV2ToTileSheetConverter; public: + [[nodiscard]] + ox::String id() const noexcept override { + return "net.drinkingtea.nostalgia.core"; + } + [[nodiscard]] ox::Vector types() const noexcept final { return { @@ -63,7 +68,7 @@ class KeelModule: public keel::Module { } }; -static KeelModule mod; +static const KeelModule mod; const keel::Module *keelModule() noexcept { return &mod; } diff --git a/src/nostalgia/modules/scene/src/keel/keelmodule.cpp b/src/nostalgia/modules/scene/src/keel/keelmodule.cpp index 96035be4..258a3322 100644 --- a/src/nostalgia/modules/scene/src/keel/keelmodule.cpp +++ b/src/nostalgia/modules/scene/src/keel/keelmodule.cpp @@ -15,6 +15,11 @@ class SceneModule: public keel::Module { SceneDocToSceneStaticConverter m_sceneDocToSceneStaticConverter; public: + [[nodiscard]] + ox::String id() const noexcept override { + return "net.drinkingtea.nostalgia.scene"; + } + [[nodiscard]] ox::Vector types() const noexcept override { return { @@ -39,7 +44,7 @@ class SceneModule: public keel::Module { }; -static SceneModule mod; +static const SceneModule mod; const keel::Module *keelModule() noexcept { return &mod; }