lilypond-0.0.22

diff --git a/hdr/beam.hh b/hdr/beam.hh
index 2fd78100c35d52a612669ca96f3b059f5e8e24ae..912f47dc72005f28867a1b2181b45825e064a294 100644 (file)
--- a/hdr/beam.hh
+++ b/hdr/beam.hh
@@ -17,9 +17,6 @@ struct Beam:  public Directional_spanner {
     Real left_pos;
     /// dir: -1 below heads, +1 above heads.
 
-
-    Rhythmic_grouping *group;
-
     /****************/
     
     virtual Interval width()const;    

diff --git a/hdr/pcol.hh b/hdr/pcol.hh
index 7da7c02cb262519a147362efc03b53057834f089..a0f2a87624b76fb2008d7845ccb044f44477c0ac 100644 (file)
--- a/hdr/pcol.hh
+++ b/hdr/pcol.hh
@@ -13,32 +13,33 @@ struct PCol {
     
 
     /// prebreak is put before end of line.
-    PCol *prebreak;
+    PCol *prebreak_p_;
     /**
     if broken here, then (*this) column is discarded, and prebreak
     is put at end of line, owned by Col
     */
 
     /// postbreak at beginning of the new line
-    PCol *postbreak;
+    PCol *postbreak_p_;
     /**  \See{prebreak}
     */
     
-    PCol *daddy;
+    PCol *daddy_l_;
     /** if this column is pre or postbreak, then this field points to
      the parent.  */
     
     /// if lines are broken then this column is in #line#
-    const Line_of_score *line;
+    const Line_of_score *line_l_;
 
     /// if lines are broken then this column x-coord #hpos#
     Real hpos;
 
-    PScore * pscore_;
+    PScore * pscore_l_;
 
     /****************/
     /// which  one (left =0)
     int rank() const;
+
     /// does this column have items, does it have spacings attached?
     bool used() const;
     
@@ -62,6 +63,8 @@ struct PCol {
     void OK() const;
     void set_breakable();
     void print()const;
+private:
+    PCol(PCol const&){}
 };
 /**
     This is a class to address items vertically. It contains the data for:

diff --git a/hdr/pstaff.hh b/hdr/pstaff.hh
index 6d0bdcf34191dd0d03ec4beb7a16ae73b4f3ab45..78a68fb306a29542d087be3574992b1f180f30a2 100644 (file)
--- a/hdr/pstaff.hh
+++ b/hdr/pstaff.hh
@@ -7,8 +7,8 @@
 
 /// items grouped horizontally
 struct PStaff {
-    Molecule * stafsym;
-    PScore * pscore_;
+    Molecule * stafsym_p_;
+    PScore * pscore_l_;
     
     
     PointerList<const Spanner*> spans;
@@ -19,6 +19,8 @@ struct PStaff {
     void add(Item*i);
     PStaff(PScore*);
     virtual ~PStaff();
+private:
+    PStaff(PStaff const&);
 };
 
 #endif