Run grand replace for 2015.

[lilypond.git] / lily / include / paper-outputter.hh

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index c0cb9f22ef1c8d4a57f65469efe559ecc7bf6d23..73daf148b4ea19c5736f1423fbe455ebc3e19b80 100644 (file)
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 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
@@ -30,28 +30,27 @@
   Glue between the backend (grobs, systems, pages) and the output file.
   proxy for Scheme backends.
 */
-class Paper_outputter
+class Paper_outputter : public Smob<Paper_outputter>
 {
+public:
+  SCM mark_smob ();
+  virtual ~Paper_outputter ();
+private:
   SCM output_module_;
   string file_name_;
   SCM file_;
 
 public:
-  DECLARE_SMOBS (Paper_outputter);
-
-public:
-  Paper_outputter (SCM port, string format);
+  Paper_outputter (SCM port, const string &format);
 
   void close ();
   SCM dump_string (SCM);
   SCM file () const;
   SCM module () const;
-  void output_scheme (SCM scm);
+  SCM output_scheme (SCM scm);
   void output_stencil (Stencil);
   SCM scheme_to_string (SCM);
 };
 
-Paper_outputter *get_paper_outputter (string, string);
-DECLARE_UNSMOB (Paper_outputter, outputter);
 
 #endif /* PAPER_OUTPUTTER_HH */