X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faccidental-placement.hh;h=3147e0d19bcbe663afb2ccc17fe776fe93f8133b;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=27325ea6d8496d0fb8b7bed2fb83f09f5e5412cb;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/include/accidental-placement.hh b/lily/include/accidental-placement.hh
index 27325ea6d8..3147e0d19b 100644
--- 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--2006 Han-Wen Nienhuys <hanwen@xs4all.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 */