Remove unnecessary std:: qualifiers from .cpp files

diff --git a/source/builders/pipelinetemplate.cpp b/source/builders/pipelinetemplate.cpp
index 29011e31dcf09b4190175493a09da3a11be1d1a3..81d88f3184f32b37488ab647d7e9596739f48f75 100644 (file)
--- a/source/builders/pipelinetemplate.cpp
+++ b/source/builders/pipelinetemplate.cpp
@@ -109,7 +109,7 @@ void PipelineTemplate::Loader::pass(const string &tag, const string &rend)
        obj.passes.push_back(pss);
 }
 
-void PipelineTemplate::Loader::postprocessor(const std::string &slot)
+void PipelineTemplate::Loader::postprocessor(const string &slot)
 {
        PostProcLoader ldr;
        load_sub_with(ldr);

diff --git a/source/core/framebuffer.cpp b/source/core/framebuffer.cpp
index c90bb22469da6b7633ac405d1dc2884d85ef61aa..795465cbbad37f28c9e2f208e22a080e055310f4 100644 (file)
--- a/source/core/framebuffer.cpp
+++ b/source/core/framebuffer.cpp
@@ -103,7 +103,7 @@ void Framebuffer::update_attachment(unsigned mask) const
                return;
        }
 
-       std::vector<GLenum> color_bufs;
+       vector<GLenum> color_bufs;
        color_bufs.reserve(attachments.size());
        for(unsigned i=0; i<attachments.size(); ++i)
        {

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 2c15bc774b248b58f56ae3019c4680b0c09859e8..aa2e784939d0345d3e91ef3be842b2d3f781ee64 100644 (file)
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -34,7 +34,7 @@ Program::Program()
        init();
 }
 
-Program::Program(const std::string &source)
+Program::Program(const string &source)
 {
        init();
 

diff --git a/source/core/tag.cpp b/source/core/tag.cpp
index b5f860334e8a3792b7d8f4fe88f47e2dcd9a4e31..538190f836fb66782e03a510d0ed2f758a15057d 100644 (file)
--- a/source/core/tag.cpp
+++ b/source/core/tag.cpp
@@ -26,7 +26,7 @@ Tag::Tag(const char *s):
 #endif
 }
 
-Tag::Tag(const std::string &s):
+Tag::Tag(const string &s):
        id(s.empty() ? 0 : hash32(s))
 {
 #ifdef DEBUG

diff --git a/source/core/texture.cpp b/source/core/texture.cpp
index f6594ab14c7e5143434ac0823c862427c70f2c9d..155dcae123d1945031c3da3c1b0f068eccc6f007 100644 (file)
--- a/source/core/texture.cpp
+++ b/source/core/texture.cpp
@@ -309,7 +309,7 @@ unsigned Texture::Loader::get_levels() const
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-void Texture::Loader::load_external_image(Graphics::Image &img, const std::string &fn)
+void Texture::Loader::load_external_image(Graphics::Image &img, const string &fn)
 {
        RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
        if(!io)

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index bd3404e56f0fae10addb22fb90f3aec2f234560c..beafaddf47605454f177e4f529235aa01c4fefaf 100644 (file)
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -8,19 +8,19 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-std::string DumpTree::apply(Stage &stage)
+string DumpTree::apply(Stage &stage)
 {
        formatted = format("Stage: %s\n", Stage::get_stage_name(stage.type));
        begin_sub();
        append(format("Version: %d.%02d", stage.required_features.glsl_version.major, stage.required_features.glsl_version.minor));
 
-       for(std::map<string, TypeDeclaration *>::const_iterator i=stage.types.begin(); i!=stage.types.end(); ++i)
+       for(map<string, TypeDeclaration *>::const_iterator i=stage.types.begin(); i!=stage.types.end(); ++i)
                append(format("Type: %%%d %s", get_label(*i->second), i->first));
 
-       for(std::map<string, InterfaceBlock *>::const_iterator i=stage.interface_blocks.begin(); i!=stage.interface_blocks.end(); ++i)
+       for(map<string, InterfaceBlock *>::const_iterator i=stage.interface_blocks.begin(); i!=stage.interface_blocks.end(); ++i)
                append(format("Interface block: %%%d %s", get_label(*i->second), i->first));
 
-       for(std::map<string, FunctionDeclaration *>::const_iterator i=stage.functions.begin(); i!=stage.functions.end(); ++i)
+       for(map<string, FunctionDeclaration *>::const_iterator i=stage.functions.begin(); i!=stage.functions.end(); ++i)
                append(format("Function: %%%d %s", get_label(*i->second), i->first));
 
        last_branch();
@@ -122,7 +122,7 @@ void DumpTree::visit(Block &block)
        append(block, format("Block %s", (block.use_braces ? "{}" : "(inline)")));
        begin_sub();
 
-       for(std::map<string, VariableDeclaration *>::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
+       for(map<string, VariableDeclaration *>::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
                append(format("Variable: %%%d %s %s", get_label(*i->second), i->second->type, i->first));
 
        for(NodeList<Statement>::const_iterator i=block.body.begin(); i!=block.body.end(); )

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index f333ef44b0cfe5ef1a88b26a17203faf1b09ac82..68d3f1d77a9b1233701629b2f27b319bfec43e3d 100644 (file)
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -138,7 +138,7 @@ string InlineContentInjector::apply(Stage &stage, FunctionDeclaration &target_fu
        staging_block.parent = &tgt_blk;
        staging_block.variables.clear();
 
-       std::vector<RefPtr<VariableDeclaration> > params;
+       vector<RefPtr<VariableDeclaration> > params;
        params.reserve(source_func->parameters.size());
        for(NodeArray<VariableDeclaration>::iterator i=source_func->parameters.begin(); i!=source_func->parameters.end(); ++i)
        {

diff --git a/source/glsl/sourcemap.cpp b/source/glsl/sourcemap.cpp
index 9b341fe46e0b6be0c098199548de39a3a4b28f10..9eb33b05733a9ce3c0659cad2272aedcd37b2d1e 100644 (file)
--- a/source/glsl/sourcemap.cpp
+++ b/source/glsl/sourcemap.cpp
@@ -13,7 +13,7 @@ SourceMap::SourceMap():
        base_index(0)
 { }
 
-void SourceMap::set_name(unsigned i, const std::string &n)
+void SourceMap::set_name(unsigned i, const string &n)
 {
        if(source_names.empty())
                base_index = i;

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 86afebedb1611871d5ecfa5e3b34fb2cbd59957a..fdff3fe657aa56972690304c587e5bf61e8b3816 100644 (file)
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -815,7 +815,7 @@ void GlobalInterfaceValidator::apply(Module &module)
 
 void GlobalInterfaceValidator::check_uniform(const Uniform &uni)
 {
-       map<std::string, const Uniform *>::const_iterator i = used_names.find(uni.name);
+       map<string, const Uniform *>::const_iterator i = used_names.find(uni.name);
        if(i!=used_names.end())
        {
                if(uni.location>=0 && i->second->location>=0 && i->second->location!=uni.location)

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index 25ed72189b1bac8c43ef1e028d5f940a1b086214..eaabad157002b793f64a9d1575238618856e9223 100644 (file)
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -91,7 +91,7 @@ void Material::Loader::init_actions()
        add("sampler", &Loader::sampler);
 }
 
-void Material::Loader::sampler(const std::string &name)
+void Material::Loader::sampler(const string &name)
 {
        obj.sampler = &get_collection().get<Sampler>(name);
 }

diff --git a/source/render/instancearray.cpp b/source/render/instancearray.cpp
index 4287700f0eeb768c4bbaf145fb3e463350a14786..231bebe1beaabe28df632d9dc0ce1f1b58db0109 100644 (file)
--- a/source/render/instancearray.cpp
+++ b/source/render/instancearray.cpp
@@ -62,7 +62,7 @@ InstanceArray::InstanceArray(const Object &o):
 
 InstanceArray::~InstanceArray()
 {
-       for(std::vector<ObjectInstance *>::iterator i=instances.begin(); i!=instances.end(); ++i)
+       for(vector<ObjectInstance *>::iterator i=instances.begin(); i!=instances.end(); ++i)
                delete *i;
        delete vtx_setup;
        delete instance_data;

diff --git a/source/render/object.cpp b/source/render/object.cpp
index afd514987ec2455970a95798496ab2ec7ee7e95b..702faaf9217eb9b8ba1374c358f228c0952ccf68 100644 (file)
--- a/source/render/object.cpp
+++ b/source/render/object.cpp
@@ -252,7 +252,7 @@ void Object::LodLoader::mesh_inline()
        lod.mesh = msh;
 }
 
-void Object::LodLoader::technique(const std::string &n)
+void Object::LodLoader::technique(const string &n)
 {
        obj.set_technique(index, &get_collection().get<Technique>(n));
 }

diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp
index 9c23e8a5eb26eefd2da1654975ccf5af62d1d4b2..8adde8a26f5b71705ea92929d0fc19cee5403907 100644 (file)
--- a/source/render/programdata.cpp
+++ b/source/render/programdata.cpp
@@ -636,7 +636,7 @@ void ProgramData::apply() const
 
                // Update the contents of all dirty blocks.
                bool buffered_blocks_updated = false;
-               std::vector<ProgramBlock>::iterator j = pu.blocks.begin();
+               vector<ProgramBlock>::iterator j = pu.blocks.begin();
                for(vector<Program::UniformBlockInfo>::const_iterator i=prog_blocks.begin(); i!=prog_blocks.end(); ++i, ++j)
                {
                        if(!j->shared || !j->shared->dirty)