Changeset 7221 in orxonox.OLD for trunk/src/world_entities/elements/text_element.h

Timestamp:

Mar 15, 2006, 3:10:45 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/world_entities/elements/text_element.h (modified) (1 diff)

trunk/src/world_entities/elements/text_element.h

@@ -29 +29 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  void setText(const char* text);
-  void setFont(const char* font);
+  void setText(const std::string& text);
+  void setFont(const std::string& font);
 
  private: