Merge remote-tracking branch 'origin/translation' into staging

[lilypond.git] / lily / include / lily-proto.hh

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index 86b76c5c58a805b1595b7420c02f9b59fdfd94e1..83a71ab67273d4c0b3f7ef1953d24aa9b62c1254 100644 (file)
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.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--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
@@ -24,6 +24,7 @@
 
 class All_font_metrics;
 class Audio_column;
+class Audio_control_function_value_change;
 class Audio_dynamic;
 class Audio_element;
 class Audio_instrument;
@@ -80,7 +81,6 @@ class Grace_music;
 class Grob;
 class Grob_array;
 class Grob_info;
-class Hara_kiri_engraver;
 class Hara_kiri_line_group_engraver;
 class Includable_lexer;
 class Input;
@@ -105,6 +105,7 @@ class Lyric_performer;
 class Lyric_phrasing_engraver;
 class Mensural_ligature_engraver;
 class Midi_chunk;
+class Midi_control_function_value_change;
 class Midi_duration;
 class Midi_dynamic;
 class Midi_event;
@@ -151,6 +152,7 @@ class Property_iterator;
 class Rational;
 class Relative_octave_music;
 class Repeated_music;
+class Rhythmic_music_iterator;
 class Scale;
 class Scheme_hash_table;
 class Scheme_engraver;
@@ -198,8 +200,7 @@ class Translator_group;
 class Transposed_music;
 class yyFlexLexer;
 
-typedef void (*Engraver_void_function_engraver_grob_info) (Engraver *,
-                                                           Grob_info);
-typedef void (*Translator_void_method_ptr) (Translator *);
+typedef void (Engraver::*Engraver_void_function_engraver_grob_info) (Grob_info);
+typedef void (Translator::*Translator_void_method_ptr) ();
 
 #endif /* LILY_PROTO_HH */