use classnames for interface naming; remove inclusion of

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

diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh
index ac9bbc488c65d8e27b708c776a3c418975c47d24..8362e84613307d369eb2a588d2d581b0c660f390 100644 (file)
--- a/lily/include/dot-column.hh
+++ b/lily/include/dot-column.hh
@@ -3,13 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef DOT_COLUMN_HH
 #define DOT_COLUMN_HH
 
 #include "lily-guile.hh"
+#include "grob-interface.hh"
+
 
 class Grob;
 
@@ -22,9 +24,8 @@ public:
   static int compare (Grob *const &, Grob *const &);
   static void add_head (Grob *dotcol, Grob *rh);
 
-  static bool has_interface (Grob *);
-  DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM, SCM));
-  DECLARE_SCHEME_CALLBACK (side_position, (SCM, SCM));
-  static SCM do_shifts (Grob *);
+  DECLARE_GROB_INTERFACE();
+  DECLARE_SCHEME_CALLBACK (side_position, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM));
 };
 #endif // DOT_COLUMN_HH