Please review. This is a necessary starting point to the optional<> brekage
john Index: insetcommand.C =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcommand.C,v retrieving revision 1.75 diff -u -p -r1.75 insetcommand.C --- insetcommand.C 26 May 2003 09:13:53 -0000 1.75 +++ insetcommand.C 30 May 2003 00:49:53 -0000 @@ -31,9 +31,10 @@ InsetCommand::InsetCommand(InsetCommandP {} -// InsetCommand::InsetCommand(InsetCommandParams const & p, bool) -// : p_(p.getCmdName(), p.getContents(), p.getOptions()) -// {} +InsetCommand::InsetCommand(InsetCommand const & ic) + p_(ic.p_) +{ +} void InsetCommand::setParams(InsetCommandParams const & p) Index: insetcommand.h =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcommand.h,v retrieving revision 1.63 diff -u -p -r1.63 insetcommand.h --- insetcommand.h 28 May 2003 23:09:14 -0000 1.63 +++ insetcommand.h 30 May 2003 00:49:54 -0000 @@ -33,6 +33,8 @@ public: explicit InsetCommand(InsetCommandParams const &); /// + InsetCommand(InsetCommand const &); + /// void write(Buffer const *, std::ostream & os) const { p_.write(os); } /// Index: insetfloatlist.h =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetfloatlist.h,v retrieving revision 1.22 diff -u -p -r1.22 insetfloatlist.h --- insetfloatlist.h 26 May 2003 09:13:53 -0000 1.22 +++ insetfloatlist.h 30 May 2003 00:49:55 -0000 @@ -30,10 +30,6 @@ public: return new InsetFloatList(getCmdName()); } /// - //Inset * clone(Buffer const &, bool = false) const { - // return new InsetFloatList(getCmdName()); - //} - /// dispatch_result localDispatch(FuncRequest const & cmd); /// string const getScreenLabel(Buffer const *) const; Index: insetref.C =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetref.C,v retrieving revision 1.65 diff -u -p -r1.65 insetref.C --- insetref.C 28 May 2003 16:36:54 -0000 1.65 +++ insetref.C 30 May 2003 00:49:59 -0000 @@ -28,9 +28,10 @@ InsetRef::InsetRef(InsetCommandParams co {} -// InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf, bool) -// : InsetCommand(p, false), isLatex(buf.isLatex()) -// {} +InsetRef::InsetRef(InsetRef const & ir) + : InsetCommand(ir), isLatex(ir.isLatex) +{ +} InsetRef::~InsetRef() Index: insetref.h =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetref.h,v retrieving revision 1.48 diff -u -p -r1.48 insetref.h --- insetref.h 28 May 2003 23:09:14 -0000 1.48 +++ insetref.h 30 May 2003 00:49:59 -0000 @@ -35,13 +35,15 @@ public: /// static string const & getName(int type); - /// + InsetRef(InsetCommandParams const &, Buffer const &); - /// + + InsetRef(InsetRef const &); + ~InsetRef(); /// - virtual Inset * clone(Buffer const & buffer) const { - return new InsetRef(params(), buffer); + virtual Inset * clone(Buffer const &) const { + return new InsetRef(*this); } /// dispatch_result localDispatch(FuncRequest const & cmd);