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

[lilypond.git] / lily / include / staff-symbol-referencer.hh

diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index 5e1fd878fdd5128b3450321dabf0289d18d6e20b..e6d4ceeec5bad67f570099ab1431612e12a07181 100644 (file)
--- a/lily/include/staff-symbol-referencer.hh
+++ b/lily/include/staff-symbol-referencer.hh
@@ -9,7 +9,8 @@
 #ifndef STAFF_SYMBOL_REFERENCER_HH
 #define STAFF_SYMBOL_REFERENCER_HH
 
-#include "grob.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
 /**
    A notation object that needs access to variables of the staff (no
@@ -18,7 +19,7 @@
 class Staff_symbol_referencer
 {
 public:
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
   static bool ugly_hack (Grob *);
   static void set_position (Grob *, Real);
   DECLARE_SCHEME_CALLBACK (callback, (SCM element));
@@ -40,6 +41,7 @@ public:
   static int get_rounded_position (Grob *);
 };
 
-int compare_position (Grob *const &, Grob *const &);
+int compare_position (Grob *const &, Grob *const &);\
+bool position_less (Grob *const &, Grob *const &);
 #endif /* STAFF_SYMBOL_REFERENCER_HH */