X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fidentifier.hh;h=6312582bf0d923f13096559b92b7cb2c928b24c6;hb=813f755b266e091c9a9e66d09c45810aa1e060b7;hp=1aa7f7d0c4982c12ea3feec1387c78d2532a49ae;hpb=daee8243ff1c66bc714455a2d265ab02f03546ec;p=lilypond.git diff --git a/lily/include/identifier.hh b/lily/include/identifier.hh index 1aa7f7d0c4..6312582bf0 100644 --- a/lily/include/identifier.hh +++ b/lily/include/identifier.hh @@ -7,18 +7,19 @@ #ifndef IDENTIFIER_HH #define IDENTIFIER_HH + #include "identparent.hh" #include "symtable.hh" #include "input-staff.hh" #include "input-music.hh" -#include "notename.hh" #include "lookup.hh" #include "script-def.hh" +#include "request.hh" #define make_id_class(Idclass, Class, accessor) \ struct Idclass : Identifier {\ virtual const char *classname() { return #Class; }\ - Idclass(String s, Class*st):Identifier(s) { data = st; }\ + Idclass(String s, Class*st, int code):Identifier(s,code) { data = st; }\ virtual Class* accessor(bool copy) {\ if (copy)\ return new Class(* (Class*) data);\ @@ -36,7 +37,7 @@ make_id_class(Symtables_id, Symtables, symtables); make_id_class(Staff_id, Input_staff, staff); make_id_class(M_chord_id, Music_general_chord, mchord); make_id_class(M_voice_id, Music_voice, mvoice); -make_id_class(Notetab_id, Notename_tab, notename_tab); +make_id_class(Request_id, Request, request); #endif // IDENTIFIER_HH