Issue 4550 (1/2) Avoid "using namespace std;" in included files

[lilypond.git] / lily / tie-configuration.cc

diff --git a/lily/tie-configuration.cc b/lily/tie-configuration.cc
index c415942b5d1c5b18bfa2a899fcd6122c58678b5f..968bfd65ad95c8c445052b9ee9ff51d5e1ef3f31 100644 (file)
--- a/lily/tie-configuration.cc
+++ b/lily/tie-configuration.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -24,6 +24,8 @@
 #include "tie-formatting-problem.hh"
 #include "bezier.hh"
 
+using std::string;
+
 int
 Tie_configuration::compare (Tie_configuration const &a,
                             Tie_configuration const &b)
@@ -102,7 +104,7 @@ Tie_configuration::distance (Tie_configuration const &a,
 }
 
 void
-Tie_configuration::add_score (Real s, string desc)
+Tie_configuration::add_score (Real s, const string &desc)
 {
   assert (!scored_);
   score_ += s;
@@ -136,7 +138,7 @@ Ties_configuration::reset_score ()
 }
 
 void
-Ties_configuration::add_tie_score (Real s, int i, string desc)
+Ties_configuration::add_tie_score (Real s, int i, const string &desc)
 {
   assert (!scored_);
   score_ += s;
@@ -150,7 +152,7 @@ Ties_configuration::add_tie_score (Real s, int i, string desc)
 }
 
 void
-Ties_configuration::add_score (Real s, string desc)
+Ties_configuration::add_score (Real s, const string &desc)
 {
   assert (!scored_);
   score_ += s;
@@ -170,7 +172,7 @@ Ties_configuration::complete_tie_card (vsize i) const
   string s;
   s += to_string ("%d (%.2f) %c: ", (*this)[i].position_, (*this)[i].delta_y_,
                   ((*this)[i].dir_ == UP ? 'u' : 'd'))
-       + (*this)[i].card () + (*this).tie_card (i);
+       + (*this)[i].card () + tie_card (i);
 
   /*
     this is a little awkward, but we must decide where to put