Changeset 2344 for code/branches/objecthierarchy2/src/core/Language.h

Timestamp:

Dec 4, 2008, 8:28:14 PM (16 years ago)

Author:

rgrieder

Message:

Completed destruction of static elements like XMLPort, Identifier, etc.
Of initially about 250 memory leaks (not in the actual meaning but the memory was never freed anyway) only 1 remains in TinyCpp.

• Core class is now a normal Singleton that gets created and destroyed in main.
• The same goes for Language, LuaBind, SignalHandler and PlayerManager.
• Added a new std::set to the CommandExecutor so that the external ConsoleCommands can get destroyed too.
• Code for destroying CommandLineArguments
• Added destruction code for ConstructionCallbacks in Identifier
• Moved internal identifier map (the one with the typeid(.) names) in a static function in Identifier. This was necessary in order to destroy ALL Identifiers with the static destruction function. Before it was possible to create an Identifier with having a class instance (that would call RegisterObject) for instance by simply accessing it via getIdentifier.
• Removed a big memory leak in Button (forgot to destroy the ConfigValueContainers)
• Added destruction code for InputBufferListenerTuples in InputBuffer destructor.
• Added destruction code for load and save executors in both XMLPortParam and XMLPortObject
• Added destruction code for ConsoleCommands in GSRoot, GSGraphics and GSLevel (temporary solution anyway)
• Deleting the CEGUILua script module seems to work properly now, one memory leak less (GUIManager.cc)
• Added global destruction calls in Main.cc

File:

• code/branches/objecthierarchy2/src/core/Language.h (modified) (3 diffs)

code/branches/objecthierarchy2/src/core/Language.h

@@ -50 +50 @@
 #include <map>
 #include <string>
+#include <cassert>
 
 #define AddLanguageEntry(label, fallbackstring) \
@@ -116 +117 @@
 
         public:
-            static Language& getLanguage();
+            Language();
+            ~Language();
+
+            static Language& getLanguage() { assert(singletonRef_s); return *singletonRef_s; }
             void addEntry(const LanguageEntryLabel& label, const std::string& entry);
             const std::string& getLocalisation(const LanguageEntryLabel& label) const;
 
         private:
-            Language();
-            Language(const Language& language);     // don't copy
-            virtual ~Language();
+            Language(const Language&);
 
             void readDefaultLanguageFile();
@@ -134 +136 @@
             std::string defaultLocalisation_;                       //!< The returned string, if an entry unavailable entry is requested
             std::map<std::string, LanguageEntry*> languageEntries_; //!< A map to store all LanguageEntry objects and their labels
+
+            static Language* singletonRef_s;
     };
 }