Replace custom string classes with std::string - gone forever version

[xonotic/netradiant.git] / plugins / md3model / model.h

diff --git a/plugins/md3model/model.h b/plugins/md3model/model.h
index ee76006494978a9b94b6d24376619ba0820fe527..8be39098233d6f128fc6aab2f6a37ade27bde7e4 100644 (file)
--- a/plugins/md3model/model.h
+++ b/plugins/md3model/model.h
@@ -65,7 +65,7 @@ inline VertexPointer vertexpointer_arbitrarymeshvertex( const ArbitraryMeshVerte
        return VertexPointer( VertexPointer::pointer( &array->vertex ), sizeof( ArbitraryMeshVertex ) );
 }
 
-inline void parseTextureName( CopiedString& name, const char* token ){
+inline void parseTextureName( std::string& name, const char* token ){
        StringOutputStream cleaned( 256 );
        cleaned << PathCleaned( token );
        name = StringRange( cleaned.c_str(), path_get_filename_base_end( cleaned.c_str() ) ); // remove extension
@@ -81,7 +81,7 @@ typedef IndexBuffer indices_t;
 private:
 
 AABB m_aabb_local;
-CopiedString m_shader;
+std::string m_shader;
 Shader* m_state;
 
 vertices_t m_vertices;
@@ -324,7 +324,7 @@ SurfaceLightLists m_surfaceLightLists;
 class Remap
 {
 public:
-CopiedString first;
+std::string first;
 Shader* second;
 Remap() : second( 0 ){
 }