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

[xonotic/netradiant.git] / plugins / shaders / shaders.cpp

diff --git a/plugins/shaders/shaders.cpp b/plugins/shaders/shaders.cpp
index a431ef4fbd109c0664f2d189d12353fc28045b9d..39310e8af2942dba1977aec3c4c359d1b5e4eaab 100644 (file)
--- a/plugins/shaders/shaders.cpp
+++ b/plugins/shaders/shaders.cpp
@@ -223,7 +223,7 @@ typedef Static<StringPool, ShaderPoolContext> ShaderPool;
 typedef PooledString<ShaderPool> ShaderString;
 typedef ShaderString ShaderVariable;
 typedef ShaderString ShaderValue;
-typedef CopiedString TextureExpression;
+typedef std::string TextureExpression;
 
 // clean a texture name to the qtexture_t name format we use internally
 // NOTE: case sensitivity: the engine is case sensitive. we store the shader name with case information and save with case
@@ -234,7 +234,7 @@ template<typename StringType>
 void parseTextureName( StringType& name, const char* token ){
        StringOutputStream cleaned( 256 );
        cleaned << PathCleaned( token );
-       name = CopiedString( StringRange( cleaned.c_str(), path_get_filename_base_end( cleaned.c_str() ) ) ).c_str(); // remove extension
+       name = std::string( StringRange( cleaned.c_str(), path_get_filename_base_end( cleaned.c_str() ) ) ).c_str(); // remove extension
 }
 
 bool Tokeniser_parseTextureName( Tokeniser& tokeniser, TextureExpression& name ){
@@ -247,7 +247,7 @@ bool Tokeniser_parseTextureName( Tokeniser& tokeniser, TextureExpression& name )
        return true;
 }
 
-bool Tokeniser_parseShaderName( Tokeniser& tokeniser, CopiedString& name ){
+bool Tokeniser_parseShaderName( Tokeniser& tokeniser, std::string& name ){
        const char* token = tokeniser.getToken();
        if ( token == 0 ) {
                Tokeniser_unexpectedError( tokeniser, token, "#shader-name" );
@@ -277,7 +277,7 @@ typedef std::pair<ShaderVariable, ShaderVariable> BlendFuncExpression;
 class ShaderTemplate
 {
 std::size_t m_refcount;
-CopiedString m_Name;
+std::string m_Name;
 public:
 
 ShaderParameters m_params;
@@ -676,7 +676,7 @@ bool ShaderTemplate::parseDoom3( Tokeniser& tokeniser ){
 }
 
 typedef SmartPointer<ShaderTemplate> ShaderTemplatePointer;
-typedef std::map<CopiedString, ShaderTemplatePointer> ShaderTemplateMap;
+typedef std::map<std::string, ShaderTemplatePointer> ShaderTemplateMap;
 
 ShaderTemplateMap g_shaders;
 ShaderTemplateMap g_shaderTemplates;
@@ -700,12 +700,12 @@ ShaderArguments args;
 const char* filename;
 };
 
-typedef std::map<CopiedString, ShaderDefinition> ShaderDefinitionMap;
+typedef std::map<std::string, ShaderDefinition> ShaderDefinitionMap;
 
 ShaderDefinitionMap g_shaderDefinitions;
 
 bool parseTemplateInstance( Tokeniser& tokeniser, const char* filename ){
-       CopiedString name;
+       std::string name;
        RETURN_FALSE_IF_FAIL( Tokeniser_parseShaderName( tokeniser, name ) );
        const char* templateName = tokeniser.getToken();
        ShaderTemplate* shaderTemplate = findTemplate( templateName );
@@ -838,7 +838,7 @@ const ShaderTemplate& m_template;
 const ShaderArguments& m_args;
 const char* m_filename;
 // name is shader-name, otherwise texture-name (if not a real shader)
-CopiedString m_Name;
+std::string m_Name;
 
 qtexture_t* m_pTexture;
 qtexture_t* m_notfound;
@@ -1102,7 +1102,7 @@ qtexture_t* lightFalloffImage() const {
 bool CShader::m_lightingEnabled = false;
 
 typedef SmartPointer<CShader> ShaderPointer;
-typedef std::map<CopiedString, ShaderPointer, shader_less_t> shaders_t;
+typedef std::map<std::string, ShaderPointer, shader_less_t> shaders_t;
 
 shaders_t g_ActiveShaders;
 
@@ -1301,7 +1301,7 @@ Layer() : m_type( LAYER_NONE ), m_blendFunc( BLEND_ONE, BLEND_ZERO ), m_clampToB
 }
 };
 
-std::list<CopiedString> g_shaderFilenames;
+std::list<std::string> g_shaderFilenames;
 
 void ParseShaderFile( Tokeniser& tokeniser, const char* filename ){
        g_shaderFilenames.push_back( filename );
@@ -1355,7 +1355,7 @@ void ParseShaderFile( Tokeniser& tokeniser, const char* filename ){
                                        tokeniser.ungetToken();
                                }
                                // first token should be the path + name.. (from base)
-                               CopiedString name;
+                               std::string name;
                                if ( !Tokeniser_parseShaderName( tokeniser, name ) ) {
                                }
                                ShaderTemplatePointer shaderTemplate( new ShaderTemplate() );