* flower/include/pqueue.hh: Derive from std::vector.

[lilypond.git] / lily / include / simple-spacer.hh

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 9ffdc175fa5a18853ab458e45ee1106eabfdbc28..16c9494ed6ff78229e2ddbbc24258906ad8e45f2 100644 (file)
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -3,20 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SIMPLE_SPACER_HH
 #define SIMPLE_SPACER_HH
 
-#include "parray.hh"
+#include "std-vector.hh"
 #include "lily-proto.hh"
 #include "smobs.hh"
 
 struct Spring_description
 {
   Real ideal_;
-  Real hooke_;
+  Real inverse_hooke_;
   bool is_active_;
   Real block_force_;
 
@@ -29,7 +29,7 @@ struct Spring_description
 class Simple_spacer
 {
 public:
-  Array<Spring_description> springs_;
+  std::vector<Spring_description> springs_;
   Real force_;
   Real indent_;
   Real line_len_;
@@ -56,11 +56,11 @@ public:
 struct Simple_spacer_wrapper
 {
   Simple_spacer *spacer_;
-  Link_array<Grob> spaced_cols_;
-  Link_array<Grob> loose_cols_;
+  Link_array__Grob_ spaced_cols_;
+  Link_array__Grob_ loose_cols_;
 
   Simple_spacer_wrapper ();
-  void add_columns (Link_array<Grob> const &);
+  void add_columns (Link_array__Grob_ const &);
   void solve (Column_x_positions *, bool);
   ~Simple_spacer_wrapper ();
 private: