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

Timestamp:

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

Author:

landauf

Message:

StaticallyInitializedInstances are now responsible to delete the wrapped object.

Location:

code/branches/core7/src/libraries/core

Files:

• Core.cc (modified) (1 diff)
• CoreIncludes.h (modified) (1 diff)
• class/IdentifierManager.cc (modified) (1 diff)
• class/IdentifierManager.h (modified) (1 diff)
• command/ConsoleCommand.cc (modified) (1 diff)
• command/ConsoleCommandIncludes.h (modified) (1 diff)
• command/ConsoleCommandManager.cc (modified) (1 diff)
• command/ConsoleCommandManager.h (modified) (1 diff)
• commandline/CommandLineIncludes.h (modified) (1 diff)
• commandline/CommandLineParser.cc (modified) (2 diffs)
• commandline/CommandLineParser.h (modified) (1 diff)
• singleton/ScopedSingletonIncludes.h (modified) (1 diff)

code/branches/core7/src/libraries/core/Core.cc

@@ -241 +241 @@
         safeObjectDelete(&languageInstance_);
         safeObjectDelete(&configFileManager_);
-        ConsoleCommandManager::getInstance().destroyAll();
         Context::setRootContext(NULL);
-        IdentifierManager::getInstance().destroyAllIdentifiers();
         safeObjectDelete(&signalHandler_);
 //        if (this->rootModule_)

code/branches/core7/src/libraries/core/CoreIncludes.h

@@ -226 +226 @@
         public:
             StaticallyInitializedIdentifier(Identifier* identifier) : identifier_(identifier) {}
+            ~StaticallyInitializedIdentifier() { delete identifier_; }
 
             virtual void load()

code/branches/core7/src/libraries/core/class/IdentifierManager.cc

@@ -277 +277 @@
         this->identifierByNetworkId_.clear();
     }
-
-    /**
-        @brief Destroys all Identifiers. Called when exiting the program.
-    */
-    void IdentifierManager::destroyAllIdentifiers()
-    {
-        for (std::set<Identifier*>::iterator it = this->identifiers_.begin(); it != this->identifiers_.end(); ++it)
-            delete (*it);
-
-        this->identifiers_.clear();
-        this->identifierByString_.clear();
-        this->identifierByLowercaseString_.clear();
-        this->identifierByNetworkId_.clear();
-    }
 }

code/branches/core7/src/libraries/core/class/IdentifierManager.h

@@ -87 +87 @@
                 { return this->identifierByNetworkId_; }
 
-            void destroyAllIdentifiers();
-
         private:
             IdentifierManager();

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_;

code/branches/core7/src/libraries/core/commandline/CommandLineIncludes.h

@@ -59 +59 @@
         public:
             StaticallyInitializedCommandLineArgument(CommandLineArgument* argument) : argument_(argument) {}
+            ~StaticallyInitializedCommandLineArgument() { delete argument_; }
 
             virtual void load()

code/branches/core7/src/libraries/core/commandline/CommandLineParser.cc

@@ -85 +85 @@
     CommandLineParser::~CommandLineParser()
     {
-        CommandLineParser::destroyAllArguments();
     }
 
@@ -96 +95 @@
         static CommandLineParser instance;
         return instance;
-    }
-
-    /**
-    @brief
-        Destroys all command line arguments. This should be called at the end
-        of main. Do not use before that.
-    */
-    void CommandLineParser::destroyAllArguments()
-    {
-        for (std::map<std::string, CommandLineArgument*>::const_iterator it = _getInstance().cmdLineArgs_.begin();
-            it != _getInstance().cmdLineArgs_.end(); ++it)
-            delete it->second;
-        _getInstance().cmdLineArgs_.clear();
     }
 

code/branches/core7/src/libraries/core/commandline/CommandLineParser.h

@@ -161 +161 @@
         }
 
-        static void destroyAllArguments();
-
         static void generateDoc(std::ofstream& file);
 

code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h

@@ -84 +84 @@
                 , scope_(scope)
             {}
+            ~StaticallyInitializedScopedSingletonWrapper() { delete wrapper_; }
 
             virtual void load();