Merge branch 'master' into translation

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

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index d9ede2a7657805c9a17c985ef7f59d9ac6e62ac3..53e863c2a9e9f9d32a3a8137dad8631c28448450 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 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
@@ -42,6 +42,9 @@ class Axis_group_engraver;
 class Bar_engraver;
 class Bar_req_collect_engraver;
 class Beaming_pattern;
+class Beam_scoring_problem;
+class Beam_configuration;
+class Beam_quant_parameters;
 class Bezier;
 class Bezier_bow;
 class Book;
@@ -54,6 +57,7 @@ class Cluster_engraver;
 class Column_x_positions;
 class Context;
 class Context_def;
+class Context_mod;
 class Context_specced_music;
 class Dispatcher;
 class Dot_column;
@@ -76,7 +80,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;
@@ -128,9 +131,6 @@ class Music_wrapper;
 class Music_wrapper_iterator;
 class Note_performer;
 class Output_def;
-class Object_key;
-class Object_key_dumper;
-class Object_key_undumper;
 class Open_type_font;
 class Output_property;
 class Page_breaking;
@@ -150,6 +150,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;
@@ -197,7 +198,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 */