* lily/include/midi-item.hh (class Midi_track): idem.

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

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index ccbd17722683c104fecef15b75170c0bf145c498..9bb315e097dcefd279bb53eb47dfcaa16fb25705 100644 (file)
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.hh
@@ -8,6 +8,7 @@
 
 #ifndef LILY_PROTO_HH
 #define LILY_PROTO_HH
+
 #include "flower-proto.hh"
 
 class All_font_metrics;
@@ -115,7 +116,6 @@ class Object_key_dumper;
 class Object_key_undumper;
 class Open_type_font;
 class Output_property;
-class Page;
 class Pango_font;
 class Paper_book;
 class Paper_column;
@@ -127,6 +127,7 @@ class Performer_group;
 class Piano_bar_engraver;
 class Pitch;
 class Pitch_squash_engraver;
+class Prob;
 class Property_iterator;
 class Rational;
 class Relative_octave_music;
@@ -177,53 +178,4 @@ class yyFlexLexer;
 typedef void (*Engraver_void_function_engraver_grob_info) (Engraver *, Grob_info);
 typedef void (*Translator_void_method_ptr) (Translator *);
 
-
-/* FIXME: when Link_array is dropped, do grand s/r to vector<TYPE*>.  */
-#if STD_VECTOR
-
-// FIXME: does not work with sourc-file.cc
-// #define Link_array__char_ std::vector<char*>
-
-#define Link_array__char_ Link_array<char>
-#define Link_array__Grob_ std::vector<Grob*>
-#define Link_array__Accidental_placement_entry_ std::vector<Accidental_placement_entry*>
-#define Link_array__Audio_item_ std::vector<Audio_item*>
-#define Link_array__Audio_note_ std::vector<Audio_note*>
-#define Link_array__Audio_piano_pedal_ std::vector<Audio_piano_pedal*>
-#define Link_array__Audio_staff_ std::vector<Audio_staff*>
-#define Link_array__Bracket_nesting_node_ std::vector<Bracket_nesting_node*>
-#define Link_array__Context_ std::vector<Context*>
-#define Link_array__Context_def_ std::vector<Context_def*>
-#define Link_array__Grob_ std::vector<Grob*>
-#define Link_array__Item_ std::vector<Item*>
-#define Link_array__Music_ std::vector<Music*>
-#define Link_array__Note_column_ std::vector<Note_column*>
-#define Link_array__Output_def_ std::vector<Output_def*>
-#define Link_array__Slur_configuration_ std::vector<Slur_configuration*>
-#define Link_array__Source_file_ std::vector<Source_file*>
-#define Link_array__Spanner_ std::vector<Spanner*>
-#define Link_array__Tie_configuration_ std::vector<Tie_configuration*>
-#else /* !STD_VECTOR */
-#define Link_array__char_ Link_array<char>
-#define Link_array__Grob_ Link_array<Grob>
-#define Link_array__Accidental_placement_entry_ Link_array<Accidental_placement_entry>
-#define Link_array__Audio_item_ Link_array<Audio_item>
-#define Link_array__Audio_note_ Link_array<Audio_note>
-#define Link_array__Audio_piano_pedal_ Link_array<Audio_piano_pedal>
-#define Link_array__Audio_staff_ Link_array<Audio_staff>
-#define Link_array__Bracket_nesting_node_ Link_array<Bracket_nesting_node>
-#define Link_array__Context_ Link_array<Context>
-#define Link_array__Context_def_ Link_array<Context_def>
-#define Link_array__Grob_ Link_array<Grob>
-#define Link_array__Item_ Link_array<Item>
-#define Link_array__Music_ Link_array<Music>
-#define Link_array__Note_column_ Link_array<Note_column>
-#define Link_array__Output_def_ Link_array<Output_def>
-#define Link_array__Slur_configuration_ Link_array<Slur_configuration>
-#define Link_array__Source_file_ Link_array<Source_file>
-#define Link_array__Spanner_ Link_array<Spanner>
-#define Link_array__Tie_configuration_ Link_array<Tie_configuration>
-#endif /* !STD_VECTOR */
-
-
 #endif /* LILY_PROTO_HH */