Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

[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 8b612f2a7eea84dd6ff5c00fd2dc47c85cd8eed2..7e798e043d3fc3d1adea1028347953ed182f332c 100644 (file)
--- a/lily/include/type-swallow-translator.hh
+++ b/lily/include/type-swallow-translator.hh
@@ -1,13 +1,13 @@
 /*
-  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--2009 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"
 
@@ -17,7 +17,7 @@
 class Type_swallow_translator : public Translator
 {
 protected:
-  String swallow_string_;
+  string swallow_string_;
   bool try_music (Music *);
 public:
   VIRTUAL_COPY_CONS (Translator);
@@ -40,5 +40,5 @@ public:
                  "",                                                   \
                  "");
 
-#endif // TYPESWALLOW_GRAV_HH
+#endif // TYPESWALLOW_TRANSLATOR_HH