Changeset 10520 for code/branches/core7/src/libraries/core/command

Timestamp:

May 31, 2015, 11:54:06 AM (9 years ago)

Author:

landauf

Message:

StaticallyInitializedInstances are now responsible to delete the wrapped object.

Location:

code/branches/core7/src/libraries/core/command

Files:

• ConsoleCommand.cc (modified) (1 diff)
• ConsoleCommandIncludes.h (modified) (1 diff)
• ConsoleCommandManager.cc (modified) (1 diff)
• ConsoleCommandManager.h (modified) (1 diff)

code/branches/core7/src/libraries/core/command/ConsoleCommand.cc

@@ -92 +92 @@
     ConsoleCommand::~ConsoleCommand()
     {
-        ConsoleCommandManager::getInstance().unregisterCommand(this);
     }
 

code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.h

@@ -311 +311 @@
         public:
             StaticallyInitializedConsoleCommand(ConsoleCommand* command) : command_(command) {}
+            ~StaticallyInitializedConsoleCommand() { delete command_; }
 
             virtual void load();

code/branches/core7/src/libraries/core/command/ConsoleCommandManager.cc

@@ -191 +191 @@
         }
     }
-
-    /**
-        @brief Deletes all commands
-    */
-    void ConsoleCommandManager::destroyAll()
-    {
-        // delete entries until the map is empty
-        while (!this->commandMap_.empty() && !this->commandMap_.begin()->second.empty())
-            delete this->commandMap_.begin()->second.begin()->second;
-    }
 }

code/branches/core7/src/libraries/core/command/ConsoleCommandManager.h

@@ -68 +68 @@
             ConsoleCommand* getCommandLC(const std::string& group, const std::string& name, bool bPrintError = false);
 
-            void destroyAll();
-
         private:
             std::map<std::string, std::map<std::string, ConsoleCommand*> > commandMap_;