[Orxonox-commit 5890] r10549 - in code/branches/core7/src/libraries/core: . module

[landauf at orxonox.net]

Author: landauf
Date: 2015-08-27 22:40:50 +0200 (Thu, 27 Aug 2015)
New Revision: 10549

Modified:
   code/branches/core7/src/libraries/core/Core.cc
   code/branches/core7/src/libraries/core/module/ModuleInstance.cc
   code/branches/core7/src/libraries/core/module/ModuleInstance.h
Log:
renamed variable. it's the library's name (e.g. libpong) and not the modules name (e.g. 'pong')

Modified: code/branches/core7/src/libraries/core/Core.cc
===================================================================
--- code/branches/core7/src/libraries/core/Core.cc	2015-08-26 20:09:43 UTC (rev 10548)
+++ code/branches/core7/src/libraries/core/Core.cc	2015-08-27 20:40:50 UTC (rev 10549)
@@ -290,10 +290,10 @@
 
     void Core::loadModule(ModuleInstance* module)
     {
-        orxout(internal_info) << "Loading module " << module->getName() << "..." << endl;
+        orxout(internal_info) << "Loading module " << module->getLibraryName() << "..." << endl;
 
         ModuleInstance::setCurrentModuleInstance(module);
-        DynLib* dynLib = this->dynLibManager_->load(module->getName());
+        DynLib* dynLib = this->dynLibManager_->load(module->getLibraryName());
         module->setDynLib(dynLib);
 
         StaticInitializationManager::getInstance().loadModule(module);

Modified: code/branches/core7/src/libraries/core/module/ModuleInstance.cc
===================================================================
--- code/branches/core7/src/libraries/core/module/ModuleInstance.cc	2015-08-26 20:09:43 UTC (rev 10548)
+++ code/branches/core7/src/libraries/core/module/ModuleInstance.cc	2015-08-27 20:40:50 UTC (rev 10549)
@@ -34,8 +34,8 @@
 {
     ModuleInstance* ModuleInstance::currentModuleInstance_s = NULL;
 
-    ModuleInstance::ModuleInstance(const std::string& name)
-        : name_(name)
+    ModuleInstance::ModuleInstance(const std::string& libraryName)
+        : libraryName_(libraryName)
         , dynLib_(NULL)
     {
     }

Modified: code/branches/core7/src/libraries/core/module/ModuleInstance.h
===================================================================
--- code/branches/core7/src/libraries/core/module/ModuleInstance.h	2015-08-26 20:09:43 UTC (rev 10548)
+++ code/branches/core7/src/libraries/core/module/ModuleInstance.h	2015-08-27 20:40:50 UTC (rev 10549)
@@ -42,7 +42,7 @@
     class _CoreExport ModuleInstance
     {
         public:
-            ModuleInstance(const std::string& name);
+            ModuleInstance(const std::string& libraryName);
             ~ModuleInstance();
 
             void addStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
@@ -56,8 +56,8 @@
 
             void deleteAllStaticallyInitializedInstances();
 
-            inline const std::string& getName() const
-                { return this->name_; }
+            inline const std::string& getLibraryName() const
+                { return this->libraryName_; }
 
             inline void setDynLib(DynLib* dynLib)
                 { this->dynLib_ = dynLib; }
@@ -69,7 +69,7 @@
 
         private:
             std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*> > staticallyInitializedInstancesByType_;
-            std::string name_;
+            std::string libraryName_;
             DynLib* dynLib_;
 
             static ModuleInstance* currentModuleInstance_s;