Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 17, 2008, 9:40:00 PM (17 years ago)
Author:
landauf
Message:

several minor changes

Location:
code/branches/core/src/orxonox/core
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core/src/orxonox/core/BaseObject.cc

    r820 r826  
    6666        }
    6767    }
     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    }
    6881}
  • code/branches/core/src/orxonox/core/BaseObject.h

    r820 r826  
    3737
    3838#include "CorePrereqs.h"
    39 #include "util/tinyxml/TinyXMLPrereqs.h"
     39#include "util/XMLIncludes.h"
    4040
    4141#include "CoreIncludes.h"
     
    5050            virtual ~BaseObject();
    5151            virtual void loadParams(TiXmlElement* xmlElem);
     52            virtual Element& XMLPort(Element& xmlelement, bool loading);
    5253
    5354            /** @brief Returns a pointer to the level that loaded this object. @return The level */
  • code/branches/core/src/orxonox/core/ConfigValueContainer.cc

    r820 r826  
    3636#include "util/Tokenizer.h"
    3737#include "util/Convert.h"
     38#include "Language.h"
    3839
    3940#define CONFIGFILEPATH "orxonox.ini"
     
    951952        }
    952953    }
     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    }
    953963}
  • code/branches/core/src/orxonox/core/ConfigValueContainer.h

    r813 r826  
    5050#include "util/Math.h"
    5151#include "util/MultiTypeMath.h"
    52 #include "Language.h"
    5352
    5453namespace orxonox
     
    101100
    102101            void description(const std::string& description);
     102            std::string getDescription() const;
    103103
    104104            bool parseString(const std::string& input, MultiTypeMath& defvalue);
  • code/branches/core/src/orxonox/core/CorePrereqs.h

    r820 r826  
    3434#define _CorePrereqs_H__
    3535
     36#include <string>
     37
    3638#include "orxonox/OrxonoxPlatform.h"
    3739
     
    6365namespace orxonox
    6466{
     67  typedef std::string LanguageEntryName;
     68
    6569  class ArgReader;
    6670  class BaseFactory;
  • code/branches/core/src/orxonox/core/Language.h

    r813 r826  
    5353namespace orxonox
    5454{
    55     typedef std::string LanguageEntryName;
    56 
     55    // ###############################
     56    // ###      LanguageEntry      ###
     57    // ###############################
    5758    //! The LanguageEntry class stores the default- and the translated string of a given entry in the language file.
    5859    class _CoreExport LanguageEntry : public OrxonoxClass
     
    8586    template class _CoreExport orxonox::ObjectList<LanguageEntry>;
    8687
     88
     89    // ###############################
     90    // ###         Language        ###
     91    // ###############################
    8792    //! The Language class manges the language files and entries and stores the LanguageEntry objects in a map.
    8893    class _CoreExport Language : public OrxonoxClass
  • code/branches/core/src/orxonox/core/Level.h

    r820 r826  
    5252}
    5353
    54 #endif
     54#endif /* _Level_H__ */
  • code/branches/core/src/orxonox/core/Loader.h

    r820 r826  
    6161}
    6262
    63 #endif
     63#endif /* _Loader_H__ */
Note: See TracChangeset for help on using the changeset viewer.