patch::: 1.1.27.jcn3: geen genade

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

diff --git a/lily/include/local-key-item.hh b/lily/include/local-key-item.hh
index 2d4ed66e8f74b64715a463497f116bae12abf742..3e8b531e0e07ca3da35e1b489aa4d8effe87ddeb 100644 (file)
--- a/lily/include/local-key-item.hh
+++ b/lily/include/local-key-item.hh
@@ -1,43 +1,39 @@
 /*
   local-key-item.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1998 Han-Wen Nienhuys
 */
 
 #ifndef LOCALKEYITEM_HH
 #define LOCALKEYITEM_HH
 #include "item.hh"
-#include "varray.hh"
-
-struct Local_acc {
-    int name_i_;
-    int accidental_i_;
-    int octave_i_;
-    static int compare(Local_acc&, Local_acc&);
-};
+#include "array.hh"
+#include "musical-pitch.hh"
 
 /**
   Accidentals which can be different for each octave.
 
   TODO:
   update item if Items are removed
- */
-struct Local_key_item : Item {
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Array<Local_acc> accs;
-    Link_array<Item> support_items_;
-    int c0_position;
 
-    /* *************** */
-    
-    Local_key_item(int c0position);
-    void add_support(Item*);
-    void add(int oct, int pitch, int acc);
-    void add(Melodic_req*);
+  TODO
+  
+  figure out private/public
+  
+ */
+class Local_key_item : public Item {
 public:
+    
+    Array<Musical_pitch> accidental_pitch_arr_;
+    Link_array<Item> support_items_;
+    int c0_position_i_;
+    Local_key_item ();
+    void add_support (Item*);
+    void add (Musical_pitch);
+protected:
     virtual void do_pre_processing();    
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
-    virtual Molecule* brew_molecule_p()const;
+    virtual void do_substitute_dependency (Score_element*,Score_element*);
+    virtual Molecule* do_brew_molecule_p() const;
 };
 #endif // LOCALKEYITEM_HH