Imported Upstream version 2.19.45

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

diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index 9e24099cdce13a17730dc636ad39922854166b08..e92ca6194704db6fcc29c19ec73ea5f8b6d7e1a2 100644 (file)
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -27,22 +27,19 @@
 class Tie
 {
 public:
-  static void set_head (Grob *, Direction, Grob *head);
-  DECLARE_GROB_INTERFACE ();
-  static Grob *head (Grob *, Direction);
-  static int get_column_rank (Grob *, Direction);
-  static int get_position (Grob *);
-  static Direction get_default_dir (Grob *);
+  static void set_head (Spanner *, Direction, Grob *head);
+  static Item *head (Spanner *, Direction);
+  static int get_column_rank (Spanner *, Direction);
+  static int get_position (Spanner *);
+  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 (Grob *);
+  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