Merge branch 'master' into translation

[lilypond.git] / lily / include / tie.hh

diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index 7b74d159c85d046913685f41746ccd194dcb4441..e92ca6194704db6fcc29c19ec73ea5f8b6d7e1a2 100644 (file)
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -28,22 +28,18 @@ class Tie
 {
 public:
   static void set_head (Spanner *, Direction, Grob *head);
-  DECLARE_GROB_INTERFACE ();
   static Item *head (Spanner *, Direction);
   static int get_column_rank (Spanner *, Direction);
   static int get_position (Spanner *);
-  static int get_position_generic (Grob *);
-  static Direction get_default_dir (Grob *);
+  static Direction get_default_dir (Spanner *);
   static SCM get_control_points (Grob *, Grob *,
                                  Tie_configuration const &,
                                  Tie_details const &);
   static SCM get_default_control_points (Spanner *);
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
-  static bool less (Grob *const &s1,
-                    Grob *const &s2);
+  static bool less (Grob *s1, Grob *s2);
 };
 
 #endif // TIE_HH