Manual cleanup after unsmob_xxx -> Xxx:unsmob conversion

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

diff --git a/lily/include/input.hh b/lily/include/input.hh
index 2ae9f093eed3fa7d9cf580f25ac6e1c7825e346b..5a2992fdbe2ae54efb936ad5614989e7c07e500b 100644 (file)
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 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
@@ -21,6 +21,7 @@
 #define INPUT_HH
 
 #include "lily-proto.hh"
+#include "smobs.hh"
 
 /**
    Base class for anything that records its poisition in the parse file.
@@ -35,13 +36,15 @@ public:
   char const *start () const;
   char const *end () const;
 
+  static Input *unsmob (SCM);
+
   void set (Source_file *, char const *, char const *);
-  void error (string) const;
-  void programming_error (string) const;
-  void non_fatal_error (string) const;
-  void warning (string) const;
-  void message (string) const;
-  void debug_output (string) const;
+  void error (const string&) const;
+  void programming_error (const string&) const;
+  void non_fatal_error (const string&) const;
+  void warning (const string&) const;
+  void message (const string&) const;
+  void debug_output (const string&) const;
   void set_spot (Input const &);
   void step_forward ();
   void set_location (Input const &, Input const &);
@@ -63,13 +66,10 @@ public:
   Input ();
 protected:
   string message_location () const;
-  string message_string (string msg) const;
+  string message_string (const string &msg) const;
 };
 
-#include "smobs.hh"
-
 SCM make_input (Input spot);
-Input *unsmob_input (SCM);
 
 extern Input dummy_input_global;