Run `make grand-replace'.

[lilypond.git] / lily / include / type-swallow-translator.hh

diff --git a/lily/include/type-swallow-translator.hh b/lily/include/type-swallow-translator.hh
index 410169bff6a40db8408fbd7f18bc820aade17400..bc1cd21fe7dcdca3eb8d81c862ce851aab2b1b14 100644 (file)
--- 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--2005 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;                                           \
   }                                                                    \
-ADD_TRANSLATOR(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