release: 0.1.11

[lilypond.git] / lib / duration.cc

diff --git a/lib/duration.cc b/lib/duration.cc
index c26699c5bd773d3f38dc408a901feded7a24fe42..f04c5e42c05b6a4744d91f805aa5f55b9df4fd03 100644 (file)
--- a/lib/duration.cc
+++ b/lib/duration.cc
@@ -7,6 +7,7 @@
            Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
+#include <assert.h>
 #include "proto.hh"
 #include "plist.hh"
 #include "string.hh"
@@ -27,20 +28,13 @@ Duration::Duration()
   ticks_i_ = 0;
 }
 
-Duration::Duration( int type_i, int dots_i = 0 )
-{
-  durlog_i_ = type_i;
-  dots_i_ = dots_i;
-  ticks_i_ = 0;
-}
-
 bool
 Duration::duration_type_b(int t)
 {
   /*
     ugh. Assuming behavior of conversion funcs on broken input.
    */
-  return t == Duration_convert::type2_i( Duration_convert::i2_type(t));
+  return t == Duration_convert::type2_i(Duration_convert::i2_type(t));
 }
 
 // ugh, what's this?
@@ -66,15 +60,15 @@ Duration::set_plet(Duration d)
 }
 
 void
-Duration::set_ticks( int ticks_i )
+Duration::set_ticks(int ticks_i)
 {
-  assert( durlog_i_ <10 );
-  assert( !dots_i_ );
+  assert(durlog_i_ <10);
+  assert(!dots_i_);
   ticks_i_ = ticks_i;
 }
 
 String
-Duration::str()const
+Duration::str() const
 {
   return Duration_convert::dur2_str(*this);
 }