X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftype-swallow-translator.hh;h=637c68878b15126f75357f6bc781e11c5132a6b9;hb=a69eb3b3dfed77344ffd4d54580fa8985c27568e;hp=410169bff6a40db8408fbd7f18bc820aade17400;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git diff --git a/lily/include/type-swallow-translator.hh b/lily/include/type-swallow-translator.hh index 410169bff6..637c68878b 100644 --- a/lily/include/type-swallow-translator.hh +++ b/lily/include/type-swallow-translator.hh @@ -3,38 +3,39 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ - #ifndef TYPESWALLOW_GRAV_HH #define TYPESWALLOW_GRAV_HH #include "translator.hh" /** eat a certain type of event - (Duh, it's good for your skin) - */ -class Type_swallow_translator : public virtual Translator + (Duh, it's good for your skin) +*/ +class Type_swallow_translator : public Translator { protected: - String swallow_string_; - bool try_music (Music*); -public: + string swallow_string_; + bool try_music (Music *); +public: VIRTUAL_COPY_CONS (Translator); }; #define DECLARE_EVENT_SWALLOWER(TYPE) \ -struct TYPE ## _swallow_translator : public Type_swallow_translator { \ - TRANSLATOR_DECLARATIONS (TYPE ## _swallow_translator); \ -}; \ - TYPE ## _swallow_translator :: TYPE ## _swallow_translator() {\ - swallow_string_ = #TYPE; \ + struct TYPE ## _swallow_translator : public Type_swallow_translator \ + { \ + TRANSLATOR_DECLARATIONS (TYPE ## _swallow_translator); \ + }; \ + TYPE ## _swallow_translator ::TYPE ## _swallow_translator () \ + { \ + swallow_string_ = #TYPE; \ } \ -ADD_TRANSLATOR(TYPE ## _swallow_translator, \ - "Swallow events of " #TYPE " type.", \ + ADD_TRANSLATOR (TYPE ## _swallow_translator, \ + "Swallow events of " #TYPE " type.", \ "", \ - "general-music",\ + "general-music", \ "", \ "", \ "");