From 46e5fe4a67e6645e0cb6a74c47c6036efc6625de Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Mon, 26 May 2003 09:13:55 +0000 Subject: [PATCH] get rid of same_id from function signatures git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7044 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 4 + src/insets/ChangeLog | 4 + src/insets/inset.C | 20 +++-- src/insets/inset.h | 8 +- src/insets/insetbibitem.C | 10 ++- src/insets/insetbibitem.h | 4 +- src/insets/insetbibtex.C | 7 +- src/insets/insetbibtex.h | 12 ++- src/insets/insetcite.C | 7 +- src/insets/insetcite.h | 12 ++- src/insets/insetcollapsable.C | 21 ++++- src/insets/insetcollapsable.h | 10 ++- src/insets/insetcommand.C | 9 ++- src/insets/insetcommand.h | 5 +- src/insets/insetenv.C | 19 ++++- src/insets/insetenv.h | 8 +- src/insets/inseterror.C | 7 +- src/insets/inseterror.h | 13 +++- src/insets/insetert.C | 21 ++++- src/insets/insetert.h | 8 +- src/insets/insetexternal.C | 15 +++- src/insets/insetexternal.h | 6 +- src/insets/insetfloat.C | 19 ++++- src/insets/insetfloat.h | 12 ++- src/insets/insetfloatlist.h | 6 +- src/insets/insetfoot.C | 22 +++++- src/insets/insetfoot.h | 8 +- src/insets/insetfootlike.C | 15 +++- src/insets/insetfootlike.h | 4 +- src/insets/insetgraphics.C | 28 +++++-- src/insets/insetgraphics.h | 10 ++- src/insets/insethfill.h | 6 +- src/insets/insetinclude.C | 15 +++- src/insets/insetinclude.h | 6 +- src/insets/insetindex.C | 16 +++- src/insets/insetindex.h | 24 ++++-- src/insets/insetlabel.C | 7 +- src/insets/insetlabel.h | 12 ++- src/insets/insetlatexaccent.C | 8 +- src/insets/insetlatexaccent.h | 4 +- src/insets/insetmarginal.C | 22 +++++- src/insets/insetmarginal.h | 8 +- src/insets/insetminipage.C | 23 ++++-- src/insets/insetminipage.h | 10 ++- src/insets/insetnewline.h | 7 +- src/insets/insetnote.C | 21 ++++- src/insets/insetnote.h | 8 +- src/insets/insetoptarg.C | 24 +++++- src/insets/insetoptarg.h | 7 +- src/insets/insetparent.C | 10 ++- src/insets/insetparent.h | 12 ++- src/insets/insetquotes.C | 12 ++- src/insets/insetquotes.h | 4 +- src/insets/insetref.C | 11 ++- src/insets/insetref.h | 12 ++- src/insets/insetspace.C | 8 +- src/insets/insetspace.h | 4 +- src/insets/insetspecialchar.C | 8 +- src/insets/insetspecialchar.h | 4 +- src/insets/insettabular.C | 37 +++++++-- src/insets/insettabular.h | 8 +- src/insets/insettext.C | 140 +++++++++++++++++++++++++--------- src/insets/insettext.h | 17 ++++- src/insets/insettheorem.h | 4 +- src/insets/insettoc.C | 9 ++- src/insets/insettoc.h | 12 ++- src/insets/inseturl.C | 7 +- src/insets/inseturl.h | 13 +++- src/insets/insetwrap.C | 21 +++-- src/insets/insetwrap.h | 12 ++- src/insets/updatableinset.C | 9 ++- src/insets/updatableinset.h | 6 +- src/mathed/ChangeLog | 27 ++++--- src/mathed/formula.C | 11 ++- src/mathed/formula.h | 4 +- src/mathed/formulabase.h | 4 +- src/mathed/formulamacro.C | 8 +- src/mathed/formulamacro.h | 4 +- src/paragraph.C | 2 +- src/tabular.C | 63 +++++++++++---- src/tabular.h | 11 ++- 81 files changed, 844 insertions(+), 252 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 48cb9638b2..5ba2bdff58 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2003-05-26 Lars Gullik Bjønnes + + * remove same_id from function signatures, adjust. + 2003-05-25 Lars Gullik Bjønnes * undo_funcs.C (createUndo): use the id functions directly, adjust. diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index dbc0cbb056..7a189d69ca 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2003-05-26 Lars Gullik Bjønnes + + * remove same_id from function signatures, adjust + 2003-05-24 Lars Gullik Bjønnes * insettext.C (InsetText): adjust diff --git a/src/insets/inset.C b/src/insets/inset.C index 51f655cf47..501c766d86 100644 --- a/src/insets/inset.C +++ b/src/insets/inset.C @@ -40,18 +40,27 @@ Inset::Inset() {} -Inset::Inset(Inset const & in, bool same_id) +Inset::Inset(Inset const & in) : InsetBase(), top_x(0), top_baseline(0), scx(0), owner_(0), name_(in.name_), background_color_(in.background_color_) { - if (same_id) - id_ = in.id(); - else - id_ = inset_id++; + id_ = inset_id++; } +// Inset::Inset(Inset const & in, bool same_id) +// : InsetBase(), +// top_x(0), top_baseline(0), scx(0), owner_(0), +// name_(in.name_), background_color_(in.background_color_) +// { +// if (same_id) +// id_ = in.id(); +// else +// id_ = inset_id++; +// } + + bool Inset::directWrite() const { return false; @@ -170,4 +179,3 @@ int Inset::width(BufferView * bv, LyXFont const & font) const dimension(bv, font, dim); return dim.width(); } - diff --git a/src/insets/inset.h b/src/insets/inset.h index 3e86cc5114..1b15c9ed84 100644 --- a/src/insets/inset.h +++ b/src/insets/inset.h @@ -158,7 +158,9 @@ public: /// Inset(); /// - Inset(Inset const & in, bool same_id = false); + Inset(Inset const & in); + /// + //Inset(Inset const & in, bool same_id); /// virtual void dimension(BufferView *, LyXFont const &, Dimension &) const = 0; /// @@ -209,7 +211,9 @@ public: } /// - virtual Inset * clone(Buffer const &, bool same_ids = false) const = 0; + virtual Inset * clone(Buffer const &) const = 0; + /// + //virtual Inset * clone(Buffer const &, bool same_ids) const = 0; /// returns true to override begin and end inset in file virtual bool directWrite() const; diff --git a/src/insets/insetbibitem.C b/src/insets/insetbibitem.C index 37372d1676..eb22763941 100644 --- a/src/insets/insetbibitem.C +++ b/src/insets/insetbibitem.C @@ -43,7 +43,7 @@ InsetBibitem::~InsetBibitem() } -Inset * InsetBibitem::clone(Buffer const &, bool) const +Inset * InsetBibitem::clone(Buffer const &) const { InsetBibitem * b = new InsetBibitem(params()); b->setCounter(counter); @@ -51,6 +51,14 @@ Inset * InsetBibitem::clone(Buffer const &, bool) const } +// Inset * InsetBibitem::clone(Buffer const &, bool) const +// { +// InsetBibitem * b = new InsetBibitem(params()); +// b->setCounter(counter); +// return b; +// } + + dispatch_result InsetBibitem::localDispatch(FuncRequest const & cmd) { switch (cmd.action) { diff --git a/src/insets/insetbibitem.h b/src/insets/insetbibitem.h index b1f15eae6f..d37c9a07b8 100644 --- a/src/insets/insetbibitem.h +++ b/src/insets/insetbibitem.h @@ -29,7 +29,9 @@ public: /// ~InsetBibitem(); /// - Inset * clone(Buffer const &, bool same_id = false) const; + Inset * clone(Buffer const &) const; + /// + //Inset * clone(Buffer const &, bool same_id) const; /// virtual dispatch_result localDispatch(FuncRequest const & cmd); /** Currently \bibitem is used as a LyX2.x command, diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C index 68dbbf29aa..dc35dcc236 100644 --- a/src/insets/insetbibtex.C +++ b/src/insets/insetbibtex.C @@ -35,11 +35,16 @@ using std::vector; using std::pair; -InsetBibtex::InsetBibtex(InsetCommandParams const & p, bool) +InsetBibtex::InsetBibtex(InsetCommandParams const & p) : InsetCommand(p) {} +// InsetBibtex::InsetBibtex(InsetCommandParams const & p, bool) +// : InsetCommand(p, false) +// {} + + InsetBibtex::~InsetBibtex() { InsetCommandMailer mailer("bibtex", *this); diff --git a/src/insets/insetbibtex.h b/src/insets/insetbibtex.h index ee2b05774b..f14428fc2d 100644 --- a/src/insets/insetbibtex.h +++ b/src/insets/insetbibtex.h @@ -23,13 +23,19 @@ class Buffer; class InsetBibtex : public InsetCommand { public: /// - InsetBibtex(InsetCommandParams const &, bool same_id = false); + InsetBibtex(InsetCommandParams const &); + /// + //InsetBibtex(InsetCommandParams const &, bool same_id); /// ~InsetBibtex(); /// - Inset * clone(Buffer const &, bool same_id = false) const { - return new InsetBibtex(params(), same_id); + Inset * clone(Buffer const &) const { + return new InsetBibtex(params()); } + /// + //Inset * clone(Buffer const &, bool same_id) const { + // return new InsetBibtex(params(), same_id); + //} /// small wrapper for the time being virtual dispatch_result localDispatch(FuncRequest const & cmd); /// diff --git a/src/insets/insetcite.C b/src/insets/insetcite.C index 9f15370848..429beca5ca 100644 --- a/src/insets/insetcite.C +++ b/src/insets/insetcite.C @@ -221,11 +221,16 @@ string const getBasicLabel(string const & keyList, string const & after) } // anon namespace -InsetCitation::InsetCitation(InsetCommandParams const & p, bool) +InsetCitation::InsetCitation(InsetCommandParams const & p) : InsetCommand(p) {} +// InsetCitation::InsetCitation(InsetCommandParams const & p, bool) +// : InsetCommand(p, false) +// {} + + InsetCitation::~InsetCitation() { InsetCommandMailer mailer("citation", *this); diff --git a/src/insets/insetcite.h b/src/insets/insetcite.h index 76f0b3628b..b9c47ac4a0 100644 --- a/src/insets/insetcite.h +++ b/src/insets/insetcite.h @@ -21,14 +21,20 @@ class InsetCitation : public InsetCommand { public: /// - InsetCitation(InsetCommandParams const &, bool same_id = false); + InsetCitation(InsetCommandParams const &); + /// + //InsetCitation(InsetCommandParams const &, bool same_id); /// ~InsetCitation(); /// - Inset * clone(Buffer const &, bool same_id = false) const { - return new InsetCitation(params(), same_id); + Inset * clone(Buffer const &) const { + return new InsetCitation(params()); } /// + //Inset * clone(Buffer const &, bool same_id) const { + // return new InsetCitation(params(), same_id); + //} + /// string const getScreenLabel(Buffer const *) const; /// EDITABLE editable() const { return IS_EDITABLE; } diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C index 92e80458e6..811c1317eb 100644 --- a/src/insets/insetcollapsable.C +++ b/src/insets/insetcollapsable.C @@ -56,8 +56,8 @@ InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed) } -InsetCollapsable::InsetCollapsable(InsetCollapsable const & in, bool same_id) - : UpdatableInset(in, same_id), collapsed_(in.collapsed_), +InsetCollapsable::InsetCollapsable(InsetCollapsable const & in) + : UpdatableInset(in), collapsed_(in.collapsed_), framecolor(in.framecolor), labelfont(in.labelfont), inset(in.inset), button_length(0), button_top_y(0), button_bottom_y(0), label(in.label), @@ -66,11 +66,26 @@ InsetCollapsable::InsetCollapsable(InsetCollapsable const & in, bool same_id) #endif oldWidth(0), in_update(false), first_after_edit(false) { - inset.init(&(in.inset), same_id); + inset.init(&(in.inset)); inset.setOwner(this); } +// InsetCollapsable::InsetCollapsable(InsetCollapsable const & in, bool same_id) +// : UpdatableInset(in, same_id), collapsed_(in.collapsed_), +// framecolor(in.framecolor), labelfont(in.labelfont), inset(in.inset), +// button_length(0), button_top_y(0), button_bottom_y(0), +// label(in.label), +// #if 0 +// autocollapse(in.autocollapse), +// #endif +// oldWidth(0), in_update(false), first_after_edit(false) +// { +// inset.init(&(in.inset), same_id); +// inset.setOwner(this); +// } + + bool InsetCollapsable::insertInset(BufferView * bv, Inset * in) { if (!insetAllowed(in->lyxCode())) { diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h index 2b33a90c95..7691845910 100644 --- a/src/insets/insetcollapsable.h +++ b/src/insets/insetcollapsable.h @@ -37,9 +37,11 @@ public: /// static int const TEXT_TO_BOTTOM_OFFSET = 2; /// inset is initially collapsed if bool = true - InsetCollapsable(BufferParams const &, bool = false); + InsetCollapsable(BufferParams const &, bool collapsed = false); /// - InsetCollapsable(InsetCollapsable const & in, bool same_id = false); + InsetCollapsable(InsetCollapsable const & in); + /// + //InsetCollapsable(InsetCollapsable const & in, bool same_id); /// void read(Buffer const *, LyXLex &); /// @@ -156,9 +158,9 @@ public: void toggleSelection(BufferView * bv, bool kill_selection) { inset.toggleSelection(bv, kill_selection); } - + void markErased(); - + bool nextChange(BufferView * bv, lyx::pos_type & length); /// diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C index f1235c1abc..beb3ce9af3 100644 --- a/src/insets/insetcommand.C +++ b/src/insets/insetcommand.C @@ -26,11 +26,16 @@ using std::ostream; -InsetCommand::InsetCommand(InsetCommandParams const & p, bool) +InsetCommand::InsetCommand(InsetCommandParams const & p) : p_(p.getCmdName(), p.getContents(), p.getOptions()) {} +// InsetCommand::InsetCommand(InsetCommandParams const & p, bool) +// : p_(p.getCmdName(), p.getContents(), p.getOptions()) +// {} + + void InsetCommand::setParams(InsetCommandParams const & p) { p_.setCmdName(p.getCmdName()); @@ -115,7 +120,7 @@ void InsetCommandMailer::string2params(string const & in, if (in.empty()) return; - + istringstream data(STRCONV(in)); LyXLex lex(0,0); lex.setStream(data); diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h index 6b734eebe1..286cd9736d 100644 --- a/src/insets/insetcommand.h +++ b/src/insets/insetcommand.h @@ -31,7 +31,10 @@ class InsetCommand : public InsetButton, boost::noncopyable { public: /// explicit - InsetCommand(InsetCommandParams const &, bool same_id = false); + InsetCommand(InsetCommandParams const &); + /// + //explicit + //InsetCommand(InsetCommandParams const &, bool same_id); /// void write(Buffer const *, std::ostream & os) const { p_.write(os); } diff --git a/src/insets/insetenv.C b/src/insets/insetenv.C index 15c239b449..aeeb5f07c5 100644 --- a/src/insets/insetenv.C +++ b/src/insets/insetenv.C @@ -35,17 +35,28 @@ InsetEnvironment::InsetEnvironment } -InsetEnvironment::InsetEnvironment(InsetEnvironment const & in, bool same_id) - : InsetText(in, same_id), layout_(in.layout_) +InsetEnvironment::InsetEnvironment(InsetEnvironment const & in) + : InsetText(in), layout_(in.layout_) {} -Inset * InsetEnvironment::clone(Buffer const &, bool same_id) const +// InsetEnvironment::InsetEnvironment(InsetEnvironment const & in, bool same_id) +// : InsetText(in, same_id), layout_(in.layout_) +// {} + + +Inset * InsetEnvironment::clone(Buffer const &) const { - return new InsetEnvironment(*this, same_id); + return new InsetEnvironment(*this); } +// Inset * InsetEnvironment::clone(Buffer const &, bool same_id) const +// { +// return new InsetEnvironment(*this, same_id); +// } + + void InsetEnvironment::write(Buffer const * buf, ostream & os) const { os << "Environment " << getInsetName() << "\n"; diff --git a/src/insets/insetenv.h b/src/insets/insetenv.h index ed8e0665b9..b8d55a9d4f 100644 --- a/src/insets/insetenv.h +++ b/src/insets/insetenv.h @@ -20,13 +20,17 @@ public: /// InsetEnvironment(BufferParams const &, string const & name); /// - InsetEnvironment(InsetEnvironment const &, bool same_id = false); + InsetEnvironment(InsetEnvironment const &); + /// + //InsetEnvironment(InsetEnvironment const &, bool same_id); /// void write(Buffer const * buf, std::ostream & os) const; /// void read(Buffer const * buf, LyXLex & lex); /// - Inset * clone(Buffer const &, bool same_id = false) const; + Inset * clone(Buffer const &) const; + /// + //Inset * clone(Buffer const &, bool same_id) const; /// Inset::Code lyxCode() const { return Inset::ENVIRONMENT_CODE; } /// diff --git a/src/insets/inseterror.C b/src/insets/inseterror.C index b32c888058..27147233ce 100644 --- a/src/insets/inseterror.C +++ b/src/insets/inseterror.C @@ -28,11 +28,16 @@ using std::ostream; -InsetError::InsetError(string const & str, bool) +InsetError::InsetError(string const & str) : contents(str) {} +// InsetError::InsetError(string const & str, bool) +// : contents(str) +// {} + + InsetError::~InsetError() { Dialogs::hide("error", this); diff --git a/src/insets/inseterror.h b/src/insets/inseterror.h index b490f2dba0..4576837bb6 100644 --- a/src/insets/inseterror.h +++ b/src/insets/inseterror.h @@ -24,7 +24,10 @@ class InsetError : public Inset { public: /// explicit - InsetError(string const &, bool same_id = false); + InsetError(string const &); + /// + //explicit + //InsetError(string const &, bool same_id); /// ~InsetError(); /// @@ -53,10 +56,14 @@ public: /// EDITABLE editable() const { return IS_EDITABLE; } /// - Inset * clone(Buffer const &, bool same_id = false) const { - return new InsetError(contents, same_id); + Inset * clone(Buffer const &) const { + return new InsetError(contents); } /// + //Inset * clone(Buffer const &, bool same_id) const { + // return new InsetError(contents, same_id); + //} + /// Inset::Code lyxCode() const { return Inset::ERROR_CODE; } /// We don't want "begin" and "end inset" in lyx-file bool directWrite() const { return true; }; diff --git a/src/insets/insetert.C b/src/insets/insetert.C index aae3d97142..f5abcc230f 100644 --- a/src/insets/insetert.C +++ b/src/insets/insetert.C @@ -63,19 +63,32 @@ InsetERT::InsetERT(BufferParams const & bp, bool collapsed) } -InsetERT::InsetERT(InsetERT const & in, bool same_id) - : InsetCollapsable(in, same_id), status_(in.status_) +InsetERT::InsetERT(InsetERT const & in) + : InsetCollapsable(in), status_(in.status_) { init(); } -Inset * InsetERT::clone(Buffer const &, bool same_id) const +// InsetERT::InsetERT(InsetERT const & in, bool same_id) +// : InsetCollapsable(in, same_id), status_(in.status_) +// { +// init(); +// } + + +Inset * InsetERT::clone(Buffer const &) const { - return new InsetERT(*const_cast(this), same_id); + return new InsetERT(*const_cast(this)); } +// Inset * InsetERT::clone(Buffer const &, bool same_id) const +// { +// return new InsetERT(*const_cast(this), same_id); +// } + + InsetERT::InsetERT(BufferParams const & bp, Language const * l, string const & contents, bool collapsed) : InsetCollapsable(bp, collapsed) diff --git a/src/insets/insetert.h b/src/insets/insetert.h index 8a9d2a98a2..89f211c137 100644 --- a/src/insets/insetert.h +++ b/src/insets/insetert.h @@ -38,9 +38,13 @@ public: /// InsetERT(BufferParams const &, bool collapsed = false); /// - InsetERT(InsetERT const &, bool same_id = false); + InsetERT(InsetERT const &); /// - Inset * clone(Buffer const &, bool same_id = false) const; + //InsetERT(InsetERT const &, bool same_id); + /// + Inset * clone(Buffer const &) const; + /// + //Inset * clone(Buffer const &, bool same_id) const; /// InsetERT(BufferParams const &, Language const *, string const & contents, bool collapsed); diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C index 872bc63a87..0bfbc90c1f 100644 --- a/src/insets/insetexternal.C +++ b/src/insets/insetexternal.C @@ -223,17 +223,26 @@ void InsetExternal::validate(LaTeXFeatures & features) const } -Inset * InsetExternal::clone(Buffer const &, bool same_id) const +Inset * InsetExternal::clone(Buffer const &) const { InsetExternal * inset = new InsetExternal; inset->params_ = params_; inset->view_ = view_; - if (same_id) - inset->id_ = id_; return inset; } +// Inset * InsetExternal::clone(Buffer const &, bool same_id) const +// { +// InsetExternal * inset = new InsetExternal; +// inset->params_ = params_; +// inset->view_ = view_; +// if (same_id) +// inset->id_ = id_; +// return inset; +// } + + string const InsetExternal::getScreenLabel(Buffer const *) const { ExternalTemplate const & et = params_.templ; diff --git a/src/insets/insetexternal.h b/src/insets/insetexternal.h index 0806794fdf..e200b5f1d5 100644 --- a/src/insets/insetexternal.h +++ b/src/insets/insetexternal.h @@ -37,7 +37,7 @@ public: /// virtual ~InsetExternal(); /// - virtual dispatch_result localDispatch(FuncRequest const & cmd); + virtual dispatch_result localDispatch(FuncRequest const & cmd); /// what appears in the minibuffer when opening virtual string const editMessage() const; /// @@ -69,7 +69,9 @@ public: virtual Inset::Code lyxCode() const { return EXTERNAL_CODE; } /// - virtual Inset * clone(Buffer const &, bool same_id = false) const; + virtual Inset * clone(Buffer const &) const; + /// + //virtual Inset * clone(Buffer const &, bool same_id) const; /// returns the text of the button virtual string const getScreenLabel(Buffer const *) const; diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C index d04f2e0428..1512660714 100644 --- a/src/insets/insetfloat.C +++ b/src/insets/insetfloat.C @@ -145,11 +145,16 @@ InsetFloat::InsetFloat(BufferParams const & bp, string const & type) } -InsetFloat::InsetFloat(InsetFloat const & in, bool same_id) - : InsetCollapsable(in, same_id), params_(in.params_) +InsetFloat::InsetFloat(InsetFloat const & in) + : InsetCollapsable(in), params_(in.params_) {} +// InsetFloat::InsetFloat(InsetFloat const & in, bool same_id) +// : InsetCollapsable(in, same_id), params_(in.params_) +// {} + + InsetFloat::~InsetFloat() { InsetFloatMailer mailer(*this); @@ -259,12 +264,18 @@ void InsetFloat::validate(LaTeXFeatures & features) const } -Inset * InsetFloat::clone(Buffer const &, bool same_id) const +Inset * InsetFloat::clone(Buffer const &) const { - return new InsetFloat(*const_cast(this), same_id); + return new InsetFloat(*const_cast(this)); } +// Inset * InsetFloat::clone(Buffer const &, bool same_id) const +// { +// return new InsetFloat(*const_cast(this), same_id); +// } + + string const InsetFloat::editMessage() const { return _("Opened Float Inset"); diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h index 4e74486d40..8b02904acd 100644 --- a/src/insets/insetfloat.h +++ b/src/insets/insetfloat.h @@ -41,11 +41,13 @@ public: /// InsetFloat(BufferParams const &, string const &); /// - InsetFloat(InsetFloat const &, bool same_id = false); + InsetFloat(InsetFloat const &); + /// + //InsetFloat(InsetFloat const &, bool same_id); /// ~InsetFloat(); /// - virtual dispatch_result localDispatch(FuncRequest const & cmd); + virtual dispatch_result localDispatch(FuncRequest const & cmd); /// void write(Buffer const * buf, std::ostream & os) const; /// @@ -53,7 +55,9 @@ public: /// void validate(LaTeXFeatures & features) const; /// - Inset * clone(Buffer const &, bool same_id = false) const; + Inset * clone(Buffer const &) const; + /// + //Inset * clone(Buffer const &, bool same_id) const; /// Inset::Code lyxCode() const { return Inset::FLOAT_CODE; } /// @@ -77,7 +81,7 @@ public: bool showInsetDialog(BufferView *) const; /// InsetFloatParams const & params() const { return params_; } - + private: /// InsetFloatParams params_; diff --git a/src/insets/insetfloatlist.h b/src/insets/insetfloatlist.h index 2e1cfa18b6..52bedb6d29 100644 --- a/src/insets/insetfloatlist.h +++ b/src/insets/insetfloatlist.h @@ -26,10 +26,14 @@ public: /// ~InsetFloatList(); /// - Inset * clone(Buffer const &, bool = false) const { + Inset * clone(Buffer const &) const { 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; diff --git a/src/insets/insetfoot.C b/src/insets/insetfoot.C index a1ca0bc161..c020e54845 100644 --- a/src/insets/insetfoot.C +++ b/src/insets/insetfoot.C @@ -38,20 +38,34 @@ InsetFoot::InsetFoot(BufferParams const & bp) } -InsetFoot::InsetFoot(InsetFoot const & in, bool same_id) - : InsetFootlike(in, same_id) +InsetFoot::InsetFoot(InsetFoot const & in) + : InsetFootlike(in) { setLabel(_("foot")); setInsetName("Foot"); } -Inset * InsetFoot::clone(Buffer const &, bool same_id) const +// InsetFoot::InsetFoot(InsetFoot const & in, bool same_id) +// : InsetFootlike(in, same_id) +// { +// setLabel(_("foot")); +// setInsetName("Foot"); +// } + + +Inset * InsetFoot::clone(Buffer const &) const { - return new InsetFoot(*const_cast(this), same_id); + return new InsetFoot(*const_cast(this)); } +// Inset * InsetFoot::clone(Buffer const &, bool same_id) const +// { +// return new InsetFoot(*const_cast(this), same_id); +// } + + string const InsetFoot::editMessage() const { return _("Opened Footnote Inset"); diff --git a/src/insets/insetfoot.h b/src/insets/insetfoot.h index 14384cd411..81ff5117f9 100644 --- a/src/insets/insetfoot.h +++ b/src/insets/insetfoot.h @@ -25,9 +25,13 @@ public: /// InsetFoot(BufferParams const &); /// - InsetFoot(InsetFoot const &, bool same_id = false); + InsetFoot(InsetFoot const &); /// - Inset * clone(Buffer const &, bool same_id = false) const; + //InsetFoot(InsetFoot const &, bool same_id); + /// + Inset * clone(Buffer const &) const; + /// + //Inset * clone(Buffer const &, bool same_id) const; /// Inset::Code lyxCode() const { return Inset::FOOT_CODE; } /// diff --git a/src/insets/insetfootlike.C b/src/insets/insetfootlike.C index 8254da3008..604f8465b9 100644 --- a/src/insets/insetfootlike.C +++ b/src/insets/insetfootlike.C @@ -32,8 +32,8 @@ InsetFootlike::InsetFootlike(BufferParams const & bp) } -InsetFootlike::InsetFootlike(InsetFootlike const & in, bool same_id) - : InsetCollapsable(in, same_id) +InsetFootlike::InsetFootlike(InsetFootlike const & in) + : InsetCollapsable(in) { LyXFont font(LyXFont::ALL_SANE); font.decSize(); @@ -43,6 +43,17 @@ InsetFootlike::InsetFootlike(InsetFootlike const & in, bool same_id) } +// InsetFootlike::InsetFootlike(InsetFootlike const & in, bool same_id) +// : InsetCollapsable(in, same_id) +// { +// LyXFont font(LyXFont::ALL_SANE); +// font.decSize(); +// font.decSize(); +// font.setColor(LColor::collapsable); +// setLabelFont(font); +// } + + void InsetFootlike::write(Buffer const * buf, ostream & os) const { os << getInsetName() << "\n"; diff --git a/src/insets/insetfootlike.h b/src/insets/insetfootlike.h index a7989386b5..284ab620ab 100644 --- a/src/insets/insetfootlike.h +++ b/src/insets/insetfootlike.h @@ -22,7 +22,9 @@ public: /// InsetFootlike(BufferParams const &); /// - InsetFootlike(InsetFootlike const &, bool same_id = false); + InsetFootlike(InsetFootlike const &); + /// + //InsetFootlike(InsetFootlike const &, bool same_id); /// void write(Buffer const * buf, std::ostream & os) const; /// diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index 3517ec5b19..63152f4e7d 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -193,9 +193,8 @@ InsetGraphics::InsetGraphics() InsetGraphics::InsetGraphics(InsetGraphics const & ig, - string const & filepath, - bool same_id) - : Inset(ig, same_id), + string const & filepath) + : Inset(ig), graphic_label(uniqueID()), cache_(new Cache(*this)) { @@ -203,12 +202,29 @@ InsetGraphics::InsetGraphics(InsetGraphics const & ig, } -Inset * InsetGraphics::clone(Buffer const & buffer, bool same_id) const +// InsetGraphics::InsetGraphics(InsetGraphics const & ig, +// string const & filepath, +// bool same_id) +// : Inset(ig, same_id), +// graphic_label(uniqueID()), +// cache_(new Cache(*this)) +// { +// setParams(ig.params(), filepath); +// } + + +Inset * InsetGraphics::clone(Buffer const & buffer) const { - return new InsetGraphics(*this, buffer.filePath(), same_id); + return new InsetGraphics(*this, buffer.filePath()); } +// Inset * InsetGraphics::clone(Buffer const & buffer, bool same_id) const +// { +// return new InsetGraphics(*this, buffer.filePath(), same_id); +// } + + InsetGraphics::~InsetGraphics() { InsetGraphicsMailer mailer(*this); @@ -230,7 +246,7 @@ dispatch_result InsetGraphics::localDispatch(FuncRequest const & cmd) return DISPATCHED; } - case LFUN_INSET_DIALOG_UPDATE: + case LFUN_INSET_DIALOG_UPDATE: InsetGraphicsMailer(*this).updateDialog(cmd.view()); return DISPATCHED; diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h index 507dd08ccb..940f4509a9 100644 --- a/src/insets/insetgraphics.h +++ b/src/insets/insetgraphics.h @@ -28,8 +28,10 @@ public: /// InsetGraphics(); /// - InsetGraphics(InsetGraphics const &, string const & filepath, - bool same_id = false); + InsetGraphics(InsetGraphics const &, string const & filepath); + /// + //InsetGraphics(InsetGraphics const &, string const & filepath, + // bool same_id); /// ~InsetGraphics(); /// @@ -67,7 +69,9 @@ public: Inset::Code lyxCode() const { return Inset::GRAPHICS_CODE; } /// - virtual Inset * clone(Buffer const &, bool same_id = false) const; + virtual Inset * clone(Buffer const &) const; + /// + //virtual Inset * clone(Buffer const &, bool same_id) const; /** Set the inset parameters, used by the GUIndependent dialog. Return true of new params are different from what was so far. diff --git a/src/insets/insethfill.h b/src/insets/insethfill.h index 68d555f923..0db2fc10f0 100644 --- a/src/insets/insethfill.h +++ b/src/insets/insethfill.h @@ -20,10 +20,14 @@ public: /// InsetHFill(); /// - virtual Inset * clone(Buffer const &, bool = false) const { + virtual Inset * clone(Buffer const &) const { return new InsetHFill(); } /// + //virtual Inset * clone(Buffer const &, bool /*same_id*/) const { + // return new InsetHFill(); + //} + /// string const getScreenLabel(Buffer const *) const { return getContents(); } /// Inset::Code lyxCode() const { return Inset::HFILL_CODE; } diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C index 5af3b2ccb7..7aba887207 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -126,7 +126,7 @@ dispatch_result InsetInclude::localDispatch(FuncRequest const & cmd) return DISPATCHED; } - case LFUN_INSET_DIALOG_UPDATE: + case LFUN_INSET_DIALOG_UPDATE: InsetIncludeMailer(*this).updateDialog(cmd.view()); return DISPATCHED; @@ -191,7 +191,7 @@ void InsetInclude::set(Params const & p) } -Inset * InsetInclude::clone(Buffer const & buffer, bool) const +Inset * InsetInclude::clone(Buffer const & buffer) const { Params p(params_); p.masterFilename_ = buffer.fileName(); @@ -200,6 +200,15 @@ Inset * InsetInclude::clone(Buffer const & buffer, bool) const } +// Inset * InsetInclude::clone(Buffer const & buffer, bool) const +// { +// Params p(params_); +// p.masterFilename_ = buffer.fileName(); + +// return new InsetInclude(p); +// } + + void InsetInclude::write(Buffer const *, ostream & os) const { os << "Include " << params_.cparams.getCommand() << '\n' @@ -618,7 +627,7 @@ void InsetIncludeMailer::string2params(string const & in, if (in.empty()) return; - + istringstream data(STRCONV(in)); LyXLex lex(0,0); lex.setStream(data); diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h index 5263fdce43..4cde1408b6 100644 --- a/src/insets/insetinclude.h +++ b/src/insets/insetinclude.h @@ -57,7 +57,7 @@ public: ~InsetInclude(); /// - virtual dispatch_result localDispatch(FuncRequest const & cmd); + virtual dispatch_result localDispatch(FuncRequest const & cmd); /// Override these InsetButton methods if Previewing int ascent(BufferView *, LyXFont const &) const; @@ -74,7 +74,9 @@ public: void set(Params const & params); /// - virtual Inset * clone(Buffer const &, bool same_id = false) const; + virtual Inset * clone(Buffer const &) const; + /// + //virtual Inset * clone(Buffer const &, bool same_id) const; /// Inset::Code lyxCode() const { return Inset::INCLUDE_CODE; } /// This returns the list of labels on the child buffer diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C index cbd6dd8495..bdfdea6786 100644 --- a/src/insets/insetindex.C +++ b/src/insets/insetindex.C @@ -21,11 +21,16 @@ using std::ostream; -InsetIndex::InsetIndex(InsetCommandParams const & p, bool) +InsetIndex::InsetIndex(InsetCommandParams const & p) : InsetCommand(p) {} +// InsetIndex::InsetIndex(InsetCommandParams const & p, bool) +// : InsetCommand(p, false) +// {} + + InsetIndex::~InsetIndex() { InsetCommandMailer mailer("index", *this); @@ -45,7 +50,7 @@ dispatch_result InsetIndex::localDispatch(FuncRequest const & cmd) case LFUN_INSET_EDIT: InsetCommandMailer("index", *this).showDialog(cmd.view()); return DISPATCHED; - + default: return UNDISPATCHED; } @@ -67,11 +72,16 @@ Inset::Code InsetIndex::lyxCode() const -InsetPrintIndex::InsetPrintIndex(InsetCommandParams const & p, bool) +InsetPrintIndex::InsetPrintIndex(InsetCommandParams const & p) : InsetCommand(p) {} +// InsetPrintIndex::InsetPrintIndex(InsetCommandParams const & p, bool) +// : InsetCommand(p, false) +// {} + + InsetPrintIndex::~InsetPrintIndex() {} diff --git a/src/insets/insetindex.h b/src/insets/insetindex.h index 79ae38e58d..27bd984bb6 100644 --- a/src/insets/insetindex.h +++ b/src/insets/insetindex.h @@ -22,14 +22,20 @@ struct LaTeXFeatures; class InsetIndex : public InsetCommand { public: /// - InsetIndex(InsetCommandParams const &, bool same_id = false); + InsetIndex(InsetCommandParams const &); + /// + //InsetIndex(InsetCommandParams const &, bool same_id); /// ~InsetIndex(); /// - virtual Inset * clone(Buffer const &, bool same_id = false) const { - return new InsetIndex(params(), same_id); + virtual Inset * clone(Buffer const &) const { + return new InsetIndex(params()); } /// + //virtual Inset * clone(Buffer const &, bool same_id) const { + // return new InsetIndex(params(), same_id); + //} + /// dispatch_result localDispatch(FuncRequest const & cmd); /// string const getScreenLabel(Buffer const *) const; @@ -45,14 +51,20 @@ public: class InsetPrintIndex : public InsetCommand { public: /// - InsetPrintIndex(InsetCommandParams const &, bool same_id = false); + InsetPrintIndex(InsetCommandParams const &); + /// + //InsetPrintIndex(InsetCommandParams const &, bool same_id); /// ~InsetPrintIndex(); /// - Inset * clone(Buffer const &, bool same_id = false) const { - return new InsetPrintIndex(params(), same_id); + Inset * clone(Buffer const &) const { + return new InsetPrintIndex(params()); } /// + //Inset * clone(Buffer const &, bool same_id) const { + // return new InsetPrintIndex(params(), same_id); + //} + /// //dispatch_result localDispatch(FuncRequest const & cmd); /// Updates needed features for this inset. void validate(LaTeXFeatures & features) const; diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C index 8f6887eed6..fcab20f025 100644 --- a/src/insets/insetlabel.C +++ b/src/insets/insetlabel.C @@ -27,11 +27,16 @@ using std::vector; using std::pair; -InsetLabel::InsetLabel(InsetCommandParams const & p, bool) +InsetLabel::InsetLabel(InsetCommandParams const & p) : InsetCommand(p) {} +// InsetLabel::InsetLabel(InsetCommandParams const & p, bool) +// : InsetCommand(p, false) +// {} + + InsetLabel::~InsetLabel() { InsetCommandMailer mailer("label", *this); diff --git a/src/insets/insetlabel.h b/src/insets/insetlabel.h index d0593b3b68..a9eccd3613 100644 --- a/src/insets/insetlabel.h +++ b/src/insets/insetlabel.h @@ -18,14 +18,20 @@ class InsetLabel : public InsetCommand { public: /// - InsetLabel(InsetCommandParams const &, bool same_id = false); + InsetLabel(InsetCommandParams const &); + /// + //InsetLabel(InsetCommandParams const &, bool same_id); /// ~InsetLabel(); /// - virtual Inset * clone(Buffer const &, bool same_id = false) const { - return new InsetLabel(params(), same_id); + virtual Inset * clone(Buffer const &) const { + return new InsetLabel(params()); } /// + //virtual Inset * clone(Buffer const &, bool same_id) const { + // return new InsetLabel(params(), same_id); + //} + /// virtual dispatch_result localDispatch(FuncRequest const & cmd); /// string const getScreenLabel(Buffer const *) const { return getContents(); } diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C index 0ff4ce011c..d7027507e4 100644 --- a/src/insets/insetlatexaccent.C +++ b/src/insets/insetlatexaccent.C @@ -656,12 +656,18 @@ bool InsetLatexAccent::directWrite() const } -Inset * InsetLatexAccent::clone(Buffer const &, bool) const +Inset * InsetLatexAccent::clone(Buffer const &) const { return new InsetLatexAccent(contents); } +// Inset * InsetLatexAccent::clone(Buffer const &, bool) const +// { +// return new InsetLatexAccent(contents); +// } + + Inset::Code InsetLatexAccent::lyxCode() const { return Inset::ACCENT_CODE; diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h index dfb139efb3..0e0ec4c478 100644 --- a/src/insets/insetlatexaccent.h +++ b/src/insets/insetlatexaccent.h @@ -60,7 +60,9 @@ public: /// bool directWrite() const; /// - virtual Inset * clone(Buffer const &, bool same_id = false) const; + virtual Inset * clone(Buffer const &) const; + /// + //virtual Inset * clone(Buffer const &, bool same_id) const; /// Inset::Code lyxCode()const; /// diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C index 174d7db843..76ca85581f 100644 --- a/src/insets/insetmarginal.C +++ b/src/insets/insetmarginal.C @@ -33,20 +33,34 @@ InsetMarginal::InsetMarginal(BufferParams const & bp) } -InsetMarginal::InsetMarginal(InsetMarginal const & in, bool same_id) - : InsetFootlike(in, same_id) +InsetMarginal::InsetMarginal(InsetMarginal const & in) + : InsetFootlike(in) { setLabel(_("margin")); setInsetName("Marginal"); } -Inset * InsetMarginal::clone(Buffer const &, bool same_id) const +// InsetMarginal::InsetMarginal(InsetMarginal const & in, bool same_id) +// : InsetFootlike(in, same_id) +// { +// setLabel(_("margin")); +// setInsetName("Marginal"); +// } + + +Inset * InsetMarginal::clone(Buffer const &) const { - return new InsetMarginal(*const_cast(this), same_id); + return new InsetMarginal(*const_cast(this)); } +// Inset * InsetMarginal::clone(Buffer const &, bool same_id) const +// { +// return new InsetMarginal(*const_cast(this), same_id); +// } + + string const InsetMarginal::editMessage() const { return _("Opened Marginal Note Inset"); diff --git a/src/insets/insetmarginal.h b/src/insets/insetmarginal.h index a0c089f53d..1ee63aa901 100644 --- a/src/insets/insetmarginal.h +++ b/src/insets/insetmarginal.h @@ -24,9 +24,13 @@ public: /// InsetMarginal(BufferParams const &); /// - InsetMarginal(InsetMarginal const &, bool same_id = false); + InsetMarginal(InsetMarginal const &); /// - Inset * clone(Buffer const &, bool same_id = false) const; + //InsetMarginal(InsetMarginal const &, bool same_id); + /// + Inset * clone(Buffer const &) const; + /// + //Inset * clone(Buffer const &, bool same_id) const; /// Inset::Code lyxCode() const { return Inset::MARGIN_CODE; } /// diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C index e12cb7fdeb..d6ea2a3bfc 100644 --- a/src/insets/insetminipage.C +++ b/src/insets/insetminipage.C @@ -88,17 +88,28 @@ InsetMinipage::InsetMinipage(BufferParams const & bp) } -InsetMinipage::InsetMinipage(InsetMinipage const & in, bool same_id) - : InsetCollapsable(in, same_id), params_(in.params_) +InsetMinipage::InsetMinipage(InsetMinipage const & in) + : InsetCollapsable(in), params_(in.params_) {} -Inset * InsetMinipage::clone(Buffer const &, bool same_id) const +// InsetMinipage::InsetMinipage(InsetMinipage const & in, bool same_id) +// : InsetCollapsable(in, same_id), params_(in.params_) +// {} + + +Inset * InsetMinipage::clone(Buffer const &) const { - return new InsetMinipage(*const_cast(this), same_id); + return new InsetMinipage(*const_cast(this)); } +// Inset * InsetMinipage::clone(Buffer const &, bool same_id) const +// { +// return new InsetMinipage(*const_cast(this), same_id); +// } + + InsetMinipage::~InsetMinipage() { InsetMinipageMailer mailer(*this); @@ -127,7 +138,7 @@ dispatch_result InsetMinipage::localDispatch(FuncRequest const & cmd) return DISPATCHED; } - case LFUN_INSET_DIALOG_UPDATE: + case LFUN_INSET_DIALOG_UPDATE: InsetMinipageMailer(*this).updateDialog(cmd.view()); return DISPATCHED; @@ -349,7 +360,7 @@ void InsetMinipageMailer::string2params(string const & in, if (in.empty()) return; - + istringstream data(STRCONV(in)); LyXLex lex(0,0); lex.setStream(data); diff --git a/src/insets/insetminipage.h b/src/insets/insetminipage.h index 6be1f4f929..c78c769d4e 100644 --- a/src/insets/insetminipage.h +++ b/src/insets/insetminipage.h @@ -56,17 +56,21 @@ public: /// InsetMinipage(BufferParams const &); /// - InsetMinipage(InsetMinipage const &, bool same_id = false); + InsetMinipage(InsetMinipage const &); + /// + //InsetMinipage(InsetMinipage const &, bool same_id); /// ~InsetMinipage(); /// - virtual dispatch_result localDispatch(FuncRequest const & cmd); + virtual dispatch_result localDispatch(FuncRequest const & cmd); /// void write(Buffer const * buf, std::ostream & os) const; /// void read(Buffer const * buf, LyXLex & lex); /// - Inset * clone(Buffer const &, bool same_id = false) const; + Inset * clone(Buffer const &) const; + /// + //Inset * clone(Buffer const &, bool same_id) const; /// void dimension(BufferView *, LyXFont const &, Dimension &) const; /// diff --git a/src/insets/insetnewline.h b/src/insets/insetnewline.h index 5cebf1d21a..b6f20af1ee 100644 --- a/src/insets/insetnewline.h +++ b/src/insets/insetnewline.h @@ -20,10 +20,15 @@ public: InsetNewline() {} - virtual Inset * clone(Buffer const &, bool = false) const { + virtual Inset * clone(Buffer const &) const { return new InsetNewline; } + + //virtual Inset * clone(Buffer const &, bool same_id) const { + // return new InsetNewline; + //} + Inset::Code lyxCode() const { return Inset::NEWLINE_CODE; } void dimension(BufferView *, LyXFont const &, Dimension &) const; diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C index 1a4253d5c8..c09db364ae 100644 --- a/src/insets/insetnote.C +++ b/src/insets/insetnote.C @@ -46,19 +46,32 @@ InsetNote::InsetNote(BufferParams const & bp) } -InsetNote::InsetNote(InsetNote const & in, bool same_id) - : InsetCollapsable(in, same_id) +InsetNote::InsetNote(InsetNote const & in) + : InsetCollapsable(in) { init(); } -Inset * InsetNote::clone(Buffer const &, bool same_id) const +// InsetNote::InsetNote(InsetNote const & in, bool same_id) +// : InsetCollapsable(in, same_id) +// { +// init(); +// } + + +Inset * InsetNote::clone(Buffer const &) const { - return new InsetNote(*const_cast(this), same_id); + return new InsetNote(*const_cast(this)); } +// Inset * InsetNote::clone(Buffer const &, bool same_id) const +// { +// return new InsetNote(*const_cast(this), same_id); +// } + + string const InsetNote::editMessage() const { return _("Opened Note Inset"); diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h index 6b340ac83c..ca173ab6d5 100644 --- a/src/insets/insetnote.h +++ b/src/insets/insetnote.h @@ -23,9 +23,13 @@ public: /// InsetNote(BufferParams const &); /// - InsetNote(InsetNote const &, bool same_id = false); + InsetNote(InsetNote const &); /// - Inset * clone(Buffer const &, bool same_id = false) const; + //InsetNote(InsetNote const &, bool same_id); + /// + Inset * clone(Buffer const &) const; + /// + //Inset * clone(Buffer const &, bool same_id) const; /// string const editMessage() const; /// diff --git a/src/insets/insetoptarg.C b/src/insets/insetoptarg.C index c25923bad1..03f000d920 100644 --- a/src/insets/insetoptarg.C +++ b/src/insets/insetoptarg.C @@ -37,8 +37,8 @@ InsetOptArg::InsetOptArg(BufferParams const & ins) } -InsetOptArg::InsetOptArg(InsetOptArg const & in, bool same_id) - : InsetCollapsable(in, same_id) +InsetOptArg::InsetOptArg(InsetOptArg const & in) + : InsetCollapsable(in) { LyXFont font(LyXFont::ALL_SANE); font.setColor(LColor::collapsable); @@ -47,12 +47,28 @@ InsetOptArg::InsetOptArg(InsetOptArg const & in, bool same_id) } -Inset * InsetOptArg::clone(Buffer const &, bool same_id) const +// InsetOptArg::InsetOptArg(InsetOptArg const & in, bool same_id) +// : InsetCollapsable(in, same_id) +// { +// LyXFont font(LyXFont::ALL_SANE); +// font.setColor(LColor::collapsable); +// setLabelFont(font); +// setLabel(_("opt")); +// } + + +Inset * InsetOptArg::clone(Buffer const &) const { - return new InsetOptArg(*this, same_id); + return new InsetOptArg(*this); } +// Inset * InsetOptArg::clone(Buffer const &, bool same_id) const +// { +// return new InsetOptArg(*this, same_id); +// } + + string const InsetOptArg::editMessage() const { return _("Opened Optional Argument Inset"); diff --git a/src/insets/insetoptarg.h b/src/insets/insetoptarg.h index 2324968186..50ff61cb9e 100644 --- a/src/insets/insetoptarg.h +++ b/src/insets/insetoptarg.h @@ -25,10 +25,13 @@ class InsetOptArg : public InsetCollapsable { public: InsetOptArg(BufferParams const &); - InsetOptArg(InsetOptArg const &, bool same_id = false); + InsetOptArg(InsetOptArg const &); + //InsetOptArg(InsetOptArg const &, bool same_id); /// make a duplicate of this inset - Inset * clone(Buffer const &, bool same_id = false) const; + Inset * clone(Buffer const &) const; + /// make a duplicate of this inset + //Inset * clone(Buffer const &, bool same_id) const; /// this inset is editable EDITABLE editable() const { return IS_EDITABLE; } diff --git a/src/insets/insetparent.C b/src/insets/insetparent.C index 9ded7ca7c3..9c87064fa4 100644 --- a/src/insets/insetparent.C +++ b/src/insets/insetparent.C @@ -27,7 +27,7 @@ using std::ostream; -InsetParent::InsetParent(InsetCommandParams const & p, Buffer const & bf, bool) +InsetParent::InsetParent(InsetCommandParams const & p, Buffer const & bf) : InsetCommand(p) { string const fn = p.getContents(); @@ -35,6 +35,14 @@ InsetParent::InsetParent(InsetCommandParams const & p, Buffer const & bf, bool) } +// InsetParent::InsetParent(InsetCommandParams const & p, Buffer const & bf, bool) +// : InsetCommand(p, false) +// { +// string const fn = p.getContents(); +// setContents(MakeAbsPath(fn, bf.filePath())); +// } + + string const InsetParent::getScreenLabel(Buffer const *) const { return bformat(_("Parent: %1$s"), getContents()); diff --git a/src/insets/insetparent.h b/src/insets/insetparent.h index ec2be9c618..8fd4691d34 100644 --- a/src/insets/insetparent.h +++ b/src/insets/insetparent.h @@ -25,12 +25,18 @@ class Buffer; class InsetParent : public InsetCommand { public: /// - InsetParent(InsetCommandParams const &, Buffer const &, bool same_id = false); + InsetParent(InsetCommandParams const &, Buffer const &); /// - virtual Inset * clone(Buffer const & buffer, bool same_id = false) const { - return new InsetParent(params(), buffer, same_id); + //InsetParent(InsetCommandParams const &, Buffer const &, bool same_id); + /// + virtual Inset * clone(Buffer const & buffer) const { + return new InsetParent(params(), buffer); } /// + //virtual Inset * clone(Buffer const & buffer, bool same_id) const { + // return new InsetParent(params(), buffer, same_id); + //} + /// dispatch_result localDispatch(FuncRequest const & cmd); /// string const getScreenLabel(Buffer const *) const; diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C index d438de51bf..5f0b6491e2 100644 --- a/src/insets/insetquotes.C +++ b/src/insets/insetquotes.C @@ -335,7 +335,7 @@ void InsetQuotes::validate(LaTeXFeatures & features) const && lyxrc.fontenc != "T1") { if (times_ == SingleQ) switch (type) { - case ',': features.require("quotesinglbase"); break; + case ',': features.require("quotesinglbase"); break; case '<': features.require("guilsinglleft"); break; case '>': features.require("guilsinglright"); break; default: break; @@ -351,12 +351,18 @@ void InsetQuotes::validate(LaTeXFeatures & features) const } -Inset * InsetQuotes::clone(Buffer const &, bool) const +Inset * InsetQuotes::clone(Buffer const &) const { - return new InsetQuotes(language_, side_, times_); + return new InsetQuotes(language_, side_, times_); } +// Inset * InsetQuotes::clone(Buffer const &, bool) const +// { +// return new InsetQuotes(language_, side_, times_); +// } + + Inset::Code InsetQuotes::lyxCode() const { return Inset::QUOTE_CODE; diff --git a/src/insets/insetquotes.h b/src/insets/insetquotes.h index f6e94e4b71..12e5e14da2 100644 --- a/src/insets/insetquotes.h +++ b/src/insets/insetquotes.h @@ -68,7 +68,9 @@ public: /// Create the right quote inset after character c InsetQuotes(char c, BufferParams const & params); /// - Inset * clone(Buffer const &, bool same_id = false) const; + Inset * clone(Buffer const &) const; + /// + //Inset * clone(Buffer const &, bool same_id) const; /// void dimension(BufferView *, LyXFont const &, Dimension &) const; diff --git a/src/insets/insetref.C b/src/insets/insetref.C index 72cb13da36..f2d2c0dde2 100644 --- a/src/insets/insetref.C +++ b/src/insets/insetref.C @@ -23,11 +23,16 @@ using std::ostream; -InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf, bool) +InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf) : InsetCommand(p), isLatex(buf.isLatex()) {} +// InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf, bool) +// : InsetCommand(p, false), isLatex(buf.isLatex()) +// {} + + InsetRef::~InsetRef() { InsetCommandMailer("ref", *this).hideDialog(); @@ -37,7 +42,7 @@ InsetRef::~InsetRef() dispatch_result InsetRef::localDispatch(FuncRequest const & cmd) { switch (cmd.action) { - case LFUN_INSET_EDIT: + case LFUN_INSET_EDIT: // Eventually trigger dialog with button 3 not 1 if (cmd.button() == mouse_button::button3) cmd.view()->owner()-> @@ -45,7 +50,7 @@ dispatch_result InsetRef::localDispatch(FuncRequest const & cmd) if (cmd.button() == mouse_button::button1) InsetCommandMailer("ref", *this).showDialog(cmd.view()); return DISPATCHED; - + default: return UNDISPATCHED; } diff --git a/src/insets/insetref.h b/src/insets/insetref.h index 532c7eaa2a..9e1aa204ae 100644 --- a/src/insets/insetref.h +++ b/src/insets/insetref.h @@ -36,14 +36,20 @@ public: static string const & getName(int type); /// - InsetRef(InsetCommandParams const &, Buffer const &, bool same_id = false); + InsetRef(InsetCommandParams const &, Buffer const &); + /// + //InsetRef(InsetCommandParams const &, Buffer const &, bool same_id); /// ~InsetRef(); /// - virtual Inset * clone(Buffer const & buffer, bool same_id = false) const { - return new InsetRef(params(), buffer, same_id); + virtual Inset * clone(Buffer const & buffer) const { + return new InsetRef(params(), buffer); } /// + //virtual Inset * clone(Buffer const & buffer, bool same_id) const { + // return new InsetRef(params(), buffer, same_id); + //} + /// dispatch_result localDispatch(FuncRequest const & cmd); /// string const getScreenLabel(Buffer const *) const; diff --git a/src/insets/insetspace.C b/src/insets/insetspace.C index 0799bad7ff..d0b15c8903 100644 --- a/src/insets/insetspace.C +++ b/src/insets/insetspace.C @@ -250,12 +250,18 @@ int InsetSpace::docbook(Buffer const *, ostream & os, bool) const } -Inset * InsetSpace::clone(Buffer const &, bool) const +Inset * InsetSpace::clone(Buffer const &) const { return new InsetSpace(kind_); } +// Inset * InsetSpace::clone(Buffer const &, bool) const +// { +// return new InsetSpace(kind_); +// } + + bool InsetSpace::isChar() const { return true; diff --git a/src/insets/insetspace.h b/src/insets/insetspace.h index 606996f4a5..1081797ed8 100644 --- a/src/insets/insetspace.h +++ b/src/insets/insetspace.h @@ -70,7 +70,9 @@ public: /// int docbook(Buffer const *, std::ostream &, bool mixcont) const; /// - virtual Inset * clone(Buffer const &, bool same_id = false) const; + virtual Inset * clone(Buffer const &) const; + /// + //virtual Inset * clone(Buffer const &, bool same_id) const; /// Inset::Code lyxCode() const { return Inset::SPACE_CODE; } /// We don't need \begin_inset and \end_inset diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C index 15519f374e..b43100020f 100644 --- a/src/insets/insetspecialchar.C +++ b/src/insets/insetspecialchar.C @@ -244,12 +244,18 @@ int InsetSpecialChar::docbook(Buffer const *, ostream & os, bool) const } -Inset * InsetSpecialChar::clone(Buffer const &, bool) const +Inset * InsetSpecialChar::clone(Buffer const &) const { return new InsetSpecialChar(kind_); } +// Inset * InsetSpecialChar::clone(Buffer const &, bool) const +// { +// return new InsetSpecialChar(kind_); +// } + + void InsetSpecialChar::validate(LaTeXFeatures & features) const { if (kind_ == MENU_SEPARATOR) { diff --git a/src/insets/insetspecialchar.h b/src/insets/insetspecialchar.h index d8ec503700..2bc1cb9b16 100644 --- a/src/insets/insetspecialchar.h +++ b/src/insets/insetspecialchar.h @@ -63,7 +63,9 @@ public: /// int docbook(Buffer const *, std::ostream &, bool mixcont) const; /// - virtual Inset * clone(Buffer const &, bool same_id = false) const; + virtual Inset * clone(Buffer const &) const; + /// + //virtual Inset * clone(Buffer const &, bool same_id) const; /// Inset::Code lyxCode() const { return Inset::SPECIALCHAR_CODE; } /// We don't need \begin_inset and \end_inset diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index b92763c79f..56c204c94b 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -174,12 +174,11 @@ InsetTabular::InsetTabular(Buffer const & buf, int rows, int columns) } -InsetTabular::InsetTabular(InsetTabular const & tab, Buffer const & buf, - bool same_id) - : UpdatableInset(tab, same_id), buffer(&buf) +InsetTabular::InsetTabular(InsetTabular const & tab, Buffer const & buf) + : UpdatableInset(tab), buffer(&buf) { tabular.reset(new LyXTabular(buf.params, - this, *(tab.tabular), same_id)); + this, *(tab.tabular))); the_locking_inset = 0; old_locking_inset = 0; locked = false; @@ -194,6 +193,26 @@ InsetTabular::InsetTabular(InsetTabular const & tab, Buffer const & buf, } +// InsetTabular::InsetTabular(InsetTabular const & tab, Buffer const & buf, +// bool same_id) +// : UpdatableInset(tab, same_id), buffer(&buf) +// { +// tabular.reset(new LyXTabular(buf.params, +// this, *(tab.tabular), same_id)); +// the_locking_inset = 0; +// old_locking_inset = 0; +// locked = false; +// oldcell = -1; +// actrow = actcell = 0; +// clearSelection(); +// need_update = INIT; +// in_update = false; +// in_reset_pos = 0; +// inset_x = 0; +// inset_y = 0; +// } + + InsetTabular::~InsetTabular() { InsetTabularMailer mailer(*this); @@ -201,12 +220,18 @@ InsetTabular::~InsetTabular() } -Inset * InsetTabular::clone(Buffer const & buf, bool same_id) const +Inset * InsetTabular::clone(Buffer const & buf) const { - return new InsetTabular(*this, buf, same_id); + return new InsetTabular(*this, buf); } +// Inset * InsetTabular::clone(Buffer const & buf, bool same_id) const +// { +// return new InsetTabular(*this, buf, same_id); +// } + + BufferView * InsetTabular::view() const { return buffer->getUser(); diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h index 3a3199c8a8..05063aa53a 100644 --- a/src/insets/insettabular.h +++ b/src/insets/insettabular.h @@ -76,11 +76,15 @@ public: /// InsetTabular(Buffer const &, int rows = 1, int columns = 1); /// - InsetTabular(InsetTabular const &, Buffer const &, bool same_id = false); + InsetTabular(InsetTabular const &, Buffer const &); + /// + //InsetTabular(InsetTabular const &, Buffer const &, bool same_id); /// ~InsetTabular(); /// - Inset * clone(Buffer const &, bool same_id = false) const; + Inset * clone(Buffer const &) const; + /// + //Inset * clone(Buffer const &, bool same_id) const; /// void read(Buffer const *, LyXLex &); /// diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 20599f503e..57dc7ccbba 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -143,18 +143,26 @@ InsetText::InsetText(BufferParams const & bp) paragraphs.begin()->layout(bp.getLyXTextClass().defaultLayout()); if (bp.tracking_changes) paragraphs.begin()->trackChanges(); - init(); + init(0); } -InsetText::InsetText(InsetText const & in, bool same_id) - : UpdatableInset(in, same_id), lt(0), in_update(false), do_resize(0), +InsetText::InsetText(InsetText const & in) + : UpdatableInset(in), lt(0), in_update(false), do_resize(0), do_reinit(false) { - init(&in, same_id); + init(&in); } +// InsetText::InsetText(InsetText const & in, bool same_id) +// : UpdatableInset(in, same_id), lt(0), in_update(false), do_resize(0), +// do_reinit(false) +// { +// init(&in, same_id); +// } + + InsetText & InsetText::operator=(InsetText const & it) { init(&it); @@ -162,15 +170,13 @@ InsetText & InsetText::operator=(InsetText const & it) } -void InsetText::init(InsetText const * ins, bool same_id) +void InsetText::init(InsetText const * ins) { if (ins) { - setParagraphData(ins->paragraphs, same_id); + setParagraphData(ins->paragraphs); autoBreakRows = ins->autoBreakRows; drawFrame_ = ins->drawFrame_; frame_color = ins->frame_color; - if (same_id) - id_ = ins->id_; } else { for_each(paragraphs.begin(), paragraphs.end(), boost::bind(&Paragraph::setInsetOwner, _1, this)); @@ -195,6 +201,39 @@ void InsetText::init(InsetText const * ins, bool same_id) } +// void InsetText::init(InsetText const * ins, bool same_id) +// { +// if (ins) { +// setParagraphData(ins->paragraphs, same_id); +// autoBreakRows = ins->autoBreakRows; +// drawFrame_ = ins->drawFrame_; +// frame_color = ins->frame_color; +// if (same_id) +// id_ = ins->id_; +// } else { +// for_each(paragraphs.begin(), paragraphs.end(), +// boost::bind(&Paragraph::setInsetOwner, _1, this)); + +// the_locking_inset = 0; +// drawFrame_ = NEVER; +// frame_color = LColor::insetframe; +// autoBreakRows = false; +// } +// top_y = 0; +// old_max_width = 0; +// no_selection = true; +// need_update = FULL; +// drawTextXOffset = 0; +// drawTextYOffset = 0; +// locked = false; +// old_par = 0; +// last_drawn_width = -1; +// cached_bview = 0; +// sstate.lpar = 0; +// in_insetAllowed = false; +// } + + InsetText::~InsetText() { paragraphs.clear(); @@ -226,12 +265,18 @@ void InsetText::clear(bool just_mark_erased) } -Inset * InsetText::clone(Buffer const &, bool same_id) const +Inset * InsetText::clone(Buffer const &) const { - return new InsetText(*this, same_id); + return new InsetText(*this); } +// Inset * InsetText::clone(Buffer const &, bool same_id) const +// { +// return new InsetText(*this, same_id); +// } + + void InsetText::write(Buffer const * buf, ostream & os) const { os << "Text\n"; @@ -1940,39 +1985,22 @@ int InsetText::getMaxWidth(BufferView * bv, UpdatableInset const * inset) const } -void InsetText::setParagraphData(ParagraphList const & plist, bool same_id) +void InsetText::setParagraphData(ParagraphList const & plist) { // we have to unlock any locked inset otherwise we're in troubles the_locking_inset = 0; - #warning CHECK not adhering to same_id here might wreck havoc (Lgb) // But it it makes no difference that is a lot better. - if (same_id) { - lyxerr << "Same_id called with 'true'" << endl; - lyxerr << "Please report this to the list." << endl; - - paragraphs.clear(); - ParagraphList::iterator it = plist.begin(); - ParagraphList::iterator end = plist.end(); - for (; it != end; ++it) { - int const id = it->id(); - paragraphs.push_back(*it); - Paragraph & tmp = paragraphs.back(); - tmp.setInsetOwner(this); - tmp.id(id); - } - } else { #warning FIXME. - // See if this can be simplified when std::list is in effect. - paragraphs.clear(); + // See if this can be simplified when std::list is in effect. + paragraphs.clear(); - ParagraphList::iterator it = plist.begin(); - ParagraphList::iterator end = plist.end(); - for (; it != end; ++it) { - paragraphs.push_back(*it); - Paragraph & tmp = paragraphs.back(); - tmp.setInsetOwner(this); - } + ParagraphList::iterator it = plist.begin(); + ParagraphList::iterator end = plist.end(); + for (; it != end; ++it) { + paragraphs.push_back(*it); + Paragraph & tmp = paragraphs.back(); + tmp.setInsetOwner(this); } reinitLyXText(); @@ -1980,6 +2008,46 @@ void InsetText::setParagraphData(ParagraphList const & plist, bool same_id) } +// void InsetText::setParagraphData(ParagraphList const & plist, bool same_id) +// { +// // we have to unlock any locked inset otherwise we're in troubles +// the_locking_inset = 0; + +// #warning CHECK not adhering to same_id here might wreck havoc (Lgb) +// // But it it makes no difference that is a lot better. +// if (same_id) { +// lyxerr << "Same_id called with 'true'" << endl; +// lyxerr << "Please report this to the list." << endl; + +// paragraphs.clear(); +// ParagraphList::iterator it = plist.begin(); +// ParagraphList::iterator end = plist.end(); +// for (; it != end; ++it) { +// int const id = it->id(); +// paragraphs.push_back(*it); +// Paragraph & tmp = paragraphs.back(); +// tmp.setInsetOwner(this); +// tmp.id(id); +// } +// } else { +// #warning FIXME. +// // See if this can be simplified when std::list is in effect. +// paragraphs.clear(); + +// ParagraphList::iterator it = plist.begin(); +// ParagraphList::iterator end = plist.end(); +// for (; it != end; ++it) { +// paragraphs.push_back(*it); +// Paragraph & tmp = paragraphs.back(); +// tmp.setInsetOwner(this); +// } +// } + +// reinitLyXText(); +// need_update = INIT; +// } + + void InsetText::markNew(bool track_changes) { ParagraphList::iterator pit = paragraphs.begin(); diff --git a/src/insets/insettext.h b/src/insets/insettext.h index c42a2d0bae..2f2c2886df 100644 --- a/src/insets/insettext.h +++ b/src/insets/insettext.h @@ -73,11 +73,16 @@ public: InsetText(BufferParams const &); /// explicit - InsetText(InsetText const &, bool same_id = false); + InsetText(InsetText const &); + /// + //explicit + //InsetText(InsetText const &, bool same_id); /// ~InsetText(); /// - Inset * clone(Buffer const &, bool same_id = false) const; + Inset * clone(Buffer const &) const; + /// + //Inset * clone(Buffer const &, bool same_id) const; /// InsetText & operator=(InsetText const & it); /// empty inset to empty par, or just mark as erased @@ -147,11 +152,15 @@ public: /// int getMaxWidth(BufferView *, UpdatableInset const *) const; /// - void init(InsetText const * ins = 0, bool same_id = false); + void init(InsetText const * ins); + /// + //void init(InsetText const * ins, bool same_id); /// void writeParagraphData(Buffer const *, std::ostream &) const; /// - void setParagraphData(ParagraphList const &, bool same_id = false); + void setParagraphData(ParagraphList const &); + /// + //void setParagraphData(ParagraphList const &, bool same_id); /// void setText(string const &, LyXFont const &); /// diff --git a/src/insets/insettheorem.h b/src/insets/insettheorem.h index bbb09b7920..e7e457d102 100644 --- a/src/insets/insettheorem.h +++ b/src/insets/insettheorem.h @@ -25,7 +25,9 @@ public: /// void write(Buffer const * buf, std::ostream & os) const; /// - virtual Inset * clone(Buffer const &, bool same_id = false) const; + virtual Inset * clone(Buffer const &) const; + /// + //virtual Inset * clone(Buffer const &, bool same_id) const; /// Inset::Code lyxCode() const { return Inset::THEOREM_CODE; } /// diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C index 46137a94c7..ae53a76ee9 100644 --- a/src/insets/insettoc.C +++ b/src/insets/insettoc.C @@ -23,11 +23,16 @@ using std::vector; using std::ostream; -InsetTOC::InsetTOC(InsetCommandParams const & p, bool same_id) - : InsetCommand(p, same_id) +InsetTOC::InsetTOC(InsetCommandParams const & p) + : InsetCommand(p) {} +// InsetTOC::InsetTOC(InsetCommandParams const & p, bool same_id) +// : InsetCommand(p, same_id) +// {} + + InsetTOC::~InsetTOC() { InsetCommandMailer mailer("toc", *this); diff --git a/src/insets/insettoc.h b/src/insets/insettoc.h index 22edad4b77..bc4c696cf8 100644 --- a/src/insets/insettoc.h +++ b/src/insets/insettoc.h @@ -20,14 +20,20 @@ class InsetTOC : public InsetCommand { public: /// - InsetTOC(InsetCommandParams const &, bool same_id = false); + InsetTOC(InsetCommandParams const &); + /// + //InsetTOC(InsetCommandParams const &, bool same_id); /// ~InsetTOC(); /// - virtual Inset * clone(Buffer const &, bool same_id = false) const { - return new InsetTOC(params(), same_id); + virtual Inset * clone(Buffer const &) const { + return new InsetTOC(params()); } /// + //virtual Inset * clone(Buffer const &, bool same_id) const { + // return new InsetTOC(params(), same_id); + //} + /// dispatch_result localDispatch(FuncRequest const & cmd); /// string const getScreenLabel(Buffer const *) const; diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C index cff4ab9a80..16eaf04797 100644 --- a/src/insets/inseturl.C +++ b/src/insets/inseturl.C @@ -24,11 +24,16 @@ using std::ostream; -InsetUrl::InsetUrl(InsetCommandParams const & p, bool) +InsetUrl::InsetUrl(InsetCommandParams const & p) : InsetCommand(p) {} +// InsetUrl::InsetUrl(InsetCommandParams const & p, bool) +// : InsetCommand(p, false) +// {} + + InsetUrl::~InsetUrl() { InsetCommandMailer("url", *this).hideDialog(); diff --git a/src/insets/inseturl.h b/src/insets/inseturl.h index dd93b7bc84..756ec2402a 100644 --- a/src/insets/inseturl.h +++ b/src/insets/inseturl.h @@ -23,14 +23,21 @@ class InsetUrl : public InsetCommand { public: /// explicit - InsetUrl(InsetCommandParams const &, bool same_id = false); + InsetUrl(InsetCommandParams const &); + /// + //explicit + //InsetUrl(InsetCommandParams const &, bool same_id); /// ~InsetUrl(); /// - virtual Inset * clone(Buffer const &, bool same_id = false) const { - return new InsetUrl(params(), same_id); + virtual Inset * clone(Buffer const &) const { + return new InsetUrl(params()); } /// + //virtual Inset * clone(Buffer const &, bool same_id) const { + // return new InsetUrl(params(), same_id); + //} + /// dispatch_result localDispatch(FuncRequest const & cmd); /// Inset::Code lyxCode() const { return Inset::URL_CODE; } diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C index 97cd8d3b05..f1249091e1 100644 --- a/src/insets/insetwrap.C +++ b/src/insets/insetwrap.C @@ -75,11 +75,16 @@ InsetWrap::InsetWrap(BufferParams const & bp, string const & type) } -InsetWrap::InsetWrap(InsetWrap const & in, bool same_id) - : InsetCollapsable(in, same_id), params_(in.params_) +InsetWrap::InsetWrap(InsetWrap const & in) + : InsetCollapsable(in), params_(in.params_) {} +// InsetWrap::InsetWrap(InsetWrap const & in, bool same_id) +// : InsetCollapsable(in, same_id), params_(in.params_) +// {} + + InsetWrap::~InsetWrap() { InsetWrapMailer mailer(*this); @@ -180,12 +185,18 @@ void InsetWrap::validate(LaTeXFeatures & features) const } -Inset * InsetWrap::clone(Buffer const &, bool same_id) const +Inset * InsetWrap::clone(Buffer const &) const { - return new InsetWrap(*const_cast(this), same_id); + return new InsetWrap(*const_cast(this)); } +// Inset * InsetWrap::clone(Buffer const &, bool same_id) const +// { +// return new InsetWrap(*const_cast(this), same_id); +// } + + string const InsetWrap::editMessage() const { return _("Opened Wrap Inset"); @@ -307,7 +318,7 @@ void InsetWrapMailer::string2params(string const & in, if (in.empty()) return; - + istringstream data(STRCONV(in)); LyXLex lex(0,0); lex.setStream(data); diff --git a/src/insets/insetwrap.h b/src/insets/insetwrap.h index a6c029190f..bc5b9896e1 100644 --- a/src/insets/insetwrap.h +++ b/src/insets/insetwrap.h @@ -22,7 +22,7 @@ struct InsetWrapParams { void write(std::ostream &) const; /// void read(LyXLex &); - + /// string type; /// @@ -39,11 +39,13 @@ public: /// InsetWrap(BufferParams const &, string const &); /// - InsetWrap(InsetWrap const &, bool same_id = false); + InsetWrap(InsetWrap const &); + /// + //InsetWrap(InsetWrap const &, bool same_id); /// ~InsetWrap(); /// - virtual dispatch_result localDispatch(FuncRequest const & cmd); + virtual dispatch_result localDispatch(FuncRequest const & cmd); /// void write(Buffer const * buf, std::ostream & os) const; /// @@ -51,7 +53,9 @@ public: /// void validate(LaTeXFeatures & features) const; /// - Inset * clone(Buffer const &, bool same_id = false) const; + Inset * clone(Buffer const &) const; + /// + //Inset * clone(Buffer const &, bool same_id) const; /// Inset::Code lyxCode() const { return Inset::WRAP_CODE; } /// diff --git a/src/insets/updatableinset.C b/src/insets/updatableinset.C index eef6a357aa..d03c3f4677 100644 --- a/src/insets/updatableinset.C +++ b/src/insets/updatableinset.C @@ -30,11 +30,16 @@ UpdatableInset::UpdatableInset() {} -UpdatableInset::UpdatableInset(UpdatableInset const & in, bool same_id) - : Inset(in, same_id), block_drawing_(false) +UpdatableInset::UpdatableInset(UpdatableInset const & in) + : Inset(in), block_drawing_(false) {} +// UpdatableInset::UpdatableInset(UpdatableInset const & in, bool same_id) +// : Inset(in, same_id), block_drawing_(false) +// {} + + void UpdatableInset::insetUnlock(BufferView *) { lyxerr[Debug::INFO] << "Inset Unlock" << std::endl; diff --git a/src/insets/updatableinset.h b/src/insets/updatableinset.h index a3ddeaaaa1..6672ab38e2 100644 --- a/src/insets/updatableinset.h +++ b/src/insets/updatableinset.h @@ -49,7 +49,9 @@ public: /// UpdatableInset(); /// - UpdatableInset(UpdatableInset const & in, bool same_id = false); + UpdatableInset(UpdatableInset const & in); + /// + //UpdatableInset(UpdatableInset const & in, bool same_id); /// check if the font of the char we want inserting is correct /// and modify it if it is not. @@ -122,7 +124,7 @@ public: /// find the next change in the inset virtual bool nextChange(BufferView * bv, lyx::pos_type & length); - + /// // needed for search/replace functionality /// diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 6365686d85..e4e6c52362 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,6 @@ +2003-05-26 Lars Gullik Bjønnes + + * remove same_id from function signatures, adjust 2003-05-19 André Pönitz @@ -49,15 +52,15 @@ * math_cursor.C: boost::format -> bformat all over the place 2003-05-06 Ling Li - - * Makefile, math_makeboxinset.[Ch]: - * math_factory.C (createMathInset): - * math_parser.C (parse1): New support for \makebox. - - * math_nestinset.C (drawMarkers, drawMarkers2): - * math_boxinset.C, math_frameboxinset.C (draw): - Fix spacing and marker length. - + + * Makefile, math_makeboxinset.[Ch]: + * math_factory.C (createMathInset): + * math_parser.C (parse1): New support for \makebox. + + * math_nestinset.C (drawMarkers, drawMarkers2): + * math_boxinset.C, math_frameboxinset.C (draw): + Fix spacing and marker length. + 2003-05-03 John Levon * formula.C: @@ -117,10 +120,10 @@ 2003-03-05 Ling Li * math_casesinset.[Ch] (validate): request feature "amsmath" - + 2003-03-04 Jean-Marc Lasgouttes - - * math_braceinset.C (metrics): fix computation of descent + + * math_braceinset.C (metrics): fix computation of descent 2003-03-04 Angus Leeming diff --git a/src/mathed/formula.C b/src/mathed/formula.C index 79ff1b1666..2a6575b9b3 100644 --- a/src/mathed/formula.C +++ b/src/mathed/formula.C @@ -114,12 +114,18 @@ InsetFormula::~InsetFormula() {} -Inset * InsetFormula::clone(Buffer const &, bool) const +Inset * InsetFormula::clone(Buffer const &) const { return new InsetFormula(*this); } +// Inset * InsetFormula::clone(Buffer const &, bool) const +// { +// return new InsetFormula(*this); +// } + + void InsetFormula::write(Buffer const *, ostream & os) const { WriteStream wi(os, false, false); @@ -190,7 +196,7 @@ void InsetFormula::read(Buffer const *, LyXLex & lex) lyxerr << "this is size 1\n"; if (par_->cell(0)[0]->asFontInset()) { lyxerr << "this is a font inset \n"; - lyxerr << "replacing " << par_.nucleus()->cell(0) << + lyxerr << "replacing " << par_.nucleus()->cell(0) << " with " << par_->cell(0)[0]->cell(0) << "\n"; } } @@ -331,4 +337,3 @@ string const InsetFormula::PreviewImpl::latexString() const parent().par_->write(wi); return STRCONV(ls.str()); } - diff --git a/src/mathed/formula.h b/src/mathed/formula.h index fc3b49fbab..8074c37f86 100644 --- a/src/mathed/formula.h +++ b/src/mathed/formula.h @@ -54,7 +54,9 @@ public: int docbook(Buffer const *, std::ostream &, bool mixcont) const; /// - Inset * clone(Buffer const &, bool same_id = false) const; + Inset * clone(Buffer const &) const; + /// + //Inset * clone(Buffer const &, bool same_id) const; /// void validate(LaTeXFeatures & features) const; /// diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h index e33559d6bc..399811b963 100644 --- a/src/mathed/formulabase.h +++ b/src/mathed/formulabase.h @@ -30,7 +30,9 @@ public: /// InsetFormulaBase(); /// - Inset * clone(Buffer const &, bool same_id = false) const = 0; + Inset * clone(Buffer const &) const = 0; + /// + //Inset * clone(Buffer const &, bool same_id) const = 0; /// virtual void draw(BufferView *,LyXFont const &, int, float &) const = 0; /// lowest x coordinate diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index d64825aa63..0358a4a328 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -66,12 +66,18 @@ InsetFormulaMacro::InsetFormulaMacro(string const & s) } -Inset * InsetFormulaMacro::clone(Buffer const &, bool) const +Inset * InsetFormulaMacro::clone(Buffer const &) const { return new InsetFormulaMacro(*this); } +// Inset * InsetFormulaMacro::clone(Buffer const &, bool) const +// { +// return new InsetFormulaMacro(*this); +// } + + void InsetFormulaMacro::write(Buffer const *, ostream & os) const { os << "FormulaMacro "; diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h index 0b73fb94ae..a9545decaa 100644 --- a/src/mathed/formulamacro.h +++ b/src/mathed/formulamacro.h @@ -52,7 +52,9 @@ public: int docbook(Buffer const *, std::ostream &, bool mixcont) const; /// - Inset * clone(Buffer const &, bool same_id = false) const; + Inset * clone(Buffer const &) const; + /// + //Inset * clone(Buffer const &, bool same_id) const; /// Inset::Code lyxCode() const; /// diff --git a/src/paragraph.C b/src/paragraph.C index 4034a5624c..d3076b71ec 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -99,7 +99,7 @@ Paragraph::Paragraph(Paragraph const & lp) InsetList::iterator it = insetlist.begin(); InsetList::iterator end = insetlist.end(); for (; it != end; ++it) { - it.setInset(it.getInset()->clone(**buffer_, false)); + it.setInset(it.getInset()->clone(**buffer_)); // tell the new inset who is the boss now it.getInset()->parOwner(this); } diff --git a/src/tabular.C b/src/tabular.C index 51330930dc..295aaa3417 100644 --- a/src/tabular.C +++ b/src/tabular.C @@ -117,23 +117,11 @@ LyXTabular::LyXTabular(BufferParams const & bp, LyXTabular::LyXTabular(BufferParams const & bp, - InsetTabular * inset, LyXTabular const & lt, - bool same_id) + InsetTabular * inset, LyXTabular const & lt) { owner_ = inset; cur_cell = -1; Init(bp, lt.rows_, lt.columns_, <); - // we really should change again to have InsetText as a pointer - // and allocate it then we would not have to do this stuff all - // double! - if (same_id) { - for (int i = 0; i < rows_; ++i) { - for (int j = 0; j < columns_; ++j) { - cell_info[i][j].inset.id(lt.cell_info[i][j].inset.id()); - cell_info[i][j].inset.setParagraphData(lt.cell_info[i][j].inset.paragraphs, true); - } - } - } #if 0 #ifdef WITH_WARNINGS #warning Jürgen, can you make it the other way round. So that copy assignment depends on the copy constructor and not the other way. (Lgb) @@ -143,6 +131,33 @@ LyXTabular::LyXTabular(BufferParams const & bp, } +// LyXTabular::LyXTabular(BufferParams const & bp, +// InsetTabular * inset, LyXTabular const & lt, +// bool same_id) +// { +// owner_ = inset; +// cur_cell = -1; +// Init(bp, lt.rows_, lt.columns_, <); +// // we really should change again to have InsetText as a pointer +// // and allocate it then we would not have to do this stuff all +// // double! +// if (same_id) { +// for (int i = 0; i < rows_; ++i) { +// for (int j = 0; j < columns_; ++j) { +// cell_info[i][j].inset.id(lt.cell_info[i][j].inset.id()); +// cell_info[i][j].inset.setParagraphData(lt.cell_info[i][j].inset.paragraphs, true); +// } +// } +// } +// #if 0 +// #ifdef WITH_WARNINGS +// #warning Jürgen, can you make it the other way round. So that copy assignment depends on the copy constructor and not the other way. (Lgb) +// #endif +// operator=(lt); +// #endif +// } + + LyXTabular::LyXTabular(Buffer const * buf, InsetTabular * inset, LyXLex & lex) { owner_ = inset; @@ -177,9 +192,9 @@ LyXTabular & LyXTabular::operator=(LyXTabular const & lt) LyXTabular * LyXTabular::clone(BufferParams const & bp, - InsetTabular * inset, bool same_id) + InsetTabular * inset) { - LyXTabular * result = new LyXTabular(bp, inset, *this, same_id); + LyXTabular * result = new LyXTabular(bp, inset, *this); #if 0 // don't know if this is good but I need to Clone also // the text-insets here, this is for the Undo-facility! @@ -194,6 +209,24 @@ LyXTabular * LyXTabular::clone(BufferParams const & bp, } +// LyXTabular * LyXTabular::clone(BufferParams const & bp, +// InsetTabular * inset, bool same_id) +// { +// LyXTabular * result = new LyXTabular(bp, inset, *this, same_id); +// #if 0 +// // don't know if this is good but I need to Clone also +// // the text-insets here, this is for the Undo-facility! +// for (int i = 0; i < rows_; ++i) { +// for (int j = 0; j < columns_; ++j) { +// result->cell_info[i][j].inset = cell_info[i][j].inset; +// result->cell_info[i][j].inset.setOwner(inset); +// } +// } +// #endif +// return result; +// } + + /* activates all lines and sets all widths to 0 */ void LyXTabular::Init(BufferParams const & bp, int rows_arg, int columns_arg, LyXTabular const * lt) diff --git a/src/tabular.h b/src/tabular.h index dd18d9dbd4..92916cd7a8 100644 --- a/src/tabular.h +++ b/src/tabular.h @@ -180,15 +180,20 @@ public: InsetTabular *, int columns_arg, int rows_arg); /// LyXTabular(BufferParams const &, - InsetTabular *, LyXTabular const &, bool same_id = false); + InsetTabular *, LyXTabular const &); + /// + //LyXTabular(BufferParams const &, + // InsetTabular *, LyXTabular const &, bool same_id = false); /// explicit LyXTabular(Buffer const *, InsetTabular *, LyXLex & lex); /// LyXTabular & operator=(LyXTabular const &); /// - LyXTabular * clone(BufferParams const &, - InsetTabular *, bool same_id = false); + LyXTabular * clone(BufferParams const &, InsetTabular *); + /// + //LyXTabular * clone(BufferParams const &, + // InsetTabular *, bool same_id = false); /// Returns true if there is a topline, returns false if not bool TopLine(int cell, bool onlycolumn = false) const; -- 2.39.2