Run grand replace for 2015.

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

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index 59dfcd3798b3de2cf7dac935b16186b90811dccf..80a78fbf5976b5764db01d2349a21ec190b6cd2f 100644 (file)
--- a/lily/include/moment.hh
+++ b/lily/include/moment.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--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
@@ -27,10 +27,12 @@
    Musical timing (Main-timing, grace-timing) with glue for
    Guilification;
 */
-class Moment
+class Moment : public Simple_smob<Moment>
 {
-  DECLARE_SIMPLE_SMOBS (Moment);
 public:
+  static SCM equal_p (SCM, SCM);
+  int print_smob (SCM, scm_print_state *);
+  static const char type_p_name_[];
   Moment ();
   Moment (int m);
 
@@ -54,8 +56,6 @@ public:
   bool to_bool () const;
   I64 den () const;
   I64 num () const;
-  Rational main_part () const;
-  Rational grace_part () const;
   /*
     Deliver a copy of THIS as a smobified SCM
   */
@@ -66,11 +66,10 @@ public:
 
 IMPLEMENT_ARITHMETIC_OPERATOR (Moment, +);
 IMPLEMENT_ARITHMETIC_OPERATOR (Moment, -);
-IMPLEMENT_ARITHMETIC_OPERATOR (Moment, /);
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, / );
 IMPLEMENT_ARITHMETIC_OPERATOR (Moment, *);
-IMPLEMENT_ARITHMETIC_OPERATOR (Moment, %);
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, % );
 
-DECLARE_UNSMOB (Moment, moment);
 int compare (Moment const &, Moment const &);
 INSTANTIATE_COMPARE (Moment const &, Moment::compare);