Run grand replace for 2015.

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

diff --git a/lily/include/rod.hh b/lily/include/rod.hh
index 42509d453efbcae6597b04c81c8094ce9d2b678c..01b4e5cc2c1168454358dfa6deac81252c35ff80 100644 (file)
--- a/lily/include/rod.hh
+++ b/lily/include/rod.hh
@@ -1,37 +1,37 @@
-/*   
-  rod.hh -- declare Rod, Column_rod
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #ifndef ROD_HH
 #define ROD_HH
+
 #include "lily-proto.hh"
-#include "direction.hh"
 #include "drul-array.hh"
 
-struct Column_rod {
-  Paper_column *other_l_;
-  Real distance_f_;
-  Direction dir_;
-  Column_rod ();
-  static int compare (const Column_rod &r1, const Column_rod &r2);
-  void print () const;
-};
-
 struct Rod
 {
-  Drul_array <Item*> item_l_drul_;
-  Real distance_f_;
-  void add_to_cols ();
+  Drul_array<Item *> item_drul_;
+  Real distance_;
 
-  Rod (Item*,Item*);
+  void columnize ();
+  void add_to_cols ();
   Rod ();
 };
 
-
 #endif /* ROD_HH */