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

[lilypond.git] / lily / include / tie-configuration.hh

diff --git a/lily/include/tie-configuration.hh b/lily/include/tie-configuration.hh
index aaf0746a4aadf6ba72b2ce1e8de6d953b465fc20..93f575ca52c49d202473386486777aa3c8739d6c 100644 (file)
--- a/lily/include/tie-configuration.hh
+++ b/lily/include/tie-configuration.hh
@@ -28,7 +28,7 @@
 class Tie_configuration
 {
 #if DEBUG_SLUR_SCORING
-  string score_card_;
+  std::string score_card_;
 #endif
   Real score_;
   bool scored_;
@@ -36,7 +36,7 @@ class Tie_configuration
 
 public:
   Real score () const { return score_; }
-  string card () const { return score_card_; }
+  std::string card () const { return score_card_; }
 
   int position_;
   Direction dir_;
@@ -46,7 +46,7 @@ public:
   /* computed. */
   Interval attachment_x_;
 
-  void add_score (Real, const string&);
+  void add_score (Real, const std::string&);
   Tie_configuration ();
   void center_tie_vertically (Tie_details const &);
   Bezier get_transformed_bezier (Tie_details const &) const;
@@ -62,24 +62,24 @@ public:
 
 INSTANTIATE_COMPARE (Tie_configuration, Tie_configuration::compare);
 
-class Ties_configuration : public vector<Tie_configuration>
+class Ties_configuration : public std::vector<Tie_configuration>
 {
   Real score_;
-  string score_card_;
+  std::string score_card_;
   bool scored_;
-  vector<string> tie_score_cards_;
+  std::vector<std::string> tie_score_cards_;
 
   friend class Tie_formatting_problem;
 public:
   Ties_configuration ();
-  void add_score (Real amount, const string &description);
-  void add_tie_score (Real amount, int i, const string &description);
+  void add_score (Real amount, const std::string &description);
+  void add_tie_score (Real amount, int i, const std::string &description);
   Real score () const;
   void reset_score ();
-  string card () const;
-  string tie_card (int i) const { return tie_score_cards_[i]; }
-  string complete_tie_card (vsize i) const;
-  string complete_score_card () const;
+  std::string card () const;
+  std::string tie_card (int i) const { return tie_score_cards_[i]; }
+  std::string complete_tie_card (vsize i) const;
+  std::string complete_score_card () const;
 };
 
 #endif /* TIE_CONFIGURATION_HH */