Release: bump Welcome versions.

[lilypond.git] / lily / include / beam-scoring-problem.hh

diff --git a/lily/include/beam-scoring-problem.hh b/lily/include/beam-scoring-problem.hh
index 022c42a85ae5a275f5ab5fc57dc24dd39842dc04..bbabfde7deca96823ca0477b84500af4f2cc22ca 100644 (file)
--- a/lily/include/beam-scoring-problem.hh
+++ b/lily/include/beam-scoring-problem.hh
@@ -48,14 +48,14 @@ struct Beam_configuration
   Interval y;
   Real demerits;
 #if DEBUG_BEAM_SCORING
-  std::string score_card_;
+  string score_card_;
 #endif
 
   int next_scorer_todo;
 
   Beam_configuration ();
   bool done () const;
-  void add (Real demerit, const std::string &reason);
+  void add (Real demerit, const string &reason);
   static Beam_configuration *new_config (Interval start,
                                          Interval offset);
 };
@@ -140,14 +140,14 @@ private:
     affine linear in YL and YR. If YL == YR == 0, then we might have
     stem_y != 0.0, when we're cross staff.
   */
-  std::vector<Stem_info> stem_infos_;
-  std::vector<Real> chord_start_y_;
-  std::vector<Interval> head_positions_;
-  std::vector<Slice> beam_multiplicity_;
-  std::vector<bool> is_normal_;
-  std::vector<Real> base_lengths_;
-  std::vector<Real> stem_xpositions_;
-  std::vector<Real> stem_ypositions_;
+  vector<Stem_info> stem_infos_;
+  vector<Real> chord_start_y_;
+  vector<Interval> head_positions_;
+  vector<Slice> beam_multiplicity_;
+  vector<bool> is_normal_;
+  vector<Real> base_lengths_;
+  vector<Real> stem_xpositions_;
+  vector<Real> stem_ypositions_;
 
   bool is_xstaff_;
   bool is_knee_;
@@ -164,8 +164,8 @@ private:
   // Beam_configurations.
   Drul_array<Interval> quant_range_;
   Real beam_translation_;
-  std::vector<Beam_collision> collisions_;
-  std::vector<Beam_segment> segments_;
+  vector<Beam_collision> collisions_;
+  vector<Beam_segment> segments_;
 
   vsize first_normal_index ();
   vsize last_normal_index ();
@@ -180,7 +180,7 @@ private:
 
   void one_scorer (Beam_configuration *config) const;
   Beam_configuration *force_score (SCM inspect_quants,
-                                   const std::vector<Beam_configuration *> &configs) const;
+                                   const vector<Beam_configuration *> &configs) const;
   Real y_at (Real x, Beam_configuration const *c) const;
 
   // Scoring functions:
@@ -190,7 +190,7 @@ private:
   void score_slope_direction (Beam_configuration *config) const;
   void score_slope_musical (Beam_configuration *config) const;
   void score_stem_lengths (Beam_configuration *config) const;
-  void generate_quants (std::vector<Beam_configuration *> *scores) const;
+  void generate_quants (vector<Beam_configuration *> *scores) const;
   void score_collisions (Beam_configuration *config) const;
 };