Merge branch 'master' into dev/johngourlay/issue-4751

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

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index 22b989b6a631607bfcc73601ec0e2d9c65c934a4..ee3946e0fd02921167b4a3f57d142bee0a64d017 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
@@ -58,7 +58,6 @@ class Dot_column;
 class Dot_configuration;
 class Dot_formatting_problem;
 class Engraver;
-class Engraver;
 class Engraver_group;
 class Event;
 class Event_chord;
@@ -73,6 +72,7 @@ class Grace_music;
 class Grob;
 class Grob_array;
 class Grob_info;
+class Grob_properties;
 class Includable_lexer;
 class Input;
 class Item;
@@ -84,7 +84,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;
@@ -139,6 +138,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;
@@ -171,7 +172,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 */