release: 1.3.94

[lilypond.git] / lily / include / key-item.hh

diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh
index 756a2b013988a96ebfd95a408ead2dce78511e54..706f65530fd915a26d922493c9bd5473b44ecc83 100644 (file)
--- a/lily/include/key-item.hh
+++ b/lily/include/key-item.hh
@@ -7,9 +7,8 @@
 #ifndef KEYITEM_HH
 #define KEYITEM_HH
 
-#include "item.hh"
-#include "array.hh"
-
+#include "lily-guile.hh"
+#include "lily-proto.hh"
 
 /**
   A group of  accidentals.
@@ -22,18 +21,12 @@
 
   new-accidentals -- list of (pitch, accidental) pairs
  */
-class Key_item :public  Item
+struct Key_item
 {
-  int calculate_position(SCM pair) const;
-
-public:
-  VIRTUAL_COPY_CONS(Score_element);
-  Key_item (SCM);
-  static SCM brew_molecule (SCM);
-  
-
-
-  SCM member_brew_molecule() const;
+  static int calculate_position(Score_element*,SCM pair) ;
+  static void set_interface (Score_element*);
+  static bool has_interface (Score_element*);
+  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM ));
 };
 
 #endif // KEYITEM_HH