Changeset 826 for code/branches

Timestamp:

Feb 17, 2008, 9:40:00 PM (17 years ago)

Author:

landauf

Message:

several minor changes

Location:

code/branches/core/src

Files:

• orxonox/core/BaseObject.cc (modified) (1 diff)
• orxonox/core/BaseObject.h (modified) (2 diffs)
• orxonox/core/ConfigValueContainer.cc (modified) (2 diffs)
• orxonox/core/ConfigValueContainer.h (modified) (2 diffs)
• orxonox/core/CorePrereqs.h (modified) (2 diffs)
• orxonox/core/Language.h (modified) (2 diffs)
• orxonox/core/Level.h (modified) (1 diff)
• orxonox/core/Loader.h (modified) (1 diff)
• util/XMLIncludes.h (added)
• util/tinyxml/TinyXMLPrereqs.h (modified) (1 diff)

code/branches/core/src/orxonox/core/BaseObject.cc

@@ -66 +66 @@
         }
     }
+
+    /**
+        @brief XML loading and saving.
+        @param xmlelement The XML-element
+        @param loading Loading (true) or saving (false)
+        @return The XML-element
+    */
+    Element& BaseObject::XMLPort(Element& xmlelement, bool loading)
+    {
+//        XMLPortParam(BaseObject, "name", setName, getName, xmlelement, loading);
+
+        return xmlelement;
+    }
 }

code/branches/core/src/orxonox/core/BaseObject.h

@@ -37 +37 @@
 
 #include "CorePrereqs.h"
-#include "util/tinyxml/TinyXMLPrereqs.h"
+#include "util/XMLIncludes.h"
 
 #include "CoreIncludes.h"
@@ -50 +50 @@
             virtual ~BaseObject();
             virtual void loadParams(TiXmlElement* xmlElem);
+            virtual Element& XMLPort(Element& xmlelement, bool loading);
 
             /** @brief Returns a pointer to the level that loaded this object. @return The level */

code/branches/core/src/orxonox/core/ConfigValueContainer.cc

@@ -36 +36 @@
 #include "util/Tokenizer.h"
 #include "util/Convert.h"
+#include "Language.h"
 
 #define CONFIGFILEPATH "orxonox.ini"
@@ -951 +952 @@
         }
     }
+
+    /**
+        @brief Returns the description of the config-value.
+        @return The description
+    */
+    std::string ConfigValueContainer::getDescription() const
+    {
+        return Language::getLanguage().getTranslation(this->description_);
+    }
 }

code/branches/core/src/orxonox/core/ConfigValueContainer.h

@@ -50 +50 @@
 #include "util/Math.h"
 #include "util/MultiTypeMath.h"
-#include "Language.h"
 
 namespace orxonox
@@ -101 +100 @@
 
             void description(const std::string& description);
+            std::string getDescription() const;
 
             bool parseString(const std::string& input, MultiTypeMath& defvalue);

code/branches/core/src/orxonox/core/CorePrereqs.h

@@ -34 +34 @@
 #define _CorePrereqs_H__
 
+#include <string>
+
 #include "orxonox/OrxonoxPlatform.h"
 
@@ -63 +65 @@
 namespace orxonox
 {
+  typedef std::string LanguageEntryName;
+
   class ArgReader;
   class BaseFactory;

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

@@ -53 +53 @@
 namespace orxonox
 {
-    typedef std::string LanguageEntryName;
-
+    // ###############################
+    // ###      LanguageEntry      ###
+    // ###############################
     //! The LanguageEntry class stores the default- and the translated string of a given entry in the language file.
     class _CoreExport LanguageEntry : public OrxonoxClass
@@ -85 +86 @@
     template class _CoreExport orxonox::ObjectList<LanguageEntry>;
 
+
+    // ###############################
+    // ###         Language        ###
+    // ###############################
     //! The Language class manges the language files and entries and stores the LanguageEntry objects in a map.
     class _CoreExport Language : public OrxonoxClass

code/branches/core/src/orxonox/core/Level.h

@@ -52 +52 @@
 }
 
-#endif
+#endif /* _Level_H__ */

code/branches/core/src/orxonox/core/Loader.h

@@ -61 +61 @@
 }
 
-#endif
+#endif /* _Loader_H__ */

code/branches/core/src/util/tinyxml/TinyXMLPrereqs.h

@@ -73 +73 @@
 class TiXmlParsingData;
 
+namespace ticpp
+{
+    class Document;
+    class Element;
+    class Declaration;
+    class StylesheetReference;
+    class Text;
+    class Comment;
+    class Attribute;
+}
+
 #endif /* _TinyXMLPrereqs_H__ */