X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftype-swallow-translator.hh;h=bc1cd21fe7dcdca3eb8d81c862ce851aab2b1b14;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=a97ab6ac06b9c92c72ac213577aa7b97b9b8a157;hpb=487ee28c2a58e7bd5cb9e85c7676057c0b32f385;p=lilypond.git

diff --git a/lily/include/type-swallow-translator.hh b/lily/include/type-swallow-translator.hh
index a97ab6ac06..bc1cd21fe7 100644
--- a/lily/include/type-swallow-translator.hh
+++ b/lily/include/type-swallow-translator.hh
@@ -1,43 +1,44 @@
 /*
-  type-swallow-engraver.hh -- declare Type_swallow_translator
+  type-swallow-translator.hh -- declare Type_swallow_translator
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
-#ifndef TYPESWALLOW_GRAV_HH
-#define TYPESWALLOW_GRAV_HH
+#ifndef TYPESWALLOW_TRANSLATOR_HH
+#define TYPESWALLOW_TRANSLATOR_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;						\
   }									\
-ENTER_DESCRIPTION(TYPE ## _swallow_translator,				\
-		  "Swallow events of " #TYPE " type.",		\
+  ADD_TRANSLATOR (TYPE ## _swallow_translator,				\
+		  "Swallow events of " #TYPE " type.",			\
 		  "",							\
-	"general-music",\
+		  "general-music",					\
 		  "",							\
 		  "",							\
 		  "");
 
-#endif // TYPESWALLOW_GRAV_HH
+#endif // TYPESWALLOW_TRANSLATOR_HH