Run `make grand-replace'.

[lilypond.git] / lily / include / bar.hh

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 27fbe484a607443f7db1d642e4c589ec3835f5e9..85d6d016e52e5e53f78e612652ef89a80a305fb2 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,14 +1,14 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--2006 Han-Wen Nienhuys
+  (c) 1996--2008 Han-Wen Nienhuys
 */
 
 #ifndef BAR_HH
 #define BAR_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
+#include "grob-interface.hh"
 
 /**
    A vertical bar.
@@ -16,9 +16,9 @@
 class Bar
 {
 public:
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
 
-  static Stencil compound_barline (Grob *, std::string, Real height);
+  static Stencil compound_barline (Grob *, string, Real height);
   static Stencil simple_barline (Grob *, Real wid, Real height);
   DECLARE_SCHEME_CALLBACK (get_staff_bar_size, (SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));