Run grand replace for 2015.

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 0e34d2e90be70e051e5ce89a08b1ab7307559a19..0baf198fa325ce2b9076442642fe1d4338d4afb5 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--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,25 +27,27 @@
 #include "smobs.hh"
 #include "virtual-methods.hh"
 
-class Score
+class Score : public Smob<Score>
 {
-  DECLARE_SMOBS (Score);
-
+public:
+  SCM mark_smob ();
+  static const char type_p_name_[];
+  virtual ~Score ();
+private:
   SCM music_;
   SCM input_location_;
   SCM header_;
 public:
-  Input *origin() const;
- 
-  vector<Output_def*> defs_;
-  string user_key_;
+  Input *origin () const;
+
+  vector<Output_def *> defs_;
   bool error_found_;
 
   Score ();
   Score (Score const &);
 
   VIRTUAL_COPY_CONSTRUCTOR (Score, Score);
-  
+
   SCM get_music () const;
   void add_output_def (Output_def *def);
   void set_music (SCM music);
@@ -54,9 +56,7 @@ public:
   void set_header (SCM module);
 };
 
-DECLARE_UNSMOB (Score, score);
 
-SCM ly_render_output (SCM, SCM);
 SCM ly_run_translator (SCM, SCM);
 
 #endif /* SCORE_HH */