X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftype-swallow-translator.cc;h=7e6c04e3814736f2c0b7f76df28689e682ea187a;hb=1eb080d3e3acfe927eb163abb8c5ca6e08b43769;hp=47c40fe0eb97ae3881b4930357a33bc69db9d1fd;hpb=17a0be44b562c72ccfebf2bef4a7a6fcc07bd02f;p=lilypond.git

diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc
index 47c40fe0eb..7e6c04e381 100644
--- a/lily/type-swallow-translator.cc
+++ b/lily/type-swallow-translator.cc
@@ -9,7 +9,9 @@
 #include "translator.hh"
 #include "music.hh"
 
-class Skip_event_swallow_translator : public virtual Translator
+#include "translator.icc"
+
+class Skip_event_swallow_translator : public Translator
 {
 protected:
   virtual bool try_music (Music *) { return true; }
@@ -18,7 +20,7 @@ public:
   TRANSLATOR_DECLARATIONS (Skip_event_swallow_translator);
 };
 
-class Rest_swallow_translator : public virtual Translator
+class Rest_swallow_translator : public Translator
 {
 protected:
   virtual bool try_music (Music *) { return true; }
@@ -27,14 +29,15 @@ public:
   TRANSLATOR_DECLARATIONS (Rest_swallow_translator);
 };
 
-Skip_event_swallow_translator::Skip_event_swallow_translator (){}
+Skip_event_swallow_translator::Skip_event_swallow_translator ()
+{
+}
 
 ADD_TRANSLATOR (Skip_event_swallow_translator,
 		"Swallow \\skip.",
 		"",
 		"skip-event",
 		"",
-		"",
 		"");
 
 Rest_swallow_translator::Rest_swallow_translator (){}
@@ -44,11 +47,9 @@ ADD_TRANSLATOR (Rest_swallow_translator,
 		"",
 		"rest-event",
 		"",
-		"",
-
 		"");
 
-class Note_swallow_translator : public virtual Translator
+class Note_swallow_translator : public Translator
 {
 protected:
   virtual bool try_music (Music *) { return true; }
@@ -57,13 +58,15 @@ public:
   TRANSLATOR_DECLARATIONS (Note_swallow_translator);
 };
 
-Note_swallow_translator::Note_swallow_translator (){}
+Note_swallow_translator::Note_swallow_translator ()
+{
+}
 
 ADD_TRANSLATOR (Note_swallow_translator,
 		"Swallow notes",
 		"",
 		"note-event",
 		"",
-		"",
+
 		"");