From 3a6eb030fb4eca4c2a317f270704fddf31613130 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sat, 10 Apr 2021 15:15:59 +0300 Subject: [PATCH] Remove unnecessary std:: qualifiers from .cpp files --- source/builders/pipelinetemplate.cpp | 2 +- source/core/framebuffer.cpp | 2 +- source/core/program.cpp | 2 +- source/core/tag.cpp | 2 +- source/core/texture.cpp | 2 +- source/glsl/debug.cpp | 10 +++++----- source/glsl/optimize.cpp | 2 +- source/glsl/sourcemap.cpp | 2 +- source/glsl/validate.cpp | 2 +- source/materials/material.cpp | 2 +- source/render/instancearray.cpp | 2 +- source/render/object.cpp | 2 +- source/render/programdata.cpp | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/source/builders/pipelinetemplate.cpp b/source/builders/pipelinetemplate.cpp index 29011e31..81d88f31 100644 --- 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 c90bb224..795465cb 100644 --- a/source/core/framebuffer.cpp +++ b/source/core/framebuffer.cpp @@ -103,7 +103,7 @@ void Framebuffer::update_attachment(unsigned mask) const return; } - std::vector color_bufs; + vector color_bufs; color_bufs.reserve(attachments.size()); for(unsigned i=0; i io = get_collection().open_raw(fn); if(!io) diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp index bd3404e5..beafaddf 100644 --- 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::const_iterator i=stage.types.begin(); i!=stage.types.end(); ++i) + for(map::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::const_iterator i=stage.interface_blocks.begin(); i!=stage.interface_blocks.end(); ++i) + for(map::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::const_iterator i=stage.functions.begin(); i!=stage.functions.end(); ++i) + for(map::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::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i) + for(map::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::const_iterator i=block.body.begin(); i!=block.body.end(); ) diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp index f333ef44..68d3f1d7 100644 --- 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 > params; + vector > params; params.reserve(source_func->parameters.size()); for(NodeArray::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 9b341fe4..9eb33b05 100644 --- 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 86afebed..fdff3fe6 100644 --- 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::const_iterator i = used_names.find(uni.name); + map::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 25ed7218..eaabad15 100644 --- 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(name); } diff --git a/source/render/instancearray.cpp b/source/render/instancearray.cpp index 4287700f..231bebe1 100644 --- a/source/render/instancearray.cpp +++ b/source/render/instancearray.cpp @@ -62,7 +62,7 @@ InstanceArray::InstanceArray(const Object &o): InstanceArray::~InstanceArray() { - for(std::vector::iterator i=instances.begin(); i!=instances.end(); ++i) + for(vector::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 afd51498..702faaf9 100644 --- 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(n)); } diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp index 9c23e8a5..8adde8a2 100644 --- 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::iterator j = pu.blocks.begin(); + vector::iterator j = pu.blocks.begin(); for(vector::const_iterator i=prog_blocks.begin(); i!=prog_blocks.end(); ++i, ++j) { if(!j->shared || !j->shared->dirty) -- 2.45.2