X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faccidental-interface.hh;h=b9f4e7c83dc5383b75da65d70f3bf37588f39473;hb=8347f6f06cd4c56d7a2d2ec482647afaaade1267;hp=236e177078629e39d6b20ed2b5645607ba3e75ba;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh
index 236e177078..b9f4e7c83d 100644
--- a/lily/include/accidental-interface.hh
+++ b/lily/include/accidental-interface.hh
@@ -1,30 +1,30 @@
-/*   
-accidental-interface.hh -- declare  Accidental_interface
+/*
+  accidental-interface.hh -- declare  Accidental_interface
 
-source file of the GNU LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-(c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef ACCIDENTAL_INTERFACE_HH
 #define ACCIDENTAL_INTERFACE_HH
 
+#include "std-vector.hh"
+
 #include "box.hh"
 #include "lily-guile.hh"
 #include "lily-proto.hh"
 
-
 class Accidental_interface
 {
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));  
-  static bool has_interface (Grob*);
+  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
   
-  static String get_fontcharname(String style, int alteration);
-  static Array<Box> Accidental_interface::accurate_boxes (Grob *me, Grob**common);
+  static bool has_interface (Grob *);
+  static string get_fontcharname (string style, int alteration);
+  static vector<Box> accurate_boxes (Grob *me,
+							  Grob **common);
 };
 
-
 #endif