Merge branch 'issue4032'

[lilypond.git] / lily / item.cc

diff --git a/lily/item.cc b/lily/item.cc
index 9941bc13c2abf79bc36fd25f952a084633d6e635..f007670e7ae8974fa184b612f997bb1a83bec344 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
@@ -43,7 +43,7 @@ Item::Item (SCM s)
 }
 
 /**
-   Item copy ctor.  Copy nothing: everything should be a elt property
+   Item copy ctor.  Copy nothing: everything should be an elt property
    or a special purpose pointer (such as broken_to_drul_[]) */
 Item::Item (Item const &s)
   : Grob (s)
@@ -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