Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / lily / item.cc

diff --git a/lily/item.cc b/lily/item.cc
index 9cc808dde4491c11f87e928b001d1be1deedca0c..bcde47616d9915d7032944a3d2374d2e19cb6b39 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 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
@@ -224,9 +224,9 @@ Item::derived_mark () const
 }
 
 Item *
-unsmob_item (SCM s)
+Item::unsmob (SCM s)
 {
-  return dynamic_cast<Item *> (unsmob_grob (s));
+  return dynamic_cast<Item *> (Grob::unsmob (s));
 }
 
 Interval
@@ -236,7 +236,6 @@ Item::pure_height (Grob *g, int start, int end)
     return cached_pure_height_ + pure_relative_y_coordinate (g, start, end);
   /* Note: cached_pure_height_ does not notice if start changes, implicitly
      assuming that Items' pure_heights do not depend on 'start' or 'end'.
-     Accidental_interface::pure_height(), however, does depend on 'start'.
   */
 
   cache_pure_height (Grob::pure_height (this, start, end));