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

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.h (modified) (3 diffs)

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

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