Merge with master

[lilypond.git] / lily / include / note-column.hh

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index ec12414539031d490301ca5f327b37a0d433085e..60c2668890eef9f07aa3ea50a68484295f298042 100644 (file)
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -3,13 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef NOTE_COLUMN_HH
 #define NOTE_COLUMN_HH
 
-#include "item.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
+
 
 /** a struct for treating a group of noteheads (noteheads, stem
     (chord) and scripts) as a single entity.
@@ -32,7 +34,7 @@ public:
   static void set_dotcol (Grob *me, Grob *);
   static void add_head (Grob *me, Grob *);
   static bool has_rests (Grob *me);
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
 
   static Item *get_stem (Grob *);
 };