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

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 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.cc (modified) (1 diff)

trunk/src/world_entities/elements/text_element.cc

@@ -70 +70 @@
 }
 
-void TextElement::setText(const char* text)
+void TextElement::setText(const std::string& text)
 {
   Text::setText(text);
 }
 
-void TextElement::setFont(const char* font)
+void TextElement::setFont(const std::string& font)
 {
   Text::setFont(font, (unsigned int)this->getSizeY2D());