Issue 4625/2: Add event_symbol function to all slur engravers

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

diff --git a/lily/include/slur-configuration.hh b/lily/include/slur-configuration.hh
index acf2b1fdc6f21abc08870e59b414a1d737719af6..c0ae07fd579ba5452bc962ad855e2c1a16331793 100644 (file)
--- 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_;
@@ -50,11 +50,11 @@ public:
   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);