* lily/include/midi-item.hh (class Midi_track): idem.

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

diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh
index b5eac587dbd84b7632a694e918b519ae51f75f30..b9f4e7c83dc5383b75da65d70f3bf37588f39473 100644 (file)
--- a/lily/include/accidental-interface.hh
+++ b/lily/include/accidental-interface.hh
@@ -3,12 +3,14 @@
 
   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"
@@ -18,10 +20,10 @@ class Accidental_interface
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
+  
   static bool has_interface (Grob *);
-
-  static String get_fontcharname (String style, int alteration);
-  static Array<Box> Accidental_interface::accurate_boxes (Grob *me,
+  static string get_fontcharname (string style, int alteration);
+  static vector<Box> accurate_boxes (Grob *me,
                                                          Grob **common);
 };