unsmob_pitch -> Pitch::unsmob and related

[lilypond.git] / lily / moment.cc

diff --git a/lily/moment.cc b/lily/moment.cc
index c9b3bd4250438b7ae09251f0ab17269d8db57ca4..adcecff767140095dd22e5fbb5aa3d8a5453fdb5 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -1,9 +1,20 @@
 /*
-  moment.cc -- implement Moment
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2007 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 "moment.hh"
@@ -60,17 +71,17 @@ SCM
 Moment::as_scheme () const
 {
   return scm_list_5 (ly_symbol2scm ("ly:make-moment"),
-                    scm_from_int64 (main_part_.num ()),
-                    scm_from_int64 (main_part_.den ()),
-                    scm_from_int64 (grace_part_.num ()),
-                    scm_from_int64 (grace_part_.den ()));
+                     scm_from_int64 (main_part_.num ()),
+                     scm_from_int64 (main_part_.den ()),
+                     scm_from_int64 (grace_part_.num ()),
+                     scm_from_int64 (grace_part_.den ()));
 }
 
 SCM
 Moment::equal_p (SCM a, SCM b)
 {
-  Moment *m1 = unsmob_moment (a);
-  Moment *m2 = unsmob_moment (b);
+  Moment *m1 = Moment::unsmob (a);
+  Moment *m2 = Moment::unsmob (b);
 
   return (*m1 == *m2) ? SCM_BOOL_T : SCM_BOOL_F;
 }
@@ -184,7 +195,7 @@ operator << (ostream &os, Moment const &m)
 Moment
 robust_scm2moment (SCM m, Moment d)
 {
-  Moment *p = unsmob_moment (m);
+  Moment *p = Moment::unsmob (m);
   if (!p)
     return d;
   else
@@ -194,6 +205,6 @@ robust_scm2moment (SCM m, Moment d)
 bool
 moment_less (SCM a, SCM b)
 {
-  return *unsmob_moment (a) < *unsmob_moment (b);
+  return *Moment::unsmob (a) < *Moment::unsmob (b);
 }