X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspring.hh;h=d4ebee23cd05f3680b9bfcfe3bb036061a6af92a;hb=ef9512388b15e1e5e2b3592299ffe489ac43abb4;hp=56763572862d542981ccac6901f708ee19098794;hpb=733d98665372b815cac635f48f1a20d65f50d25a;p=lilypond.git

diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index 5676357286..d4ebee23cd 100644
--- a/lily/include/spring.hh
+++ b/lily/include/spring.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2010 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
@@ -23,8 +23,12 @@
 #include "lily-proto.hh"
 #include "smobs.hh"
 
-class Spring
+class Spring : public Simple_smob<Spring>
 {
+public:
+  static SCM equal_p (SCM, SCM);
+  static const char * const type_p_name_;
+private:
   Real distance_;
   Real min_distance_;
 
@@ -35,7 +39,6 @@ class Spring
 
   void update_blocking_force ();
 
-  DECLARE_SIMPLE_SMOBS (Spring);
 public:
   Spring ();
   Spring (Real distance, Real min_distance);
@@ -45,7 +48,7 @@ public:
   Real inverse_stretch_strength () const {return inverse_stretch_strength_;}
   Real inverse_compress_strength () const {return inverse_compress_strength_;}
   Real blocking_force () const {return blocking_force_;}
-  
+
   Real length (Real f) const;
 
   void set_distance (Real);
@@ -58,12 +61,10 @@ public:
   void set_default_compress_strength ();
   void set_default_stretch_strength ();
 
-  void operator*= (Real);
-  bool operator> (Spring const&) const;
+  void operator *= (Real);
+  bool operator > (Spring const &) const;
 };
-DECLARE_UNSMOB (Spring, spring);
 
 Spring merge_springs (vector<Spring> const &springs);
 
 #endif /* SPRING_HH */
-