Remove extraneous std:: qualifiers

diff --git a/source/binary.cpp b/source/binary.cpp
index 957d233d65ec3bff179d3e93703b5f5af1c57e7e..a06bd2031bbbf33e9607bd8184c04066153ae377 100644 (file)
--- 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<ObjectFile *> &objs):
+Binary::Binary(Builder &b, const Component &c, const string &p, const list<ObjectFile *> &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 cc90c0af4f5b26d70747938d481fd12af99bd455..b9c558eff44f96a9dcb4f21c0d80c9da8af19036 100644 (file)
--- 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<string> &flags)
+BinaryPackage *BinaryPackage::from_flags(Builder &builder, const string &name, const vector<string> &flags)
 {
        BinaryPackage *pkg = new BinaryPackage(builder, name);
        pkg->use_pkgconfig = true;

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 77243ef365ffcb2cc6b82868c852ae04bfe0e757..2372e89cd8453ce59cbf7463afa35a5139e151ea 100644 (file)
--- 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 fe37c9f23f0e27b85c7d75e40f41a8269309e44d..0cdeec41edda0a3c815d373fb326663fe863d2ac 100644 (file)
--- 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<ObjectFile *> &objs):
+Executable::Executable(Builder &b, const Component &c, const list<ObjectFile *> &objs):
        Binary(b, c, generate_filename(c), objs)
 {
        install_location = "bin";

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 1180b4e89f1218a5d9f678b4415b3e7bd1c0a398..5209317dc0fd4b544bfc66b292c6beebd77080d6 100644 (file)
--- 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<Target *> &sources, const std::string &) const
+Target *GnuCompiler::create_target(const list<Target *> &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 32f2bf3bb1843c72b3d4249541bccfcd8359eb55..df0adbc8eff36944b66053d4e83a371902671d66 100644 (file)
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -46,7 +46,7 @@ GnuLinker::~GnuLinker()
        delete cxx_linker;
 }
 
-Target *GnuLinker::create_target(const list<Target *> &sources, const std::string &arg) const
+Target *GnuLinker::create_target(const list<Target *> &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 04a40ece30fc3714309d27a3f150f1eae23b3f44..4ee821fab1ab55bc74a5075a378f2b926e89b990 100644 (file)
--- 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 510dfbdf708fa83cd57ee0426a3b0b1c01fc5a56..cf227a42edf421377817e1740240e808900ec0a0 100644 (file)
--- 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);