Changeset 826 for code/branches/core/src/orxonox
- Timestamp:
- Feb 17, 2008, 9:40:00 PM (17 years ago)
- Location:
- code/branches/core/src/orxonox/core
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core/src/orxonox/core/BaseObject.cc
r820 r826 66 66 } 67 67 } 68 69 /** 70 @brief XML loading and saving. 71 @param xmlelement The XML-element 72 @param loading Loading (true) or saving (false) 73 @return The XML-element 74 */ 75 Element& BaseObject::XMLPort(Element& xmlelement, bool loading) 76 { 77 // XMLPortParam(BaseObject, "name", setName, getName, xmlelement, loading); 78 79 return xmlelement; 80 } 68 81 } -
code/branches/core/src/orxonox/core/BaseObject.h
r820 r826 37 37 38 38 #include "CorePrereqs.h" 39 #include "util/ tinyxml/TinyXMLPrereqs.h"39 #include "util/XMLIncludes.h" 40 40 41 41 #include "CoreIncludes.h" … … 50 50 virtual ~BaseObject(); 51 51 virtual void loadParams(TiXmlElement* xmlElem); 52 virtual Element& XMLPort(Element& xmlelement, bool loading); 52 53 53 54 /** @brief Returns a pointer to the level that loaded this object. @return The level */ -
code/branches/core/src/orxonox/core/ConfigValueContainer.cc
r820 r826 36 36 #include "util/Tokenizer.h" 37 37 #include "util/Convert.h" 38 #include "Language.h" 38 39 39 40 #define CONFIGFILEPATH "orxonox.ini" … … 951 952 } 952 953 } 954 955 /** 956 @brief Returns the description of the config-value. 957 @return The description 958 */ 959 std::string ConfigValueContainer::getDescription() const 960 { 961 return Language::getLanguage().getTranslation(this->description_); 962 } 953 963 } -
code/branches/core/src/orxonox/core/ConfigValueContainer.h
r813 r826 50 50 #include "util/Math.h" 51 51 #include "util/MultiTypeMath.h" 52 #include "Language.h"53 52 54 53 namespace orxonox … … 101 100 102 101 void description(const std::string& description); 102 std::string getDescription() const; 103 103 104 104 bool parseString(const std::string& input, MultiTypeMath& defvalue); -
code/branches/core/src/orxonox/core/CorePrereqs.h
r820 r826 34 34 #define _CorePrereqs_H__ 35 35 36 #include <string> 37 36 38 #include "orxonox/OrxonoxPlatform.h" 37 39 … … 63 65 namespace orxonox 64 66 { 67 typedef std::string LanguageEntryName; 68 65 69 class ArgReader; 66 70 class BaseFactory; -
code/branches/core/src/orxonox/core/Language.h
r813 r826 53 53 namespace orxonox 54 54 { 55 typedef std::string LanguageEntryName; 56 55 // ############################### 56 // ### LanguageEntry ### 57 // ############################### 57 58 //! The LanguageEntry class stores the default- and the translated string of a given entry in the language file. 58 59 class _CoreExport LanguageEntry : public OrxonoxClass … … 85 86 template class _CoreExport orxonox::ObjectList<LanguageEntry>; 86 87 88 89 // ############################### 90 // ### Language ### 91 // ############################### 87 92 //! The Language class manges the language files and entries and stores the LanguageEntry objects in a map. 88 93 class _CoreExport Language : public OrxonoxClass -
code/branches/core/src/orxonox/core/Level.h
r820 r826 52 52 } 53 53 54 #endif 54 #endif /* _Level_H__ */ -
code/branches/core/src/orxonox/core/Loader.h
r820 r826 61 61 } 62 62 63 #endif 63 #endif /* _Loader_H__ */
Note: See TracChangeset
for help on using the changeset viewer.