From 978b535a2f236cc1c16ce50ef7017acfaf8bd9c5 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 22 Jun 2015 22:57:15 +0200
Subject: [PATCH] Remove setName function from OpenSpaceModule and move naming
 into constructor

---
 include/openspace/util/openspacemodule.h  |  5 ++---
 modules/base/basemodule.cpp               |  6 +++---
 modules/fieldlines/fieldlinesmodule.cpp   |  6 +++---
 modules/kameleon/kameleonmodule.cpp       |  6 +++---
 modules/newhorizons/newhorizonsmodule.cpp |  6 +++---
 modules/onscreengui/onscreenguimodule.cpp |  6 +++---
 modules/volume/volumemodule.cpp           |  6 +++---
 src/util/openspacemodule.cpp              | 11 ++++++-----
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/include/openspace/util/openspacemodule.h b/include/openspace/util/openspacemodule.h
index 7f2d17c7d7..30e43de50b 100644
--- a/include/openspace/util/openspacemodule.h
+++ b/include/openspace/util/openspacemodule.h
@@ -31,7 +31,7 @@ namespace openspace {
 
 class OpenSpaceModule {
 public:
-    OpenSpaceModule() = default;
+    OpenSpaceModule(std::string name);
     virtual ~OpenSpaceModule() = default;
 
     virtual bool initialize();
@@ -40,10 +40,9 @@ public:
     std::string name() const;
 
 protected:
-    void setName(std::string name);
     std::string modulePath() const;
 
-    std::string _name;
+    const std::string _name;
 };
 
 } // namespace openspace
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index e03cc14326..42ca428188 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -51,9 +51,9 @@
 
 namespace openspace {
 
-BaseModule::BaseModule() {
-    setName("Base");
-}
+BaseModule::BaseModule() 
+    : OpenSpaceModule("Base")
+{}
 
 bool BaseModule::initialize() {
     bool success = OpenSpaceModule::initialize();
diff --git a/modules/fieldlines/fieldlinesmodule.cpp b/modules/fieldlines/fieldlinesmodule.cpp
index 1c72f6d264..323a106745 100644
--- a/modules/fieldlines/fieldlinesmodule.cpp
+++ b/modules/fieldlines/fieldlinesmodule.cpp
@@ -33,9 +33,9 @@
 
 namespace openspace {
 
-FieldlinesModule::FieldlinesModule() {
-    setName("Fieldlines");
-}
+FieldlinesModule::FieldlinesModule()
+    : OpenSpaceModule("Fieldlines")
+{}
 
 bool FieldlinesModule::initialize() {
     bool success = OpenSpaceModule::initialize();
diff --git a/modules/kameleon/kameleonmodule.cpp b/modules/kameleon/kameleonmodule.cpp
index bde173db2b..0da01945a0 100644
--- a/modules/kameleon/kameleonmodule.cpp
+++ b/modules/kameleon/kameleonmodule.cpp
@@ -26,9 +26,9 @@
 
 namespace openspace {
 
-KameleonModule::KameleonModule() {
-    setName("Kameleon");
-}
+KameleonModule::KameleonModule()
+    : OpenSpaceModule("Kameleon")
+{}
 
 bool KameleonModule::initialize() {
     bool success = OpenSpaceModule::initialize();
diff --git a/modules/newhorizons/newhorizonsmodule.cpp b/modules/newhorizons/newhorizonsmodule.cpp
index 8a1570fcf2..59ea77c0b3 100644
--- a/modules/newhorizons/newhorizonsmodule.cpp
+++ b/modules/newhorizons/newhorizonsmodule.cpp
@@ -46,9 +46,9 @@
 
 namespace openspace {
 
-NewHorizonsModule::NewHorizonsModule() {
-    setName("NewHorizons");
-}
+NewHorizonsModule::NewHorizonsModule()
+    : OpenSpaceModule("NewHorizons")
+{}
 
 bool NewHorizonsModule::initialize() {
     bool success = OpenSpaceModule::initialize();
diff --git a/modules/onscreengui/onscreenguimodule.cpp b/modules/onscreengui/onscreenguimodule.cpp
index ac024bc300..a41f09a988 100644
--- a/modules/onscreengui/onscreenguimodule.cpp
+++ b/modules/onscreengui/onscreenguimodule.cpp
@@ -26,9 +26,9 @@
 
 namespace openspace {
 
-OnScreenGUIModule::OnScreenGUIModule() {
-    setName("OnScreenGUI");
-}
+OnScreenGUIModule::OnScreenGUIModule() 
+    : OpenSpaceModule("OnScreenGUI")
+{}
 
 bool OnScreenGUIModule::initialize() {
     bool success = OpenSpaceModule::initialize();
diff --git a/modules/volume/volumemodule.cpp b/modules/volume/volumemodule.cpp
index 08eba0f856..3120ad753d 100644
--- a/modules/volume/volumemodule.cpp
+++ b/modules/volume/volumemodule.cpp
@@ -33,9 +33,9 @@
 
 namespace openspace {
 
-VolumeModule::VolumeModule() {
-    setName("Volume");
-}
+VolumeModule::VolumeModule() 
+    : OpenSpaceModule("Volume")
+{}
 
 bool VolumeModule::initialize() {
     bool success = OpenSpaceModule::initialize();
diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp
index dc944f3fe3..5a11d03f66 100644
--- a/src/util/openspacemodule.cpp
+++ b/src/util/openspacemodule.cpp
@@ -37,8 +37,13 @@ namespace {
 //ghoul::filesystem::FileSystem::TokenClosingBraces
 namespace openspace {
 
+OpenSpaceModule::OpenSpaceModule(std::string name)
+    : _name(std::move(name))
+{
+    ghoul_assert(!_name.empty(), "Empty module name is not allowed");
+}
+
 bool OpenSpaceModule::initialize() {
-    ghoul_assert(!(name().empty()), "Module name must be set before initialize call");
     std::string moduleNameUpper = name();
     std::transform(moduleNameUpper.begin(), moduleNameUpper.end(), moduleNameUpper.begin(), toupper);
     std::string moduleToken = 
@@ -61,10 +66,6 @@ std::string OpenSpaceModule::name() const {
     return _name;
 }
 
-void OpenSpaceModule::setName(std::string name) {
-    _name = std::move(name);
-}
-
 std::string OpenSpaceModule::modulePath() const {
     std::string moduleName = name();
     std::transform(moduleName.begin(), moduleName.end(), moduleName.begin(), tolower);