Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

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

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index 106b6645f5eac889e9186dc0bfda2826ed772d9f..6779e1d942197575e2422c8a6b2d3d5a22d302e8 100644 (file)
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PAPER_OUTPUTTER_HH
@@ -22,23 +22,23 @@
 class Paper_outputter
 {
   SCM output_module_;
-  std::string file_name_;
+  string file_name_;
   SCM file_;
 
 public:
-  DECLARE_SMOBS (Paper_outputter,);
+  DECLARE_SMOBS (Paper_outputter);
 
 public:
   SCM file () const;
   SCM dump_string (SCM);
   void output_scheme (SCM scm);
-  Paper_outputter (SCM port, std::string format);
+  Paper_outputter (SCM port, string format);
   SCM scheme_to_string (SCM);
   void output_stencil (Stencil);
   void close ();
 };
 
-Paper_outputter *get_paper_outputter (std::string, std::string);
+Paper_outputter *get_paper_outputter (string, string);
 DECLARE_UNSMOB (Paper_outputter, outputter);
 
 #endif /* PAPER_OUTPUTTER_HH */