resolve merge

[lilypond.git] / lily / item.cc

diff --git a/lily/item.cc b/lily/item.cc
index e559f6abed70559008846c4bd42909c6d1f29682..0a853484e05bb58c1a1f3ca7594d0b977a610abf 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -1,9 +1,20 @@
 /*
-  item.cc -- implement Item
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 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/>.
 */
 
 #include "item.hh"
@@ -242,12 +253,6 @@ Item::pure_height (Grob *g, int start, int end)
   return cached_pure_height_ + pure_relative_y_coordinate (g, start, end);
 }
 
-bool
-Item::less (Grob * const &g1, Grob * const &g2)
-{
-  return dynamic_cast<Item*> (g1)->get_column ()->get_rank () < dynamic_cast<Item*> (g2)->get_column ()->get_rank ();
-}
-
 ADD_INTERFACE (Item,
               "Grobs can be distinguished in their role in the horizontal"
               " spacing.  Many grobs define constraints on the spacing by"