X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsource-file.hh;h=26bf6dbdb4810acb0df6b07a5f7a28bbf25d407e;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=21060e370497c220184dc19b7b85082ed4d06065;hpb=d840dc8416a22e73636526a9415ae041af40570b;p=lilypond.git

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index 21060e3704..26bf6dbdb4 100644
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -1,15 +1,25 @@
 /*
-  source-file.hh -- declare Source_file
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2014 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1999--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef SOURCE_FILE_HH
 #define SOURCE_FILE_HH
 
-#include "flower-proto.hh"
 #include "std-vector.hh"
 #include "lily-proto.hh"
 #include "smobs.hh"
@@ -27,7 +37,7 @@ using namespace std;
 
 class Source_file
 {
-  vector<char const*> newline_locations_;
+  vector<char const *> newline_locations_;
   istream *istream_;
   vector<char> characters_;
   SCM str_port_;
@@ -35,11 +45,11 @@ class Source_file
   void load_stdin ();
   void init_port ();
   void init ();
-  
-  DECLARE_SMOBS(Source_file, bla);
+
+  DECLARE_SMOBS (Source_file);
 public:
-  Source_file (string fn);
-  Source_file (string, string);
+  Source_file (const string &fn);
+  Source_file (const string&, const string&);
 
   char const *c_str () const;
   virtual string quote_input (char const *pos_str0) const;
@@ -54,8 +64,8 @@ public:
 public:
   Slice line_slice (char const *pos_str0) const;
   string line_string (char const *pos_str0) const;
-  void get_counts (char const *pos_str0, int *, int *, int *) const;
-  
+  void get_counts (char const *pos_str0, int *, int *, int *, int *) const;
+
   SCM get_port () const;
   string name_;
 
@@ -63,7 +73,7 @@ protected:
   int line_offset_;
 };
 
-vector<char> gulp_file (string fn, int desired);
+vector<char> gulp_file (const string &fn, int desired);
 
 #endif /* SOURCE_FILE_HH */