Changeset 2662 for code/trunk/src/core/Language.cc

Timestamp:

Feb 14, 2009, 10:17:35 PM (16 years ago)

Author:

rgrieder

Message:

Merged presentation branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/Language.cc (modified) (5 diffs)

code/trunk/src/core/Language.cc

@@ -87 +87 @@
     // ###        Language         ###
     // ###############################
+
+    Language* Language::singletonRef_s = 0;
+
     /**
         @brief Constructor: Reads the default language file and sets some values.
@@ -92 +95 @@
     Language::Language()
     {
+        assert(singletonRef_s == 0);
+        singletonRef_s = this;
+
         this->defaultLanguage_ = "default";
         this->defaultLocalisation_ = "ERROR: LANGUAGE ENTRY DOESN'T EXIST!";
@@ -106 +112 @@
         for (std::map<std::string, LanguageEntry*>::iterator it = this->languageEntries_.begin(); it != this->languageEntries_.end(); ++it)
             delete (it->second);
-    }
-
-    /**
-        @brief Returns a reference to the only existing instance of the Language class and calls the setConfigValues() function.
-        @return The reference to the only existing instance
-    */
-    Language& Language::getLanguage()
-    {
-        static Language instance = Language();
-        return instance;
+
+        assert(singletonRef_s);
+        singletonRef_s = 0;
     }
 
@@ -233 +232 @@
             if ((lineString != "") && (lineString.size() > 0))
             {
-                unsigned int pos = lineString.find('=');
+                size_t pos = lineString.find('=');
 
                 // Check if the length is at least 3 and if there's an entry before and behind the =
@@ -279 +278 @@
             if ((lineString != "") && (lineString.size() > 0))
             {
-                unsigned int pos = lineString.find('=');
+                size_t pos = lineString.find('=');
 
                 // Check if the length is at least 3 and if there's an entry before and behind the =