Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / include / horizontal-bracket.hh

diff --git a/lily/include/horizontal-bracket.hh b/lily/include/horizontal-bracket.hh
index 79925bc9345acb9180939261f3d1aa9d55b1ec4e..d8cbef6c067ab225af1ee61a1141251e43d8868e 100644 (file)
--- a/lily/include/horizontal-bracket.hh
+++ b/lily/include/horizontal-bracket.hh
@@ -9,17 +9,18 @@
 #ifndef HORIZONTAL_BRACKET_HH
 #define HORIZONTAL_BRACKET_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
+#include "std-vector.hh"
+#include "grob-interface.hh"
 
 struct Horizontal_bracket
 {
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   static Stencil make_bracket (Grob *, Real, Axis, Direction);
   static Stencil make_enclosing_bracket (Grob *me, Grob *refpoint,
-                                        Link_array__Grob_ grobs,
+                                        vector<Grob*> grobs,
                                         Axis a, Direction dir);
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
 };
 
 #endif /* HORIZONTAL_BRACKET_HH */