uniformize grob interface naming with C++.

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

diff --git a/lily/include/bar-line.hh b/lily/include/bar-line.hh
index fc613da48b1584a3a0a51ee9edd73652ef8e453e..39253a7b8d39c020063ddd3c3af2f768b4a64dab 100644 (file)
--- a/lily/include/bar-line.hh
+++ b/lily/include/bar-line.hh
@@ -1,7 +1,7 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--2005 Han-Wen Nienhuys
+  (c) 1996--2006 Han-Wen Nienhuys
 */
 
 #ifndef BAR_HH
@@ -18,11 +18,11 @@ class Bar_line
 public:
   static bool has_interface (Grob *);
 
-  static Stencil compound_barline (Grob *, String, Real height, bool rounded);
+  static Stencil dashed_bar_line (Grob *me, Real h, Real thick);
+  static Stencil compound_barline (Grob *, string, Real height, bool rounded);
   static Stencil simple_barline (Grob *, Real wid, Real height, bool rounded);
-  DECLARE_SCHEME_CALLBACK (get_staff_bar_size, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_bar_size, (SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
 };
 #endif // BAR_HH