X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspring-smob.cc;h=5639a1cd0737446b8318f3c3a12b9712acc69007;hb=dafdaf6f564e4b658de316f629484cbeecf3c803;hp=b00bd9df12ca4c12c0cd62ce2ddd4982a5814969;hpb=ce521e79fd7669b45c8c1132e4b5693a03b5d90a;p=lilypond.git

diff --git a/lily/spring-smob.cc b/lily/spring-smob.cc
index b00bd9df12..5639a1cd07 100644
--- a/lily/spring-smob.cc
+++ b/lily/spring-smob.cc
@@ -1,47 +1,35 @@
-/*   
-  spring.cc --  implement Spring
-  
+/*
+  spring.cc -- implement Spring
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "spring.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "ly-smobs.icc"
 
-Spring_smob::Spring_smob()
-{
-  distance_f_ =0.;
-  strength_f_ =1.0;
-  expand_only_b_ = false;
-  other_ = 0;
-}
-
-
-IMPLEMENT_SIMPLE_SMOBS(Spring_smob);
+IMPLEMENT_SIMPLE_SMOBS (Spring);
 
 SCM
-Spring_smob::mark_smob (SCM) { return SCM_UNSPECIFIED; }
+Spring::mark_smob (SCM x)
+{
+  (void)x;
+
+  return SCM_UNSPECIFIED;
+}
 
 int
-Spring_smob::print_smob (SCM s, SCM p, scm_print_state *)
+Spring::print_smob (SCM, SCM p, scm_print_state *)
 {
-  Spring_smob *ss = unsmob_spring (s);
-  scm_puts (_f("#<spring smob d= %f>", ss->distance_f_).ch_C(), p);
+  scm_puts ("#<Spring smob>", p);
   return 1;
 }
 
 SCM
-Spring_smob::equal_p (SCM a , SCM b)
+Spring::equal_p (SCM a, SCM b)
 {
-  return a==b? SCM_BOOL_T : SCM_BOOL_F;
+  return a == b? SCM_BOOL_T : SCM_BOOL_F;
 }
 
-SCM
-Spring_smob::smobbed_copy ()const
-{
-  Spring_smob *  p = new Spring_smob (*this);
-  return p->smobbed_self ();
-}