Changeset 715 for code/branches/FICN/src/orxonox/objects/BillboardSet.h

Timestamp:

Dec 28, 2007, 11:33:10 PM (18 years ago)

Author:

rgrieder

Message:

• the master has spoken…
• misc/String.h is not anymore..

File:

• code/branches/FICN/src/orxonox/objects/BillboardSet.h (modified) (3 diffs)

code/branches/FICN/src/orxonox/objects/BillboardSet.h

@@ -1 +1 @@
 #ifndef _BillboardSet_H__
 #define _BillboardSet_H__
+
+#include <string>
 
 #include <OgreBillboardSet.h>
@@ -6 +8 @@
 #include "../OrxonoxPrereqs.h"
 
-#include "misc/String.h"
 #include "../core/CoreIncludes.h"
 #include "misc/ColourValue.h"
@@ -18 +19 @@
             BillboardSet();
             ~BillboardSet();
-            void setBillboardSet(const String& file, const ColourValue& colour = ColourValue(1.0, 1.0, 1.0), int count = 1, const Vector3& position = Vector3::ZERO);
+            void setBillboardSet(const std::string& file, const ColourValue& colour = ColourValue(1.0, 1.0, 1.0), int count = 1, const Vector3& position = Vector3::ZERO);
 
             inline Ogre::BillboardSet* getBillboardSet()
                 { return this->billboardSet_; }
 
-            inline const String& getName() const
+            inline const std::string& getName() const
                 { return this->billboardSet_->getName(); }