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

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

diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh
index eaba85657df2ba575b918d9424ba73fdd2f882ad..8fd57a5fd91f6a7b9eab3390c9a0811c80f2aa67 100644 (file)
--- a/lily/include/accidental-interface.hh
+++ b/lily/include/accidental-interface.hh
@@ -3,15 +3,17 @@
 
   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"
+#include "grob-interface.hh"
 
 class Accidental_interface
 {
@@ -19,9 +21,9 @@ 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,
+  DECLARE_GROB_INTERFACE();
+  static string get_fontcharname (string style, int alteration);
+  static vector<Box> accurate_boxes (Grob *me,
                                                          Grob **common);
 };