Run `make grand-replace'.

[lilypond.git] / lily / include / accidental-placement.hh

diff --git a/lily/include/accidental-placement.hh b/lily/include/accidental-placement.hh
index 90f052add93c5b3e258a9fd6b6f489f77402d2d7..3147e0d19bcbe663afb2ccc17fe776fe93f8133b 100644 (file)
--- a/lily/include/accidental-placement.hh
+++ b/lily/include/accidental-placement.hh
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ACCIDENTAL_PLACEMENT_HH
 #define ACCIDENTAL_PLACEMENT_HH
 
-#include "grob.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
 class Accidental_placement
 {
@@ -17,15 +18,13 @@ public:
   DECLARE_SCHEME_CALLBACK (alignment_callback, (SCM element));
   static void add_accidental (Grob *, Grob *);
 
-  static Interval get_relevant_accidental_extent (Grob *me,
-                                                 Item *item_col,
-                                                 Grob *acc);
+  static vector<Grob*> get_relevant_accidentals (vector<Grob*> const &elts, Grob *left);
   static void split_accidentals (Grob *accs,
-                                Link_array<Grob> *break_reminder,
-                                Link_array<Grob> *real_acc);
+                                vector<Grob*> *break_reminder,
+                                vector<Grob*> *real_acc);
 
   DECLARE_SCHEME_CALLBACK(calc_positioning_done, (SCM));
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
 };
 #endif /* ACCIDENTAL_PLACEMENT_HH */