[Orxonox-commit 5694] r10354 - code/branches/core7/src/libraries/core/command

[landauf at orxonox.net]

Author: landauf
Date: 2015-04-11 22:36:15 +0200 (Sat, 11 Apr 2015)
New Revision: 10354

Modified:
   code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.cc
   code/branches/core7/src/libraries/core/command/ConsoleCommandManager.cc
   code/branches/core7/src/libraries/core/command/ConsoleCommandManager.h
Log:
moved code from static initializer into new function in ConsoleCommandManager

Modified: code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.cc
===================================================================
--- code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.cc	2015-04-08 21:15:43 UTC (rev 10353)
+++ code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.cc	2015-04-11 20:36:15 UTC (rev 10354)
@@ -34,10 +34,6 @@
 {
     void StaticallyInitializedConsoleCommand::load()
     {
-        for (size_t i = 0; i < this->command_->getNames().size(); ++i)
-        {
-            const ConsoleCommand::CommandName& name = this->command_->getNames()[i];
-            ConsoleCommandManager::registerCommand(name.group_, name.name_, this->command_);
-        }
+        ConsoleCommandManager::registerCommand(this->command_);
     }
 }

Modified: code/branches/core7/src/libraries/core/command/ConsoleCommandManager.cc
===================================================================
--- code/branches/core7/src/libraries/core/command/ConsoleCommandManager.cc	2015-04-08 21:15:43 UTC (rev 10353)
+++ code/branches/core7/src/libraries/core/command/ConsoleCommandManager.cc	2015-04-11 20:36:15 UTC (rev 10354)
@@ -120,6 +120,18 @@
     }
 
     /**
+        @brief Registers a new command with the groups and names that are defined by ConsoleCommand::getNames().
+    */
+    /* static */ void ConsoleCommandManager::registerCommand(ConsoleCommand* command)
+    {
+        for (size_t i = 0; i < command->getNames().size(); ++i)
+        {
+            const ConsoleCommand::CommandName& name = command->getNames()[i];
+            ConsoleCommandManager::registerCommand(name.group_, name.name_, command);
+        }
+    }
+
+    /**
         @brief Registers a new command with given group an name by adding it to the command map.
     */
     /* static */ void ConsoleCommandManager::registerCommand(const std::string& group, const std::string& name, ConsoleCommand* command)

Modified: code/branches/core7/src/libraries/core/command/ConsoleCommandManager.h
===================================================================
--- code/branches/core7/src/libraries/core/command/ConsoleCommandManager.h	2015-04-08 21:15:43 UTC (rev 10353)
+++ code/branches/core7/src/libraries/core/command/ConsoleCommandManager.h	2015-04-11 20:36:15 UTC (rev 10354)
@@ -44,6 +44,7 @@
     class _CoreExport ConsoleCommandManager
     {
         public:
+            static void registerCommand(ConsoleCommand* command);
             static void registerCommand(const std::string& group, const std::string& name, ConsoleCommand* command);
             static void unregisterCommand(ConsoleCommand* command);