Changeset 715 for code/branches/FICN/src/orxonox/core/Language.h

Timestamp:

Dec 28, 2007, 11:33:10 PM (16 years ago)

Author:

rgrieder

Message:

• the master has spoken…
• misc/String.h is not anymore..

File:

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

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

@@ -30 +30 @@
 
 #include <map>
+#include <string>
 
 #include "CorePrereqs.h"
 
-#include "misc/String.h"
 #include "OrxonoxClass.h"
 
 namespace orxonox
 {
-    typedef String LanguageEntryName;
+    typedef std::string LanguageEntryName;
 
     class _CoreExport LanguageEntry : public OrxonoxClass
     {
         public:
-            explicit LanguageEntry(const String& fallbackEntry);
-            void setTranslation(const String& translation);
-            void setDefault(const String& fallbackEntry);
+            explicit LanguageEntry(const std::string& fallbackEntry);
+            void setTranslation(const std::string& translation);
+            void setDefault(const std::string& fallbackEntry);
 
-            inline const String& getTranslation()
+            inline const std::string& getTranslation()
                 { return this->translatedEntry_; }
 
-            inline const String& getDefault()
+            inline const std::string& getDefault()
                 { return this->fallbackEntry_; }
 
         private:
-            String fallbackEntry_;
-            String translatedEntry_;
+            std::string fallbackEntry_;
+            std::string translatedEntry_;
     };
 
@@ -63 +63 @@
             static Language& getLanguage();
             void setConfigValues();
-            void addEntry(const LanguageEntryName& name, const String& entry);
-            const String& getTranslation(const LanguageEntryName& name) const;
+            void addEntry(const LanguageEntryName& name, const std::string& entry);
+            const std::string& getTranslation(const LanguageEntryName& name) const;
 
         private:
@@ -74 +74 @@
             void readTranslatedLanguageFile();
             void writeDefaultLanguageFile() const;
-            static const String getFileName(const String& language);
-            void createEntry(const LanguageEntryName& name, const String& entry);
+            static const std::string getFileName(const std::string& language);
+            void createEntry(const LanguageEntryName& name, const std::string& entry);
 
-            String language_;
-            String defaultLanguage_;
-            String defaultTranslation_;
-            std::map<String, LanguageEntry*> languageEntries_;
+            std::string language_;
+            std::string defaultLanguage_;
+            std::string defaultTranslation_;
+            std::map<std::string, LanguageEntry*> languageEntries_;
     };
 }