diff --git a/include/openspace/engine/moduleengine.h b/include/openspace/engine/moduleengine.h index aaf46f8f5a..08a9c663c3 100644 --- a/include/openspace/engine/moduleengine.h +++ b/include/openspace/engine/moduleengine.h @@ -97,7 +97,7 @@ public: ModuleSubClass* module() const { auto it = std::find_if(_modules.begin(), _modules.end(), [](const std::unique_ptr& module) { - return module->name() == ModuleSubClass::name; + return module->name() == ModuleSubClass::Name; }); if (it != _modules.end()) { return dynamic_cast(it->get()); diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp index 47af9e3ec5..85382d5add 100644 --- a/modules/base/basemodule.cpp +++ b/modules/base/basemodule.cpp @@ -52,9 +52,7 @@ namespace openspace { -BaseModule::BaseModule() - : OpenSpaceModule("Base") -{} +BaseModule::BaseModule() : OpenSpaceModule(BaseModule::Name) {} void BaseModule::internalInitialize() { FactoryManager::ref().addFactory( diff --git a/modules/base/basemodule.h b/modules/base/basemodule.h index 257cdec7ce..8cb316d515 100644 --- a/modules/base/basemodule.h +++ b/modules/base/basemodule.h @@ -31,6 +31,8 @@ namespace openspace { class BaseModule : public OpenSpaceModule { public: + constexpr static const char* Name = "Base"; + BaseModule(); virtual ~BaseModule() = default; std::vector documentations() const override; diff --git a/modules/debugging/debuggingmodule.cpp b/modules/debugging/debuggingmodule.cpp index 4793bbb81e..bbebf4a0db 100644 --- a/modules/debugging/debuggingmodule.cpp +++ b/modules/debugging/debuggingmodule.cpp @@ -34,7 +34,7 @@ namespace openspace { DebuggingModule::DebuggingModule() - : OpenSpaceModule("Debugging") + : OpenSpaceModule(Name) {} void DebuggingModule::internalInitialize() { @@ -42,7 +42,6 @@ void DebuggingModule::internalInitialize() { ghoul_assert(fRenderable, "No renderable factory existed"); fRenderable->registerClass("RenderableDebugPlane"); - } } // namespace openspace diff --git a/modules/debugging/debuggingmodule.h b/modules/debugging/debuggingmodule.h index a626899a89..a030471b21 100644 --- a/modules/debugging/debuggingmodule.h +++ b/modules/debugging/debuggingmodule.h @@ -31,6 +31,8 @@ namespace openspace { class DebuggingModule : public OpenSpaceModule { public: + constexpr static const char* Name = "Debugging"; + DebuggingModule(); protected: diff --git a/modules/fieldlines/fieldlinesmodule.cpp b/modules/fieldlines/fieldlinesmodule.cpp index bc74add3d4..f677bd8d95 100644 --- a/modules/fieldlines/fieldlinesmodule.cpp +++ b/modules/fieldlines/fieldlinesmodule.cpp @@ -34,7 +34,7 @@ namespace openspace { FieldlinesModule::FieldlinesModule() - : OpenSpaceModule("Fieldlines") + : OpenSpaceModule(Name) {} void FieldlinesModule::internalInitialize() { diff --git a/modules/fieldlines/fieldlinesmodule.h b/modules/fieldlines/fieldlinesmodule.h index ef06ed869c..3c3f451ee2 100644 --- a/modules/fieldlines/fieldlinesmodule.h +++ b/modules/fieldlines/fieldlinesmodule.h @@ -31,6 +31,8 @@ namespace openspace { class FieldlinesModule : public OpenSpaceModule { public: + constexpr static const char* Name = "Fieldlines"; + FieldlinesModule(); protected: diff --git a/modules/galaxy/galaxymodule.cpp b/modules/galaxy/galaxymodule.cpp index 636055634c..a304be6094 100644 --- a/modules/galaxy/galaxymodule.cpp +++ b/modules/galaxy/galaxymodule.cpp @@ -32,7 +32,7 @@ namespace openspace { -GalaxyModule::GalaxyModule() : OpenSpaceModule("Galaxy") {} +GalaxyModule::GalaxyModule() : OpenSpaceModule(Name) {} void GalaxyModule::internalInitialize() { auto fRenderable = FactoryManager::ref().factory(); diff --git a/modules/galaxy/galaxymodule.h b/modules/galaxy/galaxymodule.h index 6525a9a5a8..19442bfdd5 100644 --- a/modules/galaxy/galaxymodule.h +++ b/modules/galaxy/galaxymodule.h @@ -31,6 +31,8 @@ namespace openspace { class GalaxyModule : public OpenSpaceModule { public: + constexpr static const char* Name = "Galaxy"; + GalaxyModule(); void internalInitialize() override; }; diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp index a4d9b9947c..546029c3b1 100644 --- a/modules/globebrowsing/globebrowsingmodule.cpp +++ b/modules/globebrowsing/globebrowsingmodule.cpp @@ -53,11 +53,7 @@ namespace openspace { -const std::string GlobeBrowsingModule::name = "GlobeBrowsing"; - -GlobeBrowsingModule::GlobeBrowsingModule() - : OpenSpaceModule(name) -{ } +GlobeBrowsingModule::GlobeBrowsingModule() : OpenSpaceModule(Name) {} void GlobeBrowsingModule::internalInitialize() { using namespace globebrowsing; diff --git a/modules/globebrowsing/globebrowsingmodule.h b/modules/globebrowsing/globebrowsingmodule.h index a72a4b0fee..718190c9e0 100644 --- a/modules/globebrowsing/globebrowsingmodule.h +++ b/modules/globebrowsing/globebrowsingmodule.h @@ -38,7 +38,7 @@ namespace cache { class GlobeBrowsingModule : public OpenSpaceModule { public: - static const std::string name; + constexpr static const char* Name = "GlobeBrowsing"; GlobeBrowsingModule(); diff --git a/modules/iswa/iswamodule.cpp b/modules/iswa/iswamodule.cpp index e9c1b5004b..18600e92bb 100644 --- a/modules/iswa/iswamodule.cpp +++ b/modules/iswa/iswamodule.cpp @@ -39,7 +39,7 @@ namespace openspace { IswaModule::IswaModule() - : OpenSpaceModule("ISWA") + : OpenSpaceModule(Name) { OsEng.registerModuleCallback( OpenSpaceEngine::CallbackOption::Initialize, diff --git a/modules/iswa/iswamodule.h b/modules/iswa/iswamodule.h index 6b92f37634..3c7477e169 100644 --- a/modules/iswa/iswamodule.h +++ b/modules/iswa/iswamodule.h @@ -31,6 +31,8 @@ class IswaModule : public OpenSpaceModule { public: + constexpr static const char* Name = "Iswa"; + IswaModule(); scripting::LuaLibrary luaLibrary() const override; diff --git a/modules/kameleon/kameleonmodule.cpp b/modules/kameleon/kameleonmodule.cpp index 35950630f3..8b2603e5dd 100644 --- a/modules/kameleon/kameleonmodule.cpp +++ b/modules/kameleon/kameleonmodule.cpp @@ -26,8 +26,6 @@ namespace openspace { -KameleonModule::KameleonModule() - : OpenSpaceModule("Kameleon") -{} +KameleonModule::KameleonModule() : OpenSpaceModule(Name) {} } // namespace openspace diff --git a/modules/kameleon/kameleonmodule.h b/modules/kameleon/kameleonmodule.h index fce0c25746..f8a066a62e 100644 --- a/modules/kameleon/kameleonmodule.h +++ b/modules/kameleon/kameleonmodule.h @@ -31,6 +31,8 @@ namespace openspace { class KameleonModule : public OpenSpaceModule { public: + constexpr static const char* Name = "Kameleon"; + KameleonModule(); }; diff --git a/modules/kameleonvolume/kameleonvolumemodule.cpp b/modules/kameleonvolume/kameleonvolumemodule.cpp index c521538492..79498c9c2c 100644 --- a/modules/kameleonvolume/kameleonvolumemodule.cpp +++ b/modules/kameleonvolume/kameleonvolumemodule.cpp @@ -35,7 +35,7 @@ namespace openspace { -KameleonVolumeModule::KameleonVolumeModule() : OpenSpaceModule("KameleonVolume") {} +KameleonVolumeModule::KameleonVolumeModule() : OpenSpaceModule(Name) {} void KameleonVolumeModule::internalInitialize() { auto fRenderable = FactoryManager::ref().factory(); diff --git a/modules/kameleonvolume/kameleonvolumemodule.h b/modules/kameleonvolume/kameleonvolumemodule.h index adae6f1320..1d122ef036 100644 --- a/modules/kameleonvolume/kameleonvolumemodule.h +++ b/modules/kameleonvolume/kameleonvolumemodule.h @@ -32,6 +32,8 @@ namespace openspace { class KameleonVolumeModule : public OpenSpaceModule { public: + constexpr static const char* Name = "KameleonVolume"; + KameleonVolumeModule(); virtual ~KameleonVolumeModule() = default; void internalInitialize() override; diff --git a/modules/multiresvolume/multiresvolumemodule.cpp b/modules/multiresvolume/multiresvolumemodule.cpp index e5c64dabcb..e49321990a 100644 --- a/modules/multiresvolume/multiresvolumemodule.cpp +++ b/modules/multiresvolume/multiresvolumemodule.cpp @@ -33,7 +33,7 @@ namespace openspace { -MultiresVolumeModule::MultiresVolumeModule() : OpenSpaceModule("MultiresVolume") {} +MultiresVolumeModule::MultiresVolumeModule() : OpenSpaceModule(Name) {} void MultiresVolumeModule::internalInitialize() { auto fRenderable = FactoryManager::ref().factory(); diff --git a/modules/multiresvolume/multiresvolumemodule.h b/modules/multiresvolume/multiresvolumemodule.h index 9d0a504c0d..ff71a3b95b 100644 --- a/modules/multiresvolume/multiresvolumemodule.h +++ b/modules/multiresvolume/multiresvolumemodule.h @@ -31,6 +31,8 @@ namespace openspace { class MultiresVolumeModule : public OpenSpaceModule { public: + constexpr static const char* Name = "MultiresVolume"; + MultiresVolumeModule(); void internalInitialize() override; }; diff --git a/modules/newhorizons/newhorizonsmodule.cpp b/modules/newhorizons/newhorizonsmodule.cpp index 12eaf6f95c..73f61f03c8 100644 --- a/modules/newhorizons/newhorizonsmodule.cpp +++ b/modules/newhorizons/newhorizonsmodule.cpp @@ -43,9 +43,7 @@ namespace openspace { -NewHorizonsModule::NewHorizonsModule() - : OpenSpaceModule("NewHorizons") -{} +NewHorizonsModule::NewHorizonsModule() : OpenSpaceModule(Name) {} void NewHorizonsModule::internalInitialize() { ImageSequencer::initialize(); diff --git a/modules/newhorizons/newhorizonsmodule.h b/modules/newhorizons/newhorizonsmodule.h index 20acee08cb..fce3c98951 100644 --- a/modules/newhorizons/newhorizonsmodule.h +++ b/modules/newhorizons/newhorizonsmodule.h @@ -31,6 +31,8 @@ namespace openspace { class NewHorizonsModule : public OpenSpaceModule { public: + constexpr static const char* Name = "NewHorizons"; + NewHorizonsModule(); std::vector documentations() const override; diff --git a/modules/onscreengui/onscreenguimodule.cpp b/modules/onscreengui/onscreenguimodule.cpp index 5386e96493..dac4b78212 100644 --- a/modules/onscreengui/onscreenguimodule.cpp +++ b/modules/onscreengui/onscreenguimodule.cpp @@ -45,7 +45,7 @@ namespace openspace { gui::GUI OnScreenGUIModule::gui; OnScreenGUIModule::OnScreenGUIModule() - : OpenSpaceModule("OnScreenGUI") + : OpenSpaceModule(Name) { addPropertySubOwner(gui); diff --git a/modules/onscreengui/onscreenguimodule.h b/modules/onscreengui/onscreenguimodule.h index 6576843c68..7a610cb35b 100644 --- a/modules/onscreengui/onscreenguimodule.h +++ b/modules/onscreengui/onscreenguimodule.h @@ -33,6 +33,8 @@ namespace openspace { class OnScreenGUIModule : public OpenSpaceModule { public: + constexpr static const char* Name = "OnScreenGUI"; + OnScreenGUIModule(); static gui::GUI gui; diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp index 00c3361e3a..cd1baf6328 100644 --- a/modules/space/spacemodule.cpp +++ b/modules/space/spacemodule.cpp @@ -45,9 +45,7 @@ namespace openspace { -SpaceModule::SpaceModule() - : OpenSpaceModule("Space") -{} +SpaceModule::SpaceModule() : OpenSpaceModule(Name) {} void SpaceModule::internalInitialize() { FactoryManager::ref().addFactory( diff --git a/modules/space/spacemodule.h b/modules/space/spacemodule.h index 3d954c30a9..7afa272a09 100644 --- a/modules/space/spacemodule.h +++ b/modules/space/spacemodule.h @@ -31,6 +31,8 @@ namespace openspace { class SpaceModule : public OpenSpaceModule { public: + constexpr static const char* Name = "Space"; + SpaceModule(); virtual ~SpaceModule() = default; std::vector documentations() const override; diff --git a/modules/toyvolume/toyvolumemodule.cpp b/modules/toyvolume/toyvolumemodule.cpp index a5b62d5183..216d20abee 100644 --- a/modules/toyvolume/toyvolumemodule.cpp +++ b/modules/toyvolume/toyvolumemodule.cpp @@ -32,7 +32,7 @@ namespace openspace { -ToyVolumeModule::ToyVolumeModule() : OpenSpaceModule("ToyVolume") {} +ToyVolumeModule::ToyVolumeModule() : OpenSpaceModule(Name) {} void ToyVolumeModule::internalInitialize() { auto fRenderable = FactoryManager::ref().factory(); diff --git a/modules/toyvolume/toyvolumemodule.h b/modules/toyvolume/toyvolumemodule.h index 458ad42aeb..1ad02ec9d4 100644 --- a/modules/toyvolume/toyvolumemodule.h +++ b/modules/toyvolume/toyvolumemodule.h @@ -31,6 +31,8 @@ namespace openspace { class ToyVolumeModule : public OpenSpaceModule { public: + constexpr static const char* Name = "ToyVolume"; + ToyVolumeModule(); void internalInitialize() override; }; diff --git a/modules/volume/volumemodule.cpp b/modules/volume/volumemodule.cpp index 1a2a7b9115..a7bb05f7d4 100644 --- a/modules/volume/volumemodule.cpp +++ b/modules/volume/volumemodule.cpp @@ -31,9 +31,7 @@ namespace openspace { -VolumeModule::VolumeModule() - : OpenSpaceModule("Volume") -{} +VolumeModule::VolumeModule() : OpenSpaceModule(Name) {} void VolumeModule::internalInitialize() { diff --git a/modules/volume/volumemodule.h b/modules/volume/volumemodule.h index 31df179c3c..ff8a528d92 100644 --- a/modules/volume/volumemodule.h +++ b/modules/volume/volumemodule.h @@ -31,6 +31,8 @@ namespace openspace { class VolumeModule : public OpenSpaceModule { public: + constexpr static const char* Name = "Volume"; + VolumeModule(); protected: