Changeset 715 for code/branches/FICN/src/orxonox/particle

Timestamp:

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

Author:

rgrieder

Message:

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

Location:

code/branches/FICN/src/orxonox/particle

Files:

• ParticleInterface.cc (modified) (1 diff)
• ParticleInterface.h (modified) (3 diffs)

code/branches/FICN/src/orxonox/particle/ParticleInterface.cc

@@ -43 +43 @@
   using namespace Ogre;
 
-  ParticleInterface::ParticleInterface( SceneManager *sceneManager, String name, String templateName )
+  ParticleInterface::ParticleInterface( SceneManager *sceneManager, std::string name, std::string templateName )
   {
     sceneManager_ = sceneManager;

code/branches/FICN/src/orxonox/particle/ParticleInterface.h

@@ -1 +1 @@
 #ifndef _ParticleInterface_H__
 #define _ParticleInterface_H__
+
+#include <string>
 
 // #include "ParticleInterface.h"
@@ -14 +16 @@
 
 #include "misc/Vector3.h"
-#include "misc/String.h"
 #include "misc/ColourValue.h"
 
@@ -25 +26 @@
   public:
 
-    ParticleInterface( Ogre::SceneManager *sceneManager, String name, String templateName );
+    ParticleInterface( Ogre::SceneManager *sceneManager, std::string name, std::string templateName );
     ~ParticleInterface( void );