X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore-column.hh;h=dfe944c5a589ccd7588959ddca8ff9ae24a29e37;hb=88d259d05cbd7ff6e077d58278a615fcedd844c7;hp=e82b51aa80069f47f8b34bdecec1f8a5e2356207;hpb=95de6911a5cd1f90dfcd72ec798f089f6522f50f;p=lilypond.git diff --git a/lily/include/score-column.hh b/lily/include/score-column.hh index e82b51aa80..dfe944c5a5 100644 --- a/lily/include/score-column.hh +++ b/lily/include/score-column.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--1998 Han-Wen Nienhuys */ @@ -11,7 +11,7 @@ #define SCORE_COLUMN_HH #include "lily-proto.hh" -#include "varray.hh" +#include "array.hh" #include "moment.hh" #include "p-col.hh" @@ -36,11 +36,10 @@ class Score_column : public Paper_column { public: int break_penalty_i () { return break_penalty_i_; } DECLARE_MY_RUNTIME_TYPEINFO; - SCORE_ELEM_CLONE(Score_column); + SCORE_ELEMENT_CLONE(Score_column); /// length of notes/rests in this column Array durations; - /* *************** */ Moment when() { return when_; } Score_column (Moment when); @@ -48,8 +47,6 @@ public: void preprocess(); bool musical_b() { return musical_b_; } void do_print() const; - - }; #endif // SCORE_COLUMN_HH