From d6e5645659cc31231e6da5028ddd0e0aeca19218 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 9 Jul 2012 00:00:34 +0300 Subject: [PATCH] Remove extraneous std:: qualifiers --- source/binary.cpp | 2 +- source/binarypackage.cpp | 2 +- source/buildinfo.cpp | 10 +++++----- source/executable.cpp | 2 +- source/gnucompiler.cpp | 2 +- source/gnulinker.cpp | 2 +- source/installedfile.cpp | 4 ++-- source/target.cpp | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/binary.cpp b/source/binary.cpp index 957d233..a06bd20 100644 --- a/source/binary.cpp +++ b/source/binary.cpp @@ -15,7 +15,7 @@ Binary::Binary(Builder &b, const FS::Path &p): FileTarget(b, 0, p) { } -Binary::Binary(Builder &b, const Component &c, const std::string &p, const list &objs): +Binary::Binary(Builder &b, const Component &c, const string &p, const list &objs): FileTarget(b, &c.get_package(), c.get_package().get_out_dir()/p) { component = &c; diff --git a/source/binarypackage.cpp b/source/binarypackage.cpp index cc90c0a..b9c558e 100644 --- a/source/binarypackage.cpp +++ b/source/binarypackage.cpp @@ -29,7 +29,7 @@ void BinaryPackage::create_build_info() *i = path/i->subpath(1); } -BinaryPackage *BinaryPackage::from_flags(Builder &builder, const std::string &name, const vector &flags) +BinaryPackage *BinaryPackage::from_flags(Builder &builder, const string &name, const vector &flags) { BinaryPackage *pkg = new BinaryPackage(builder, name); pkg->use_pkgconfig = true; diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp index 77243ef..2372e89 100644 --- a/source/buildinfo.cpp +++ b/source/buildinfo.cpp @@ -97,27 +97,27 @@ BuildInfo::Loader::Loader(BuildInfo &bi): add("warning", &Loader::warning); } -void BuildInfo::Loader::incpath(const std::string &s) +void BuildInfo::Loader::incpath(const string &s) { obj.incpath.push_back(s); } -void BuildInfo::Loader::define(const std::string &d, const std::string &v) +void BuildInfo::Loader::define(const string &d, const string &v) { obj.defines[d] = v; } -void BuildInfo::Loader::libpath(const std::string &s) +void BuildInfo::Loader::libpath(const string &s) { obj.libpath.push_back(s); } -void BuildInfo::Loader::library(const std::string &s) +void BuildInfo::Loader::library(const string &s) { obj.libs.push_back(s); } -void BuildInfo::Loader::warning(const std::string &s) +void BuildInfo::Loader::warning(const string &s) { obj.warnings.push_back(s); } diff --git a/source/executable.cpp b/source/executable.cpp index fe37c9f..0cdeec4 100644 --- a/source/executable.cpp +++ b/source/executable.cpp @@ -10,7 +10,7 @@ Executable::Executable(Builder &b, const FS::Path &p): Binary(b, p) { } -Executable::Executable(Builder &b, const Component &c, const std::list &objs): +Executable::Executable(Builder &b, const Component &c, const list &objs): Binary(b, c, generate_filename(c), objs) { install_location = "bin"; diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp index 1180b4e..5209317 100644 --- a/source/gnucompiler.cpp +++ b/source/gnucompiler.cpp @@ -25,7 +25,7 @@ GnuCompiler::GnuCompiler(Builder &b, const string &t, const string &n): system_path.push_back("/usr/"+arch.get_cross_prefix()+"/include"); } -Target *GnuCompiler::create_target(const list &sources, const std::string &) const +Target *GnuCompiler::create_target(const list &sources, const string &) const { if(sources.size()!=1) throw invalid_argument("GnuCCompiler::create_target"); diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp index 32f2bf3..df0adbc 100644 --- a/source/gnulinker.cpp +++ b/source/gnulinker.cpp @@ -46,7 +46,7 @@ GnuLinker::~GnuLinker() delete cxx_linker; } -Target *GnuLinker::create_target(const list &sources, const std::string &arg) const +Target *GnuLinker::create_target(const list &sources, const string &arg) const { if(sources.empty()) throw invalid_argument("GnuLinker::create_target"); diff --git a/source/installedfile.cpp b/source/installedfile.cpp index 04a40ec..4ee821f 100644 --- a/source/installedfile.cpp +++ b/source/installedfile.cpp @@ -6,7 +6,7 @@ using namespace std; using namespace Msp; -InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s, const std::string &loc): +InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s, const string &loc): FileTarget(b, &p, generate_target_path(b.get_prefix(), s, loc)), source(s) { @@ -35,7 +35,7 @@ void InstalledFile::check_rebuild() mark_rebuild(source.get_name()+" needs rebuilding"); } -FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const std::string &loc) +FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const string &loc) { if(!tgt.is_installable() && loc.empty()) throw invalid_argument(tgt.get_name()+" is not installable"); diff --git a/source/target.cpp b/source/target.cpp index 510dfbd..cf227a4 100644 --- a/source/target.cpp +++ b/source/target.cpp @@ -109,7 +109,7 @@ Task *Target::build() return task; } -void Target::mark_rebuild(const std::string &reason) +void Target::mark_rebuild(const string &reason) { if(reason.empty()) throw invalid_argument("No reason given for rebuilding "+name); -- 2.45.2