patch::: 1.3.18.jcn3

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

diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh
index f8e3747b58cba51b4ae719f56dd7751e6980a426..ac80432208ce0c00ba959700ac60b81963407510 100644 (file)
--- a/lily/include/key-item.hh
+++ b/lily/include/key-item.hh
@@ -1,7 +1,7 @@
 /*
   key-item.hh -- part of GNU LilyPond
 
-  (c) 1996--1998 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef KEYITEM_HH
@@ -12,37 +12,31 @@
 
 
 /// An item which places accidentals at the start of the line
-struct Key_item : Item {
+class Key_item :public  Item
+{
   Array<int> pitch_arr_;
   Array<int> acc_arr_;
   Array<int> old_pitch_arr_;
   Array<int> old_acc_arr_;
+  int c0_position_;
 
-  // ugh.  Naming 
-  int c_position;
-  // see above.
-  int c0_position;
-  bool default_b_;
-  bool multi_octave_b_;
+
+public:
+  bool multi_octave_b_;  
+
+  int get_c_position () const;
     
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  SCORE_ELEMENT_CLONE(Key_item);
+  
+  VIRTUAL_COPY_CONS(Score_element);
 
   Key_item ();
   void add (int pitch, int acc);
-  void add (const Musical_pitch&);
   void add_old (int pitch, int acc);
-  void add_old (const Musical_pitch&);
-  void set (bool multi_octave_b,
-           Array<Musical_pitch> const &idx_arr,
-           Array<Musical_pitch> const &old_idx_arr);
-
   void set_c_position (int);
-  int Key_item::calculate_position(int p, int a) const;
+  int calculate_position(int p, int a) const;
 
 protected:
-  virtual void do_pre_processing();
-  Molecule* brew_molecule_p() const;
+  virtual Molecule* do_brew_molecule_p() const;
 };
 
 #endif // KEYITEM_HH