X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur-configuration.hh;h=c0ae07fd579ba5452bc962ad855e2c1a16331793;hb=6f95e02682255e985808947461fafcc5fcc3f060;hp=a4d78f99c912b913fe6cf9449869f3ab085d036c;hpb=3c6c00c08ff31f57ec8d88450b4e4e7917bc4f3e;p=lilypond.git

diff --git a/lily/include/slur-configuration.hh b/lily/include/slur-configuration.hh
index a4d78f99c9..c0ae07fd57 100644
--- a/lily/include/slur-configuration.hh
+++ b/lily/include/slur-configuration.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 class Slur_configuration
 {
   Real score_;
-  string score_card_;
+  std::string score_card_;
 
 public:
   Drul_array<Offset> attachment_;
@@ -46,15 +46,15 @@ public:
   };
 
   int next_scorer_todo;
-  
+
   Slur_configuration ();
 
   Real score () const { return score_; }
-  string card () const { return score_card_; } 
-  void add_score (Real, string);
-  
+  std::string card () const { return score_card_; }
+  void add_score (Real, const std::string&);
+
   void generate_curve (Slur_score_state const &state, Real r0, Real h_inf,
-		       vector<Offset> const &);
+                       std::vector<Offset> const &);
   void run_next_scorer (Slur_score_state const &);
   bool done () const;
   static Slur_configuration *new_config (Drul_array<Offset> const &offs, int idx);
@@ -72,7 +72,7 @@ protected:
 class Slur_configuration_less
 {
 public:
-  bool operator () (Slur_configuration* const& l, Slur_configuration* const& r)
+  bool operator () (Slur_configuration *const &l, Slur_configuration *const &r)
   {
     // Invert
     return l->score_ > r->score_;