Run grand replace for 2015.

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

diff --git a/lily/include/bar-line.hh b/lily/include/bar-line.hh
index a9b3ed90dabae1e10e3866ac1ee920f5019109de..1a157f3c447dad16f0c8230a4e0b3e6885f0c58c 100644 (file)
--- a/lily/include/bar-line.hh
+++ b/lily/include/bar-line.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2010 Han-Wen Nienhuys
+  Copyright (C) 1996--2015 Han-Wen Nienhuys
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef BAR_HH
-#define BAR_HH
+#ifndef BAR_LINE_HH
+#define BAR_LINE_HH
 
 #include "lily-proto.hh"
 #include "grob-interface.hh"
@@ -26,17 +26,8 @@
 class Bar_line
 {
 public:
-  DECLARE_GROB_INTERFACE();
-
-  static Stencil dashed_bar_line (Grob *me, Real h, Real thick);
-  static Stencil tick_bar_line (Grob *me, Real h, bool rounded);
-  static Stencil compound_barline (Grob *, string, Real height, bool rounded);
-  static Stencil simple_barline (Grob *, Real wid, Real height, bool rounded);
-  static Interval bar_y_extent (Grob *, Grob *);
-  DECLARE_SCHEME_CALLBACK (calc_bar_extent, (SCM));
-  DECLARE_SCHEME_CALLBACK (calc_bar_size, (SCM));
-  DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_SCHEME_CALLBACK (calc_anchor, (SCM));
-};
-#endif // BAR_HH
+  DECLARE_GROB_INTERFACE ();
 
+  static bool non_empty_barline (Grob *me);
+};
+#endif // BAR_LINE_HH