Changeset 708 for code/branches/FICN/src/orxonox/core/Language.cc

Timestamp:

Dec 28, 2007, 10:30:29 PM (16 years ago)

Author:

rgrieder

Message:

• added Vector2, Vector3, Matrix3, ColourValue, Quaternion and String to the misc folder as header files (each of them contains #include <string> … typedef std::string String , etc.)
• please use String from now on by including <misc/String.h"
• removed #include <OgreVector3.h", etc. from "CoreIncludes.h" (adjusted all source files)
• adjusted all the source files (except network, that keeps <string> for the moment) (what a mess..)
• moved usleep hack to misc/Sleep.h
• relative include paths for files from other root directories (like misc, network, etc.) (but it stills writes "../Orxonox.h" when in folder orxonox/objects)
• "OgreSceneManager.h" —> <OgreSceneManager.h>
• included OrxonoxPrereqs in every file in folder orxonox
• moved HUD and ParticleInterface to namespace orxonox
• removed some using namespace Ogre/std when appropriate
• I hope I haven't forgotten important points..

File:

• code/branches/FICN/src/orxonox/core/Language.cc (modified) (11 diffs)

code/branches/FICN/src/orxonox/core/Language.cc

@@ -28 +28 @@
 #include <fstream>
 
+#include "CoreIncludes.h"
 #include "Language.h"
-#include "CoreIncludes.h"
 
 namespace orxonox
@@ -36 +36 @@
     // ###      LanguageEntry      ###
     // ###############################
-    LanguageEntry::LanguageEntry(const std::string& fallbackEntry)
+    LanguageEntry::LanguageEntry(const String& fallbackEntry)
     {
         RegisterRootObject(LanguageEntry);
@@ -44 +44 @@
     }
 
-    void LanguageEntry::setTranslation(const std::string& translation)
+    void LanguageEntry::setTranslation(const String& translation)
     {
         if (translation.compare("") != 0)
@@ -52 +52 @@
     }
 
-    void LanguageEntry::setDefault(const std::string& fallbackEntry)
+    void LanguageEntry::setDefault(const String& fallbackEntry)
     {
         if (this->translatedEntry_.compare(this->fallbackEntry_) == 0)
@@ -85 +85 @@
     }
 
-    void Language::createEntry(const LanguageEntryName& name, const std::string& entry)
+    void Language::createEntry(const LanguageEntryName& name, const String& entry)
     {
         if (!this->languageEntries_[name])
@@ -99 +99 @@
     }
 
-    void Language::addEntry(const LanguageEntryName& name, const std::string& entry)
-    {
-        std::map<std::string, LanguageEntry*>::const_iterator it = this->languageEntries_.find(name);
+    void Language::addEntry(const LanguageEntryName& name, const String& entry)
+    {
+        std::map<String, LanguageEntry*>::const_iterator it = this->languageEntries_.find(name);
         if (!it->second)
             this->createEntry(name, entry);
@@ -112 +112 @@
     }
 
-    const std::string& Language::getTranslation(const LanguageEntryName& name) const
-    {
-        std::map<std::string, LanguageEntry*>::const_iterator it = this->languageEntries_.find(name);
+    const String& Language::getTranslation(const LanguageEntryName& name) const
+    {
+        std::map<String, LanguageEntry*>::const_iterator it = this->languageEntries_.find(name);
         if (it->second)
             return it->second->getTranslation();
@@ -124 +124 @@
     }
 
-    const std::string Language::getFileName(const std::string& language)
-    {
-        return std::string("translation_" + language + ".lang");
+    const String Language::getFileName(const String& language)
+    {
+        return String("translation_" + language + ".lang");
     }
 
@@ -154 +154 @@
         {
             file.getline(line, 1024);
-            std::string lineString = std::string(line);
+            String lineString = String(line);
             if (lineString.compare("") != 0)
             {
@@ -190 +190 @@
         {
             file.getline(line, 1024);
-            std::string lineString = std::string(line);
+            String lineString = String(line);
             if (lineString.compare("") != 0)
             {
@@ -196 +196 @@
                 if (pos < lineString.size() && lineString.size() >= 3)
                 {
-                    std::map<std::string, LanguageEntry*>::const_iterator it = this->languageEntries_.find(lineString.substr(0, pos));
+                    std::map<String, LanguageEntry*>::const_iterator it = this->languageEntries_.find(lineString.substr(0, pos));
                     if (it->second)
                         it->second->setTranslation(lineString.substr(pos + 1));