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 3dd0825b27047b310b923bf66105f1f4442f5d56..f574b39c3f25c0ecb69523bbce3bef8437d28742 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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--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
@@ -22,6 +22,7 @@
 
 #include "flower-proto.hh"
 
+class Acknowledge_information;
 class All_font_metrics;
 class Audio_column;
 class Audio_control_function_value_change;
@@ -85,7 +86,6 @@ class Ligature_engraver;
 class Lily_lexer;
 class Lily_parser;
 class Listener;
-class Lookup;
 class Lyric_combine_music;
 class Lyric_combine_music_iterator;
 class Lyric_engraver;
@@ -140,6 +140,8 @@ class Rhythmic_music_iterator;
 class Scale;
 class Scheme_hash_table;
 class Scheme_engraver;
+class Scm_module;
+class Scm_variable;
 class Score;
 class Score_engraver;
 class Score_performer;
@@ -172,7 +174,4 @@ class Timing_translator;
 class Translator;
 class Translator_group;
 
-typedef void (Engraver::*Engraver_void_function_engraver_grob_info) (Grob_info);
-typedef void (Translator::*Translator_void_method_ptr) ();
-
 #endif /* LILY_PROTO_HH */