From: fred Date: Sun, 24 Mar 2002 19:27:39 +0000 (+0000) Subject: lilypond-0.0.22 X-Git-Tag: release/1.5.59~5625 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7c7c7944ebd9b91c9594e75e915a221ce379d465;p=lilypond.git lilypond-0.0.22 --- diff --git a/hdr/identparent.hh b/hdr/identparent.hh index 653158da4d..f4e1705d41 100644 --- a/hdr/identparent.hh +++ b/hdr/identparent.hh @@ -28,6 +28,8 @@ struct Identifier { IDACCESSOR(Music_general_chord, mchord) IDACCESSOR(Lookup,lookup) IDACCESSOR(Notename_tab, notename_tab) +private: + Identifier(Identifier const&){} }; #endif // IDENTPARENT_HH diff --git a/hdr/paper.hh b/hdr/paper.hh index 34c6ce3e20..6da51df33e 100644 --- a/hdr/paper.hh +++ b/hdr/paper.hh @@ -5,7 +5,7 @@ /// symbols, dimensions and constants struct Paperdef { - Lookup *lookup_; + Lookup *lookup_p_; String outfile; Real linewidth; @@ -21,6 +21,7 @@ struct Paperdef { Paperdef(Lookup*); void set(Lookup*); ~Paperdef(); + Paperdef(Paperdef const&); Real interline()const; Real internote()const; Real rule_thickness()const; diff --git a/hdr/swalker.hh b/hdr/swalker.hh index 0d66a55fb4..046ded590e 100644 --- a/hdr/swalker.hh +++ b/hdr/swalker.hh @@ -30,6 +30,8 @@ struct Staff_walker : public PCursor { virtual void process_requests()=0; virtual void do_TYPESET_command(Command*)=0; virtual void do_INTERPRET_command(Command*)=0 ; +private: + Staff_walker(Staff_walker const&); }; /** manage run-time info when walking staffcolumns such as: key, diff --git a/hdr/tstream.hh b/hdr/tstream.hh index 9474dd69a8..e75d27a4b3 100644 --- a/hdr/tstream.hh +++ b/hdr/tstream.hh @@ -18,6 +18,8 @@ struct Tex_stream { /// close the file ~Tex_stream(); +private: + Tex_stream(Tex_stream const&); }; /** Use this class for writing to a TeX file. diff --git a/src/swalker.cc b/src/swalker.cc index 9e4f1d3ff6..34afa0ee40 100644 --- a/src/swalker.cc +++ b/src/swalker.cc @@ -4,6 +4,11 @@ #include "sccol.hh" Staff_walker::~Staff_walker() {} +Staff_walker::Staff_walker(Staff_walker const &s) + :PCursor (s) +{ + assert(false); +} Staff_walker::Staff_walker(Staff * s, PScore*ps ) : PCursor (s->cols) @@ -23,8 +28,8 @@ void Staff_walker::process() { break_status = BREAK_END - BREAK_PRE; - if (ptr()->s_commands) - for (iter_top(*ptr()->s_commands,i); i.ok(); i++) { + if (ptr()->staff_commands_p_) + for (iter_top(*ptr()->staff_commands_p_,i); i.ok(); i++) { process_command(i); } @@ -40,7 +45,7 @@ Staff_walker::process_command(Command*com) case BREAK_MIDDLE: case BREAK_POST: case BREAK_END: - (*this)->score_column->set_breakable(); + (*this)->score_column_l_->set_breakable(); break_status = com->code- BREAK_PRE; break; case INTERPRET: