patch::: 1.1.17.mb1: Re: LilyPond Xmas release

[lilypond.git] / lily / include / colhpos.hh

diff --git a/lily/include/colhpos.hh b/lily/include/colhpos.hh
index 01a87167ba10fef873a082c095eba138f7949598..964933e2df6d2a3acf9d70f9da71b90bb24c6955 100644 (file)
--- a/lily/include/colhpos.hh
+++ b/lily/include/colhpos.hh
@@ -1,18 +1,18 @@
 /*
   colhpos.hh -- part of GNU LilyPond
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef COLHPOS_HH
 #define COLHPOS_HH
 
-#include "varray.hh"
+#include "array.hh"
 #include "lily-proto.hh"
 
 typedef Array<Paper_column*>  Line_of_cols;
 
-struct Col_hpositions {
+struct Column_x_positions {
   Line_spacer * spacer_l_;
   bool ugh_b_;
   Line_of_cols error_col_l_arr_;
@@ -21,17 +21,16 @@ struct Col_hpositions {
   Real energy_f_;
   bool satisfies_constraints_b_;
 
-  /* ************** */
   void OK() const;
-  ~Col_hpositions();
+  ~Column_x_positions();
   void solve_line();
   void approximate_solve_line();
   /** generate a solution with no regard to idealspacings or
     constraints.  should always work */
   void stupid_solution();
   void set_stupid_solution (Vector);
-  Col_hpositions();
-  void add (Paper_column*c);
+  Column_x_positions();
+  void add_paper_column (Paper_column*c);
   void print() const;
 };