Run grand replace for 2015.

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

diff --git a/lily/include/context.hh b/lily/include/context.hh
index ab406c9041623d48e88b9aa8a9b9d24aac1a3122..dc13314277be9541b4f9ceac41084edbc00b7cf5 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--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
@@ -31,13 +31,13 @@
 class Context : public Smob<Context>
 {
 public:
-  static SCM mark_smob (SCM);
-  static int print_smob (SCM, SCM, scm_print_state *);
+  SCM mark_smob ();
+  int print_smob (SCM, scm_print_state *);
   static const char type_p_name_[];
   virtual ~Context ();
 private:
   Scheme_hash_table *properties_dict () const;
-  Context (Context const &src);
+  Context (Context const &src); // Do not define!  Not copyable!
 
   DECLARE_CLASSNAME (Context);
   void terminate ();
@@ -149,7 +149,7 @@ Context *find_context_below (Context *where,
 bool melisma_busy (Context *);
 
 Context *get_voice_to_lyrics (Context *lyrics);
-Grob *get_current_note_head (Context *voice, bool include_grace_notes);
+Grob *get_current_note_head (Context *voice);
 Grob *get_current_rest (Context *voice);
 
 Moment measure_position (Context const *context);