From 183239b7def8ca0e51432f2d88891d4b9f055953 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 24 Nov 2004 21:58:42 +0000 Subject: [PATCH] rename priv_dispatch to doDispatch git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9301 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 4 ++++ src/insets/insetbase.C | 4 ++-- src/insets/insetbase.h | 2 +- src/insets/insetbibitem.C | 4 ++-- src/insets/insetbibitem.h | 2 +- src/insets/insetbibtex.C | 4 ++-- src/insets/insetbibtex.h | 2 +- src/insets/insetbox.C | 6 +++--- src/insets/insetbox.h | 2 +- src/insets/insetbranch.C | 8 ++++---- src/insets/insetbranch.h | 2 +- src/insets/insetcharstyle.C | 6 +++--- src/insets/insetcharstyle.h | 2 +- src/insets/insetcollapsable.C | 24 ++++++++++++------------ src/insets/insetcollapsable.h | 2 +- src/insets/insetcommand.C | 4 ++-- src/insets/insetcommand.h | 2 +- src/insets/insetert.C | 6 +++--- src/insets/insetert.h | 2 +- src/insets/insetexternal.C | 4 ++-- src/insets/insetexternal.h | 2 +- src/insets/insetfloat.C | 6 +++--- src/insets/insetfloat.h | 2 +- src/insets/insetgraphics.C | 4 ++-- src/insets/insetgraphics.h | 2 +- src/insets/insetinclude.C | 4 ++-- src/insets/insetinclude.h | 2 +- src/insets/insetlabel.C | 4 ++-- src/insets/insetlabel.h | 2 +- src/insets/insetnote.C | 6 +++--- src/insets/insetnote.h | 2 +- src/insets/insetref.C | 4 ++-- src/insets/insetref.h | 2 +- src/insets/insettabular.C | 2 +- src/insets/insettabular.h | 5 +++-- src/insets/insettext.C | 6 +++--- src/insets/insettext.h | 2 +- src/insets/insetvspace.C | 4 ++-- src/insets/insetvspace.h | 4 ++-- src/insets/insetwrap.C | 6 +++--- src/insets/insetwrap.h | 2 +- src/insets/updatableinset.C | 2 +- src/insets/updatableinset.h | 2 +- src/lfuns.h | 4 ++-- src/mathed/ChangeLog | 4 ++++ src/mathed/math_gridinset.C | 6 +++--- src/mathed/math_gridinset.h | 3 +-- src/mathed/math_hullinset.C | 8 ++++---- src/mathed/math_hullinset.h | 2 +- src/mathed/math_mboxinset.C | 2 +- src/mathed/math_mboxinset.h | 5 ++--- src/mathed/math_nestinset.C | 4 ++-- src/mathed/math_nestinset.h | 2 +- src/mathed/math_scriptinset.C | 4 ++-- src/mathed/math_scriptinset.h | 3 +-- src/mathed/ref_inset.C | 6 +++--- src/mathed/ref_inset.h | 3 +-- 57 files changed, 115 insertions(+), 110 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 817d078679..8cc8566dd6 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2004-11-24 Lars Gullik Bjønnes + + * Most insets: rename priv_dispatch to doDispatch + 2004-11-24 Georg Baum * insettabular.C (tabularFeatures): fix multicolumn handling diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C index 9968f41d73..0760466452 100644 --- a/src/insets/insetbase.C +++ b/src/insets/insetbase.C @@ -124,11 +124,11 @@ void InsetBase::dispatch(LCursor & cur, FuncRequest & cmd) { cur.needsUpdate(); cur.dispatched(); - priv_dispatch(cur, cmd); + doDispatch(cur, cmd); } -void InsetBase::priv_dispatch(LCursor & cur, FuncRequest &) +void InsetBase::doDispatch(LCursor & cur, FuncRequest &) { cur.noUpdate(); cur.undispatched(); diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h index adb1bd0944..90a17044e9 100644 --- a/src/insets/insetbase.h +++ b/src/insets/insetbase.h @@ -386,7 +386,7 @@ protected: InsetBase(); InsetBase(InsetBase const &); // the real dispatcher - virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: virtual std::auto_ptr doClone() const = 0; }; diff --git a/src/insets/insetbibitem.C b/src/insets/insetbibitem.C index f90e68efec..7338afbbbf 100644 --- a/src/insets/insetbibitem.C +++ b/src/insets/insetbibitem.C @@ -55,7 +55,7 @@ auto_ptr InsetBibitem::doClone() const } -void InsetBibitem::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetBibitem::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { @@ -71,7 +71,7 @@ void InsetBibitem::priv_dispatch(LCursor & cur, FuncRequest & cmd) } default: - InsetCommand::priv_dispatch(cur, cmd); + InsetCommand::doDispatch(cur, cmd); break; } } diff --git a/src/insets/insetbibitem.h b/src/insets/insetbibitem.h index b91d9f0159..df192ae503 100644 --- a/src/insets/insetbibitem.h +++ b/src/insets/insetbibitem.h @@ -49,7 +49,7 @@ public: OutputParams const &) const; protected: /// - virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: virtual std::auto_ptr doClone() const; diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C index 22c3886751..73ca790e50 100644 --- a/src/insets/insetbibtex.C +++ b/src/insets/insetbibtex.C @@ -68,7 +68,7 @@ std::auto_ptr InsetBibtex::doClone() const } -void InsetBibtex::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetBibtex::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { @@ -81,7 +81,7 @@ void InsetBibtex::priv_dispatch(LCursor & cur, FuncRequest & cmd) } default: - InsetCommand::priv_dispatch(cur, cmd); + InsetCommand::doDispatch(cur, cmd); break; } } diff --git a/src/insets/insetbibtex.h b/src/insets/insetbibtex.h index 1ab4d85694..f2148395a0 100644 --- a/src/insets/insetbibtex.h +++ b/src/insets/insetbibtex.h @@ -45,7 +45,7 @@ public: /// void validate(LaTeXFeatures &) const; protected: - virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: virtual std::auto_ptr doClone() const; diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C index e1836d5e23..1007564430 100644 --- a/src/insets/insetbox.C +++ b/src/insets/insetbox.C @@ -170,7 +170,7 @@ bool InsetBox::showInsetDialog(BufferView * bv) const } -void InsetBox::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetBox::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { @@ -190,11 +190,11 @@ void InsetBox::priv_dispatch(LCursor & cur, FuncRequest & cmd) InsetBoxMailer(*this).showDialog(&cur.bv()); break; } - InsetCollapsable::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); break; default: - InsetCollapsable::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); break; } } diff --git a/src/insets/insetbox.h b/src/insets/insetbox.h index a29ac78520..a15b0c5366 100644 --- a/src/insets/insetbox.h +++ b/src/insets/insetbox.h @@ -101,7 +101,7 @@ public: }; protected: InsetBox(InsetBox const &); - virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: friend class InsetBoxParams; diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C index d199b7ce06..8eae1a7a0a 100644 --- a/src/insets/insetbranch.C +++ b/src/insets/insetbranch.C @@ -111,7 +111,7 @@ bool InsetBranch::showInsetDialog(BufferView * bv) const } -void InsetBranch::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetBranch::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { case LFUN_INSET_MODIFY: { @@ -124,7 +124,7 @@ void InsetBranch::priv_dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_MOUSE_PRESS: if (cmd.button() != mouse_button::button3) - InsetCollapsable::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); else cur.undispatched(); break; @@ -137,7 +137,7 @@ void InsetBranch::priv_dispatch(LCursor & cur, FuncRequest & cmd) if (cmd.button() == mouse_button::button3 && hitButton(cmd)) InsetBranchMailer(*this).showDialog(&cur.bv()); else - InsetCollapsable::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); break; @@ -178,7 +178,7 @@ void InsetBranch::priv_dispatch(LCursor & cur, FuncRequest & cmd) break; default: - InsetCollapsable::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); break; } } diff --git a/src/insets/insetbranch.h b/src/insets/insetbranch.h index f0c002ba05..9d5d3cd48c 100644 --- a/src/insets/insetbranch.h +++ b/src/insets/insetbranch.h @@ -77,7 +77,7 @@ public: protected: InsetBranch(InsetBranch const &); - virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: friend class InsetBranchParams; diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C index 9d8e51eb43..444f647e92 100644 --- a/src/insets/insetcharstyle.C +++ b/src/insets/insetcharstyle.C @@ -163,7 +163,7 @@ void InsetCharStyle::getDrawFont(LyXFont & font) const } -void InsetCharStyle::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetCharStyle::doDispatch(LCursor & cur, FuncRequest & cmd) { setStatus(Inlined); switch (cmd.action) { @@ -171,11 +171,11 @@ void InsetCharStyle::priv_dispatch(LCursor & cur, FuncRequest & cmd) if (cmd.button() == mouse_button::button3) has_label_ = !has_label_; else - InsetText::priv_dispatch(cur, cmd); + InsetText::doDispatch(cur, cmd); break; default: - InsetCollapsable::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); break; } } diff --git a/src/insets/insetcharstyle.h b/src/insets/insetcharstyle.h index c926e0ccf1..ae06acf1b8 100644 --- a/src/insets/insetcharstyle.h +++ b/src/insets/insetcharstyle.h @@ -78,7 +78,7 @@ public: protected: InsetCharStyle(InsetCharStyle const &); - virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); /// bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const; diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C index 633b1d60ec..52d6723e16 100644 --- a/src/insets/insetcollapsable.C +++ b/src/insets/insetcollapsable.C @@ -251,30 +251,30 @@ InsetBase * InsetCollapsable::editXY(LCursor & cur, int x, int y) const } -void InsetCollapsable::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetCollapsable::doDispatch(LCursor & cur, FuncRequest & cmd) { -// lyxerr << "InsetCollapsable::priv_dispatch (begin): cmd: " << cmd -// << " button y: " << button_dim.y2 -// << " coll/inline/open: " << status_ << endl; +// lyxerr << "InsetCollapsable::doDispatch (begin): cmd: " << cmd +// << " button y: " << button_dim.y2 +// << " coll/inline/open: " << status_ << endl; - lyxerr << "InsetCollapsable::priv_dispatch (begin): cmd: " << cmd + lyxerr << "InsetCollapsable::doDispatch (begin): cmd: " << cmd << " cur: " << cur << " bvcur: " << cur.bv().cursor() << endl; switch (cmd.action) { case LFUN_MOUSE_PRESS: if (status_ == Inlined) - InsetText::priv_dispatch(cur, cmd); + InsetText::doDispatch(cur, cmd); else if (status_ == Open && !hitButton(cmd)) - InsetText::priv_dispatch(cur, cmd); + InsetText::doDispatch(cur, cmd); else cur.noUpdate(); break; case LFUN_MOUSE_MOTION: if (status_ == Inlined) - InsetText::priv_dispatch(cur, cmd); + InsetText::doDispatch(cur, cmd); else if (status_ == Open && !hitButton(cmd)) - InsetText::priv_dispatch(cur, cmd); + InsetText::doDispatch(cur, cmd); break; case LFUN_MOUSE_RELEASE: @@ -300,14 +300,14 @@ void InsetCollapsable::priv_dispatch(LCursor & cur, FuncRequest & cmd) cur.bv().cursor() = cur; } else { lyxerr << "InsetCollapsable::lfunMouseRelease 3" << endl; - InsetText::priv_dispatch(cur, cmd); + InsetText::doDispatch(cur, cmd); } break; } case Inlined: lyxerr << "InsetCollapsable::lfunMouseRelease 4" << endl; - InsetText::priv_dispatch(cur, cmd); + InsetText::doDispatch(cur, cmd); break; } break; @@ -331,7 +331,7 @@ void InsetCollapsable::priv_dispatch(LCursor & cur, FuncRequest & cmd) break; default: - InsetText::priv_dispatch(cur, cmd); + InsetText::doDispatch(cur, cmd); break; } } diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h index 335c0ddb34..8322ca1705 100644 --- a/src/insets/insetcollapsable.h +++ b/src/insets/insetcollapsable.h @@ -89,7 +89,7 @@ protected: /// void setStatus(CollapseStatus st); /// - void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); /// void dimension_collapsed(Dimension &) const; /// diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C index 77a357b05e..bc4d9bf7fa 100644 --- a/src/insets/insetcommand.C +++ b/src/insets/insetcommand.C @@ -98,7 +98,7 @@ int InsetCommand::docbook(Buffer const &, ostream &, } -void InsetCommand::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetCommand::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { case LFUN_INSET_REFRESH: @@ -129,7 +129,7 @@ void InsetCommand::priv_dispatch(LCursor & cur, FuncRequest & cmd) } default: - InsetOld::priv_dispatch(cur, cmd); + InsetOld::doDispatch(cur, cmd); break; } diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h index 1548d7c84d..3848a76a40 100644 --- a/src/insets/insetcommand.h +++ b/src/insets/insetcommand.h @@ -76,7 +76,7 @@ public: protected: /// - void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); /// std::string const getCommand() const { return p_.getCommand(); } /// diff --git a/src/insets/insetert.C b/src/insets/insetert.C index f8de91372a..d81362a134 100644 --- a/src/insets/insetert.C +++ b/src/insets/insetert.C @@ -209,9 +209,9 @@ int InsetERT::docbook(Buffer const &, ostream & os, } -void InsetERT::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetERT::doDispatch(LCursor & cur, FuncRequest & cmd) { - //lyxerr << "\nInsetERT::priv_dispatch (begin): cmd: " << cmd << endl; + //lyxerr << "\nInsetERT::doDispatch (begin): cmd: " << cmd << endl; switch (cmd.action) { case LFUN_INSET_MODIFY: { @@ -222,7 +222,7 @@ void InsetERT::priv_dispatch(LCursor & cur, FuncRequest & cmd) } default: - InsetCollapsable::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); break; } } diff --git a/src/insets/insetert.h b/src/insets/insetert.h index 9cb08225e3..40b9e139a2 100644 --- a/src/insets/insetert.h +++ b/src/insets/insetert.h @@ -71,7 +71,7 @@ public: protected: InsetERT(InsetERT const &); /// - virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); /// bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const; private: diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C index 33e477c44d..15e572ac83 100644 --- a/src/insets/insetexternal.C +++ b/src/insets/insetexternal.C @@ -433,7 +433,7 @@ void InsetExternal::statusChanged() const } -void InsetExternal::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetExternal::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { @@ -462,7 +462,7 @@ void InsetExternal::priv_dispatch(LCursor & cur, FuncRequest & cmd) break; default: - InsetOld::priv_dispatch(cur, cmd); + InsetOld::doDispatch(cur, cmd); } } diff --git a/src/insets/insetexternal.h b/src/insets/insetexternal.h index 34901ec1d7..3a68c55d1c 100644 --- a/src/insets/insetexternal.h +++ b/src/insets/insetexternal.h @@ -148,7 +148,7 @@ public: protected: InsetExternal(InsetExternal const &); /// - void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: virtual std::auto_ptr doClone() const; diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C index 156bd62f70..87c8482532 100644 --- a/src/insets/insetfloat.C +++ b/src/insets/insetfloat.C @@ -154,7 +154,7 @@ InsetFloat::~InsetFloat() } -void InsetFloat::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetFloat::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { @@ -180,12 +180,12 @@ void InsetFloat::priv_dispatch(LCursor & cur, FuncRequest & cmd) InsetFloatMailer(*this).showDialog(&cur.bv()); break; } - InsetCollapsable::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); break; } default: - InsetCollapsable::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); break; } } diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h index a5b4867fba..1bb48f78af 100644 --- a/src/insets/insetfloat.h +++ b/src/insets/insetfloat.h @@ -80,7 +80,7 @@ public: /// InsetFloatParams const & params() const { return params_; } protected: - virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: virtual std::auto_ptr doClone() const; diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index 8fd76dee93..bed26acef7 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -179,7 +179,7 @@ InsetGraphics::~InsetGraphics() } -void InsetGraphics::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetGraphics::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { case LFUN_GRAPHICS_EDIT: { @@ -210,7 +210,7 @@ void InsetGraphics::priv_dispatch(LCursor & cur, FuncRequest & cmd) break; default: - InsetOld::priv_dispatch(cur, cmd); + InsetOld::doDispatch(cur, cmd); break; } } diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h index 2a552da511..0fe0c6daff 100644 --- a/src/insets/insetgraphics.h +++ b/src/insets/insetgraphics.h @@ -79,7 +79,7 @@ public: protected: InsetGraphics(InsetGraphics const &); /// - void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: friend class InsetGraphicsMailer; diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C index cb9a12c09a..c1278f01a8 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -119,7 +119,7 @@ InsetInclude::~InsetInclude() } -void InsetInclude::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetInclude::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { @@ -143,7 +143,7 @@ void InsetInclude::priv_dispatch(LCursor & cur, FuncRequest & cmd) break; default: - InsetOld::priv_dispatch(cur, cmd); + InsetOld::doDispatch(cur, cmd); break; } } diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h index 3e140a22f7..028a05f2f2 100644 --- a/src/insets/insetinclude.h +++ b/src/insets/insetinclude.h @@ -80,7 +80,7 @@ public: protected: InsetInclude(InsetInclude const &); /// - virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: virtual std::auto_ptr doClone() const; diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C index 7e19d69bd2..edffe585ad 100644 --- a/src/insets/insetlabel.C +++ b/src/insets/insetlabel.C @@ -92,7 +92,7 @@ void changeRefsIfUnique(BufferView & bv, string const & from, string const & to) } // namespace anon -void InsetLabel::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetLabel::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { @@ -111,7 +111,7 @@ void InsetLabel::priv_dispatch(LCursor & cur, FuncRequest & cmd) } default: - InsetCommand::priv_dispatch(cur, cmd); + InsetCommand::doDispatch(cur, cmd); break; } } diff --git a/src/insets/insetlabel.h b/src/insets/insetlabel.h index 8ea8190e2f..e0aecd27ef 100644 --- a/src/insets/insetlabel.h +++ b/src/insets/insetlabel.h @@ -39,7 +39,7 @@ public: int docbook(Buffer const &, std::ostream &, OutputParams const &) const; protected: - virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: virtual std::auto_ptr doClone() const; }; diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C index ec0eb9018d..7efca67d45 100644 --- a/src/insets/insetnote.C +++ b/src/insets/insetnote.C @@ -184,7 +184,7 @@ bool InsetNote::showInsetDialog(BufferView * bv) const } -void InsetNote::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetNote::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { @@ -202,11 +202,11 @@ void InsetNote::priv_dispatch(LCursor & cur, FuncRequest & cmd) if (cmd.button() == mouse_button::button3 && hitButton(cmd)) InsetNoteMailer(*this).showDialog(&cur.bv()); else - InsetCollapsable::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); break; default: - InsetCollapsable::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); break; } } diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h index 9f46783116..5f4a34040a 100644 --- a/src/insets/insetnote.h +++ b/src/insets/insetnote.h @@ -72,7 +72,7 @@ public: protected: InsetNote(InsetNote const &); /// - virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: friend class InsetNoteParams; diff --git a/src/insets/insetref.C b/src/insets/insetref.C index 08d586e072..d104146ff1 100644 --- a/src/insets/insetref.C +++ b/src/insets/insetref.C @@ -42,7 +42,7 @@ InsetRef::InsetRef(InsetRef const & ir) {} -void InsetRef::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetRef::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { case LFUN_MOUSE_PRESS: @@ -57,7 +57,7 @@ void InsetRef::priv_dispatch(LCursor & cur, FuncRequest & cmd) return; default: - return InsetCommand::priv_dispatch(cur, cmd); + return InsetCommand::doDispatch(cur, cmd); } } diff --git a/src/insets/insetref.h b/src/insets/insetref.h index f5fcd2bc77..8ae06c9e54 100644 --- a/src/insets/insetref.h +++ b/src/insets/insetref.h @@ -61,7 +61,7 @@ protected: InsetRef(InsetRef const &); /// - void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: virtual std::auto_ptr doClone() const { return std::auto_ptr(new InsetRef(*this)); diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index 838cde35d5..60c7359409 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -410,7 +410,7 @@ InsetBase * InsetTabular::editXY(LCursor & cur, int x, int y) const } -void InsetTabular::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd) { lyxerr << "# InsetTabular::dispatch: cmd: " << cmd << endl; //lyxerr << " cur:\n" << cur << endl; diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h index 54e279e3d2..b6a6f93970 100644 --- a/src/insets/insettabular.h +++ b/src/insets/insettabular.h @@ -138,8 +138,9 @@ public: protected: InsetTabular(InsetTabular const &); - /// - void priv_dispatch(LCursor & cur, FuncRequest & cmd); + + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); + /// bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const; private: diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 8578d2c222..d571d5f43a 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -290,9 +290,9 @@ InsetBase * InsetText::editXY(LCursor & cur, int x, int y) const } -void InsetText::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetText::doDispatch(LCursor & cur, FuncRequest & cmd) { - //lyxerr << "InsetText::priv_dispatch: " << cmd.action << " " << endl; + //lyxerr << "InsetText::doDispatch: " << cmd.action << " " << endl; setViewCache(&cur.bv()); bool was_empty = paragraphs().begin()->empty() && paragraphs().size() == 1; @@ -468,7 +468,7 @@ void InsetText::appendParagraphs(Buffer * buffer, ParagraphList & plist) #warning John, have a look here. (Lgb) #endif ParagraphList & pl = paragraphs(); - + ParagraphList::iterator pit = plist.begin(); ParagraphList::iterator ins = pl.insert(pl.end(), *pit); ++pit; diff --git a/src/insets/insettext.h b/src/insets/insettext.h index 4372b628e3..ad86205f1b 100644 --- a/src/insets/insettext.h +++ b/src/insets/insettext.h @@ -139,7 +139,7 @@ public: protected: InsetText(InsetText const &); /// - void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: virtual std::auto_ptr doClone() const; diff --git a/src/insets/insetvspace.C b/src/insets/insetvspace.C index 368d1a259b..c6596972fa 100644 --- a/src/insets/insetvspace.C +++ b/src/insets/insetvspace.C @@ -60,7 +60,7 @@ std::auto_ptr InsetVSpace::doClone() const } -void InsetVSpace::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetVSpace::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { @@ -74,7 +74,7 @@ void InsetVSpace::priv_dispatch(LCursor & cur, FuncRequest & cmd) break; default: - InsetOld::priv_dispatch(cur, cmd); + InsetOld::doDispatch(cur, cmd); break; } } diff --git a/src/insets/insetvspace.h b/src/insets/insetvspace.h index e12046ece0..3fe0caf90c 100644 --- a/src/insets/insetvspace.h +++ b/src/insets/insetvspace.h @@ -52,11 +52,11 @@ public: protected: /// - virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: virtual std::auto_ptr doClone() const; - + /// VSpace space_; }; diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C index 60f264e69b..66d8ae29e9 100644 --- a/src/insets/insetwrap.C +++ b/src/insets/insetwrap.C @@ -80,7 +80,7 @@ InsetWrap::~InsetWrap() } -void InsetWrap::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetWrap::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { case LFUN_INSET_MODIFY: { @@ -101,12 +101,12 @@ void InsetWrap::priv_dispatch(LCursor & cur, FuncRequest & cmd) InsetWrapMailer(*this).showDialog(&cur.bv()); break; } - InsetCollapsable::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); break; } default: - InsetCollapsable::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); break; } } diff --git a/src/insets/insetwrap.h b/src/insets/insetwrap.h index 7ed0dc42a5..1acd4acc21 100644 --- a/src/insets/insetwrap.h +++ b/src/insets/insetwrap.h @@ -66,7 +66,7 @@ public: InsetWrapParams const & params() const { return params_; } protected: /// - virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: virtual std::auto_ptr doClone() const; diff --git a/src/insets/updatableinset.C b/src/insets/updatableinset.C index 4ba16bc046..a989682a68 100644 --- a/src/insets/updatableinset.C +++ b/src/insets/updatableinset.C @@ -89,7 +89,7 @@ void UpdatableInset::scroll(BufferView & bv, int offset) const } -void UpdatableInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void UpdatableInset::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { //case LFUN_MOUSE_RELEASE: diff --git a/src/insets/updatableinset.h b/src/insets/updatableinset.h index c0c89b5682..1bc7253025 100644 --- a/src/insets/updatableinset.h +++ b/src/insets/updatableinset.h @@ -38,7 +38,7 @@ public: protected: /// An updatable inset could handle lyx editing commands - void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); /// scrolls to absolute position in bufferview-workwidth * sx units void scroll(BufferView &, float sx) const; /// scrolls offset pixels diff --git a/src/lfuns.h b/src/lfuns.h index c37368e40b..d614278d5f 100644 --- a/src/lfuns.h +++ b/src/lfuns.h @@ -9,7 +9,7 @@ * To add a new function: * - add a new enum constant immediately before LFUN_LASTACTION * - add an appropriate line in LyXAction.C - * - add a branch to a suitable ::priv_dispatch() method + * - add a branch to a suitable ::doDispatch() method * - add correct test to the corresponding ::getStatus() method */ @@ -24,7 +24,7 @@ * They are managed in LyXAction.C and handled in various * ::dispatch() functions, starting with LyXFunc.C:dispatch(), * BufferView_pimpl::dispatch(), LCursor::dispatch() and - * Inset*::priv_dispatch(); + * Inset*::doDispatch(); */ enum kb_action { LFUN_UNKNOWN_ACTION = -1, diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 5bd6636eb1..174691e6c9 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,7 @@ +2004-11-24 Lars Gullik Bjønnes + + * Most insets: rename priv_dispatch to doDispatch + 2004-11-24 Lars Gullik Bjonnes * math_hullinset.C (operator): use common semantics diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C index dd25e08041..26d56cf4e7 100644 --- a/src/mathed/math_gridinset.C +++ b/src/mathed/math_gridinset.C @@ -1008,7 +1008,7 @@ void MathGridInset::splitCell(LCursor & cur) } -void MathGridInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void MathGridInset::doDispatch(LCursor & cur, FuncRequest & cmd) { //lyxerr << "*** MathGridInset: request: " << cmd << endl; switch (cmd.action) { @@ -1018,7 +1018,7 @@ void MathGridInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) // GridInsetMailer(*this).showDialog(); // return DispatchResult(true, true); //} - MathNestInset::priv_dispatch(cur, cmd); + MathNestInset::doDispatch(cur, cmd); break; case LFUN_INSET_DIALOG_UPDATE: @@ -1205,7 +1205,7 @@ void MathGridInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) break; default: - MathNestInset::priv_dispatch(cur, cmd); + MathNestInset::doDispatch(cur, cmd); } } diff --git a/src/mathed/math_gridinset.h b/src/mathed/math_gridinset.h index 52ff62a52b..7b0b329552 100644 --- a/src/mathed/math_gridinset.h +++ b/src/mathed/math_gridinset.h @@ -208,8 +208,7 @@ public: //void octave(OctaveStream &) const; protected: - /// - void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); /// bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus & flag) const; diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C index 7bf1b7903e..64ac084e3d 100644 --- a/src/mathed/math_hullinset.C +++ b/src/mathed/math_hullinset.C @@ -970,7 +970,7 @@ void MathHullInset::doExtern(LCursor & cur, FuncRequest & func) } -void MathHullInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void MathHullInset::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { @@ -978,7 +978,7 @@ void MathHullInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_FINISHED_RIGHT: case LFUN_FINISHED_UP: case LFUN_FINISHED_DOWN: - MathGridInset::priv_dispatch(cur, cmd); + MathGridInset::doDispatch(cur, cmd); notifyCursorLeaves(cur); break; @@ -994,7 +994,7 @@ void MathHullInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) cur.idx() = 0; cur.pos() = cur.lastpos(); } - MathGridInset::priv_dispatch(cur, cmd); + MathGridInset::doDispatch(cur, cmd); break; case LFUN_MATH_NUMBER: @@ -1076,7 +1076,7 @@ void MathHullInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) } default: - MathGridInset::priv_dispatch(cur, cmd); + MathGridInset::doDispatch(cur, cmd); break; } } diff --git a/src/mathed/math_hullinset.h b/src/mathed/math_hullinset.h index 8f6d205d50..d82b845c5b 100644 --- a/src/mathed/math_hullinset.h +++ b/src/mathed/math_hullinset.h @@ -120,7 +120,7 @@ public: protected: MathHullInset(MathHullInset const &); - virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); /// do we want to handle this event? bool getStatus(LCursor & cur, FuncRequest const & cmd, diff --git a/src/mathed/math_mboxinset.C b/src/mathed/math_mboxinset.C index 43ddc1823b..ec3faecf38 100644 --- a/src/mathed/math_mboxinset.C +++ b/src/mathed/math_mboxinset.C @@ -90,7 +90,7 @@ int MathMBoxInset::latex(Buffer const & buf, std::ostream & os, } -void MathMBoxInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void MathMBoxInset::doDispatch(LCursor & cur, FuncRequest & cmd) { text_.dispatch(cur, cmd); } diff --git a/src/mathed/math_mboxinset.h b/src/mathed/math_mboxinset.h index a7199541c7..f192620827 100644 --- a/src/mathed/math_mboxinset.h +++ b/src/mathed/math_mboxinset.h @@ -26,9 +26,6 @@ public: void metrics(MetricsInfo & mi, Dimension & dim) const; /// draw according to cached metrics void draw(PainterInfo &, int x, int y) const; - /// - void priv_dispatch(LCursor & cur, FuncRequest & cmd); - /// bool inMathed() const { return false; } /// @@ -44,6 +41,8 @@ public: /// void getCursorPos(LCursor const & cur, int & x, int & y) const; protected: + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); + /// mutable LyXText text_; /// diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C index 7648cf26ca..79d058907e 100644 --- a/src/mathed/math_nestinset.C +++ b/src/mathed/math_nestinset.C @@ -380,7 +380,7 @@ void MathNestInset::handleFont2(LCursor & cur, string const & arg) } -void MathNestInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) { //lyxerr << "MathNestInset: request: " << cmd << std::endl; //CursorSlice sl = cur.current(); @@ -794,7 +794,7 @@ void MathNestInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) } default: - MathDimInset::priv_dispatch(cur, cmd); + MathDimInset::doDispatch(cur, cmd); break; } } diff --git a/src/mathed/math_nestinset.h b/src/mathed/math_nestinset.h index 819d64dc64..fb9d3b3134 100644 --- a/src/mathed/math_nestinset.h +++ b/src/mathed/math_nestinset.h @@ -97,7 +97,7 @@ public: protected: /// - void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); /// do we want to handle this event? bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus & status) const; diff --git a/src/mathed/math_scriptinset.C b/src/mathed/math_scriptinset.C index 55f9a6159a..cf23765572 100644 --- a/src/mathed/math_scriptinset.C +++ b/src/mathed/math_scriptinset.C @@ -573,7 +573,7 @@ if (1) { } -void MathScriptInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void MathScriptInset::doDispatch(LCursor & cur, FuncRequest & cmd) { //lyxerr << "MathScriptInset: request: " << cmd << std::endl; @@ -592,5 +592,5 @@ void MathScriptInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) return; } - MathNestInset::priv_dispatch(cur, cmd); + MathNestInset::doDispatch(cur, cmd); } diff --git a/src/mathed/math_scriptinset.h b/src/mathed/math_scriptinset.h index fc853613ea..b6fa642d1d 100644 --- a/src/mathed/math_scriptinset.h +++ b/src/mathed/math_scriptinset.h @@ -98,8 +98,7 @@ public: /// say whether we have displayed limits void infoize2(std::ostream & os) const; protected: - /// - void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); private: virtual std::auto_ptr doClone() const; /// returns x offset for main part diff --git a/src/mathed/ref_inset.C b/src/mathed/ref_inset.C index e3e7d1108f..12d502a153 100644 --- a/src/mathed/ref_inset.C +++ b/src/mathed/ref_inset.C @@ -56,7 +56,7 @@ void RefInset::infoize(std::ostream & os) const } -void RefInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void RefInset::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { case LFUN_INSET_MODIFY: @@ -91,7 +91,7 @@ void RefInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) break; default: - CommandInset::priv_dispatch(cur, cmd); + CommandInset::doDispatch(cur, cmd); break; } } @@ -143,7 +143,7 @@ int RefInset::docbook(Buffer const & buf, std::ostream & os, OutputParams const { if (cell(1).empty()) { os << ""; else os << "\">"; diff --git a/src/mathed/ref_inset.h b/src/mathed/ref_inset.h index 0e3b80043b..cdd1780670 100644 --- a/src/mathed/ref_inset.h +++ b/src/mathed/ref_inset.h @@ -60,8 +60,7 @@ public: /// static std::string const & getName(int type); protected: - /// - void priv_dispatch(LCursor & cur, FuncRequest & cmd); + virtual void doDispatch(LCursor & cur, FuncRequest & cmd); }; #endif -- 2.39.2