Run grand replace for 2015.

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

diff --git a/lily/include/prob.hh b/lily/include/prob.hh
index 26c9a085100c9eac2c06dcc3ac96724da5b92e2d..9f6ad9609a080e5c7567944c39607781edcb88a7 100644 (file)
--- a/lily/include/prob.hh
+++ b/lily/include/prob.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2010  Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2004--2015  Jan Nieuwenhuizen <janneke@gnu.org>
 
   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,7 +23,6 @@
 #include "stencil.hh"
 #include "virtual-methods.hh"
 
-
 /*
   A formatted "system" (A block of titling also is a Property_object)
 
@@ -32,21 +31,27 @@
   Property_object. Page-breaking handles Property_object objects.
 */
 
-class Prob
+class Prob : public Smob<Prob>
 {
-  DECLARE_SMOBS (Prob);
-  DECLARE_CLASSNAME(Prob);
+public:
+  int print_smob (SCM, scm_print_state *);
+  SCM mark_smob ();
+  static SCM equal_p (SCM, SCM);
+  static const char type_p_name_[];
+  virtual ~Prob ();
+private:
+  DECLARE_CLASSNAME (Prob);
 
   void init_vars ();
 protected:
   SCM mutable_property_alist_;
   SCM immutable_property_alist_;
   SCM type_;
-  
+
   virtual void derived_mark () const;
   virtual SCM copy_mutable_properties () const;
-  virtual void type_check_assignment (SCM,SCM) const;
-  
+  virtual void type_check_assignment (SCM, SCM) const;
+
 public:
   Prob (SCM, SCM);
   Prob (Prob const &);
@@ -54,15 +59,14 @@ public:
   SCM type () const { return type_; }
   SCM get_property_alist (bool _mutable) const;
   SCM internal_get_property (SCM sym) const;
-  void instrumented_set_property (SCM, SCM, const char*, int, const char*);
+  void instrumented_set_property (SCM, SCM, const char *, int, const char *);
   void internal_set_property (SCM sym, SCM val);
 };
 
-DECLARE_UNSMOB(Prob,prob);
 
 SCM ly_prob_set_property_x (SCM system, SCM sym, SCM value);
 SCM ly_prob_property (SCM prob, SCM sym, SCM val);
 
 SCM ly_prob_type_p (SCM obj, SCM sym);
-  
+
 #endif /* PROPERTY_OBJECT_HH */