anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename priv_dispatch to doDispatch

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9301 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2004-11-24 21:58:42 +00:00
parent ed064bdee6
commit 183239b7de
57 changed files with 115 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2004-11-24 Lars Gullik Bjønnes <larsbj@gullik.net>
* Most insets: rename priv_dispatch to doDispatch
2004-11-24 Georg Baum <Georg.Baum@post.rwth-aachen.de> 2004-11-24 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* insettabular.C (tabularFeatures): fix multicolumn handling * insettabular.C (tabularFeatures): fix multicolumn handling

4
src/insets/insetbase.C
View File

@ -124,11 +124,11 @@ void InsetBase::dispatch(LCursor & cur, FuncRequest & cmd)
{ {
cur.needsUpdate(); cur.needsUpdate();
cur.dispatched(); 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.noUpdate();
cur.undispatched(); cur.undispatched();

2
src/insets/insetbase.h
View File

@ -386,7 +386,7 @@ protected:
InsetBase(); InsetBase();
InsetBase(InsetBase const &); InsetBase(InsetBase const &);
// the real dispatcher // the real dispatcher
virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
virtual std::auto_ptr<InsetBase> doClone() const = 0; virtual std::auto_ptr<InsetBase> doClone() const = 0;
}; };

4
src/insets/insetbibitem.C
View File

@ -55,7 +55,7 @@ auto_ptr<InsetBase> InsetBibitem::doClone() const
} }
void InsetBibitem::priv_dispatch(LCursor & cur, FuncRequest & cmd) void InsetBibitem::doDispatch(LCursor & cur, FuncRequest & cmd)
{ {
switch (cmd.action) { switch (cmd.action) {
@ -71,7 +71,7 @@ void InsetBibitem::priv_dispatch(LCursor & cur, FuncRequest & cmd)
} }
default: default:
InsetCommand::priv_dispatch(cur, cmd); InsetCommand::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/insets/insetbibitem.h
View File

@ -49,7 +49,7 @@ public:
OutputParams const &) const; OutputParams const &) const;
protected: protected:
/// ///
virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
virtual std::auto_ptr<InsetBase> doClone() const; virtual std::auto_ptr<InsetBase> doClone() const;

4
src/insets/insetbibtex.C
View File

@ -68,7 +68,7 @@ std::auto_ptr<InsetBase> InsetBibtex::doClone() const
} }
void InsetBibtex::priv_dispatch(LCursor & cur, FuncRequest & cmd) void InsetBibtex::doDispatch(LCursor & cur, FuncRequest & cmd)
{ {
switch (cmd.action) { switch (cmd.action) {
@ -81,7 +81,7 @@ void InsetBibtex::priv_dispatch(LCursor & cur, FuncRequest & cmd)
} }
default: default:
InsetCommand::priv_dispatch(cur, cmd); InsetCommand::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/insets/insetbibtex.h
View File

@ -45,7 +45,7 @@ public:
/// ///
void validate(LaTeXFeatures &) const; void validate(LaTeXFeatures &) const;
protected: protected:
virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
virtual std::auto_ptr<InsetBase> doClone() const; virtual std::auto_ptr<InsetBase> doClone() const;

6
src/insets/insetbox.C
View File

@ -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) { switch (cmd.action) {
@ -190,11 +190,11 @@ void InsetBox::priv_dispatch(LCursor & cur, FuncRequest & cmd)
InsetBoxMailer(*this).showDialog(&cur.bv()); InsetBoxMailer(*this).showDialog(&cur.bv());
break; break;
} }
InsetCollapsable::priv_dispatch(cur, cmd); InsetCollapsable::doDispatch(cur, cmd);
break; break;
default: default:
InsetCollapsable::priv_dispatch(cur, cmd); InsetCollapsable::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/insets/insetbox.h
View File

@ -101,7 +101,7 @@ public:
}; };
protected: protected:
InsetBox(InsetBox const &); InsetBox(InsetBox const &);
virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
friend class InsetBoxParams; friend class InsetBoxParams;

8
src/insets/insetbranch.C
View File

@ -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) { switch (cmd.action) {
case LFUN_INSET_MODIFY: { case LFUN_INSET_MODIFY: {
@ -124,7 +124,7 @@ void InsetBranch::priv_dispatch(LCursor & cur, FuncRequest & cmd)
case LFUN_MOUSE_PRESS: case LFUN_MOUSE_PRESS:
if (cmd.button() != mouse_button::button3) if (cmd.button() != mouse_button::button3)
InsetCollapsable::priv_dispatch(cur, cmd); InsetCollapsable::doDispatch(cur, cmd);
else else
cur.undispatched(); cur.undispatched();
break; break;
@ -137,7 +137,7 @@ void InsetBranch::priv_dispatch(LCursor & cur, FuncRequest & cmd)
if (cmd.button() == mouse_button::button3 && hitButton(cmd)) if (cmd.button() == mouse_button::button3 && hitButton(cmd))
InsetBranchMailer(*this).showDialog(&cur.bv()); InsetBranchMailer(*this).showDialog(&cur.bv());
else else
InsetCollapsable::priv_dispatch(cur, cmd); InsetCollapsable::doDispatch(cur, cmd);
break; break;
@ -178,7 +178,7 @@ void InsetBranch::priv_dispatch(LCursor & cur, FuncRequest & cmd)
break; break;
default: default:
InsetCollapsable::priv_dispatch(cur, cmd); InsetCollapsable::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/insets/insetbranch.h
View File

@ -77,7 +77,7 @@ public:
protected: protected:
InsetBranch(InsetBranch const &); InsetBranch(InsetBranch const &);
virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
friend class InsetBranchParams; friend class InsetBranchParams;

6
src/insets/insetcharstyle.C
View File

@ -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); setStatus(Inlined);
switch (cmd.action) { switch (cmd.action) {
@ -171,11 +171,11 @@ void InsetCharStyle::priv_dispatch(LCursor & cur, FuncRequest & cmd)
if (cmd.button() == mouse_button::button3) if (cmd.button() == mouse_button::button3)
has_label_ = !has_label_; has_label_ = !has_label_;
else else
InsetText::priv_dispatch(cur, cmd); InsetText::doDispatch(cur, cmd);
break; break;
default: default:
InsetCollapsable::priv_dispatch(cur, cmd); InsetCollapsable::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/insets/insetcharstyle.h
View File

@ -78,7 +78,7 @@ public:
protected: protected:
InsetCharStyle(InsetCharStyle const &); 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; bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const;

24
src/insets/insetcollapsable.C
View File

@ -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 // lyxerr << "InsetCollapsable::doDispatch (begin): cmd: " << cmd
// << " button y: " << button_dim.y2 // << " button y: " << button_dim.y2
// << " coll/inline/open: " << status_ << endl; // << " 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; << " cur: " << cur << " bvcur: " << cur.bv().cursor() << endl;
switch (cmd.action) { switch (cmd.action) {
case LFUN_MOUSE_PRESS: case LFUN_MOUSE_PRESS:
if (status_ == Inlined) if (status_ == Inlined)
InsetText::priv_dispatch(cur, cmd); InsetText::doDispatch(cur, cmd);
else if (status_ == Open && !hitButton(cmd)) else if (status_ == Open && !hitButton(cmd))
InsetText::priv_dispatch(cur, cmd); InsetText::doDispatch(cur, cmd);
else else
cur.noUpdate(); cur.noUpdate();
break; break;
case LFUN_MOUSE_MOTION: case LFUN_MOUSE_MOTION:
if (status_ == Inlined) if (status_ == Inlined)
InsetText::priv_dispatch(cur, cmd); InsetText::doDispatch(cur, cmd);
else if (status_ == Open && !hitButton(cmd)) else if (status_ == Open && !hitButton(cmd))
InsetText::priv_dispatch(cur, cmd); InsetText::doDispatch(cur, cmd);
break; break;
case LFUN_MOUSE_RELEASE: case LFUN_MOUSE_RELEASE:
@ -300,14 +300,14 @@ void InsetCollapsable::priv_dispatch(LCursor & cur, FuncRequest & cmd)
cur.bv().cursor() = cur; cur.bv().cursor() = cur;
} else { } else {
lyxerr << "InsetCollapsable::lfunMouseRelease 3" << endl; lyxerr << "InsetCollapsable::lfunMouseRelease 3" << endl;
InsetText::priv_dispatch(cur, cmd); InsetText::doDispatch(cur, cmd);
} }
break; break;
} }
case Inlined: case Inlined:
lyxerr << "InsetCollapsable::lfunMouseRelease 4" << endl; lyxerr << "InsetCollapsable::lfunMouseRelease 4" << endl;
InsetText::priv_dispatch(cur, cmd); InsetText::doDispatch(cur, cmd);
break; break;
} }
break; break;
@ -331,7 +331,7 @@ void InsetCollapsable::priv_dispatch(LCursor & cur, FuncRequest & cmd)
break; break;
default: default:
InsetText::priv_dispatch(cur, cmd); InsetText::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/insets/insetcollapsable.h
View File

@ -89,7 +89,7 @@ protected:
/// ///
void setStatus(CollapseStatus st); void setStatus(CollapseStatus st);
/// ///
void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
/// ///
void dimension_collapsed(Dimension &) const; void dimension_collapsed(Dimension &) const;
/// ///

4
src/insets/insetcommand.C
View File

@ -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) { switch (cmd.action) {
case LFUN_INSET_REFRESH: case LFUN_INSET_REFRESH:
@ -129,7 +129,7 @@ void InsetCommand::priv_dispatch(LCursor & cur, FuncRequest & cmd)
} }
default: default:
InsetOld::priv_dispatch(cur, cmd); InsetOld::doDispatch(cur, cmd);
break; break;
} }

2
src/insets/insetcommand.h
View File

@ -76,7 +76,7 @@ public:
protected: protected:
/// ///
void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
/// ///
std::string const getCommand() const { return p_.getCommand(); } std::string const getCommand() const { return p_.getCommand(); }
/// ///

6
src/insets/insetert.C
View File

@ -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) { switch (cmd.action) {
case LFUN_INSET_MODIFY: { case LFUN_INSET_MODIFY: {
@ -222,7 +222,7 @@ void InsetERT::priv_dispatch(LCursor & cur, FuncRequest & cmd)
} }
default: default:
InsetCollapsable::priv_dispatch(cur, cmd); InsetCollapsable::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/insets/insetert.h
View File

@ -71,7 +71,7 @@ public:
protected: protected:
InsetERT(InsetERT const &); 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; bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const;
private: private:

4
src/insets/insetexternal.C
View File

@ -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) { switch (cmd.action) {
@ -462,7 +462,7 @@ void InsetExternal::priv_dispatch(LCursor & cur, FuncRequest & cmd)
break; break;
default: default:
InsetOld::priv_dispatch(cur, cmd); InsetOld::doDispatch(cur, cmd);
} }
} }

2
src/insets/insetexternal.h
View File

@ -148,7 +148,7 @@ public:
protected: protected:
InsetExternal(InsetExternal const &); InsetExternal(InsetExternal const &);
/// ///
void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
virtual std::auto_ptr<InsetBase> doClone() const; virtual std::auto_ptr<InsetBase> doClone() const;

6
src/insets/insetfloat.C
View File

@ -154,7 +154,7 @@ InsetFloat::~InsetFloat()
} }
void InsetFloat::priv_dispatch(LCursor & cur, FuncRequest & cmd) void InsetFloat::doDispatch(LCursor & cur, FuncRequest & cmd)
{ {
switch (cmd.action) { switch (cmd.action) {
@ -180,12 +180,12 @@ void InsetFloat::priv_dispatch(LCursor & cur, FuncRequest & cmd)
InsetFloatMailer(*this).showDialog(&cur.bv()); InsetFloatMailer(*this).showDialog(&cur.bv());
break; break;
} }
InsetCollapsable::priv_dispatch(cur, cmd); InsetCollapsable::doDispatch(cur, cmd);
break; break;
} }
default: default:
InsetCollapsable::priv_dispatch(cur, cmd); InsetCollapsable::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/insets/insetfloat.h
View File

@ -80,7 +80,7 @@ public:
/// ///
InsetFloatParams const & params() const { return params_; } InsetFloatParams const & params() const { return params_; }
protected: protected:
virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
virtual std::auto_ptr<InsetBase> doClone() const; virtual std::auto_ptr<InsetBase> doClone() const;

4
src/insets/insetgraphics.C
View File

@ -179,7 +179,7 @@ InsetGraphics::~InsetGraphics()
} }
void InsetGraphics::priv_dispatch(LCursor & cur, FuncRequest & cmd) void InsetGraphics::doDispatch(LCursor & cur, FuncRequest & cmd)
{ {
switch (cmd.action) { switch (cmd.action) {
case LFUN_GRAPHICS_EDIT: { case LFUN_GRAPHICS_EDIT: {
@ -210,7 +210,7 @@ void InsetGraphics::priv_dispatch(LCursor & cur, FuncRequest & cmd)
break; break;
default: default:
InsetOld::priv_dispatch(cur, cmd); InsetOld::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/insets/insetgraphics.h
View File

@ -79,7 +79,7 @@ public:
protected: protected:
InsetGraphics(InsetGraphics const &); InsetGraphics(InsetGraphics const &);
/// ///
void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
friend class InsetGraphicsMailer; friend class InsetGraphicsMailer;

4
src/insets/insetinclude.C
View File

@ -119,7 +119,7 @@ InsetInclude::~InsetInclude()
} }
void InsetInclude::priv_dispatch(LCursor & cur, FuncRequest & cmd) void InsetInclude::doDispatch(LCursor & cur, FuncRequest & cmd)
{ {
switch (cmd.action) { switch (cmd.action) {
@ -143,7 +143,7 @@ void InsetInclude::priv_dispatch(LCursor & cur, FuncRequest & cmd)
break; break;
default: default:
InsetOld::priv_dispatch(cur, cmd); InsetOld::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/insets/insetinclude.h
View File

@ -80,7 +80,7 @@ public:
protected: protected:
InsetInclude(InsetInclude const &); InsetInclude(InsetInclude const &);
/// ///
virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
virtual std::auto_ptr<InsetBase> doClone() const; virtual std::auto_ptr<InsetBase> doClone() const;

4
src/insets/insetlabel.C
View File

@ -92,7 +92,7 @@ void changeRefsIfUnique(BufferView & bv, string const & from, string const & to)
} // namespace anon } // namespace anon
void InsetLabel::priv_dispatch(LCursor & cur, FuncRequest & cmd) void InsetLabel::doDispatch(LCursor & cur, FuncRequest & cmd)
{ {
switch (cmd.action) { switch (cmd.action) {
@ -111,7 +111,7 @@ void InsetLabel::priv_dispatch(LCursor & cur, FuncRequest & cmd)
} }
default: default:
InsetCommand::priv_dispatch(cur, cmd); InsetCommand::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/insets/insetlabel.h
View File

@ -39,7 +39,7 @@ public:
int docbook(Buffer const &, std::ostream &, int docbook(Buffer const &, std::ostream &,
OutputParams const &) const; OutputParams const &) const;
protected: protected:
virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
virtual std::auto_ptr<InsetBase> doClone() const; virtual std::auto_ptr<InsetBase> doClone() const;
}; };

6
src/insets/insetnote.C
View File

@ -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) { switch (cmd.action) {
@ -202,11 +202,11 @@ void InsetNote::priv_dispatch(LCursor & cur, FuncRequest & cmd)
if (cmd.button() == mouse_button::button3 && hitButton(cmd)) if (cmd.button() == mouse_button::button3 && hitButton(cmd))
InsetNoteMailer(*this).showDialog(&cur.bv()); InsetNoteMailer(*this).showDialog(&cur.bv());
else else
InsetCollapsable::priv_dispatch(cur, cmd); InsetCollapsable::doDispatch(cur, cmd);
break; break;
default: default:
InsetCollapsable::priv_dispatch(cur, cmd); InsetCollapsable::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/insets/insetnote.h
View File

@ -72,7 +72,7 @@ public:
protected: protected:
InsetNote(InsetNote const &); InsetNote(InsetNote const &);
/// ///
virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
friend class InsetNoteParams; friend class InsetNoteParams;

4
src/insets/insetref.C
View File

@ -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) { switch (cmd.action) {
case LFUN_MOUSE_PRESS: case LFUN_MOUSE_PRESS:
@ -57,7 +57,7 @@ void InsetRef::priv_dispatch(LCursor & cur, FuncRequest & cmd)
return; return;
default: default:
return InsetCommand::priv_dispatch(cur, cmd); return InsetCommand::doDispatch(cur, cmd);
} }
} }

2
src/insets/insetref.h
View File

@ -61,7 +61,7 @@ protected:
InsetRef(InsetRef const &); InsetRef(InsetRef const &);
/// ///
void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
virtual std::auto_ptr<InsetBase> doClone() const { virtual std::auto_ptr<InsetBase> doClone() const {
return std::auto_ptr<InsetBase>(new InsetRef(*this)); return std::auto_ptr<InsetBase>(new InsetRef(*this));

2
src/insets/insettabular.C
View File

@ -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 << "# InsetTabular::dispatch: cmd: " << cmd << endl;
//lyxerr << " cur:\n" << cur << endl; //lyxerr << " cur:\n" << cur << endl;

5
src/insets/insettabular.h
View File

@ -138,8 +138,9 @@ public:
protected: protected:
InsetTabular(InsetTabular const &); 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; bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const;
private: private:

6
src/insets/insettext.C
View File

@ -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()); setViewCache(&cur.bv());
bool was_empty = paragraphs().begin()->empty() && paragraphs().size() == 1; 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) #warning John, have a look here. (Lgb)
#endif #endif
ParagraphList & pl = paragraphs(); ParagraphList & pl = paragraphs();
ParagraphList::iterator pit = plist.begin(); ParagraphList::iterator pit = plist.begin();
ParagraphList::iterator ins = pl.insert(pl.end(), *pit); ParagraphList::iterator ins = pl.insert(pl.end(), *pit);
++pit; ++pit;

2
src/insets/insettext.h
View File

@ -139,7 +139,7 @@ public:
protected: protected:
InsetText(InsetText const &); InsetText(InsetText const &);
/// ///
void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
virtual std::auto_ptr<InsetBase> doClone() const; virtual std::auto_ptr<InsetBase> doClone() const;

4
src/insets/insetvspace.C
View File

@ -60,7 +60,7 @@ std::auto_ptr<InsetBase> InsetVSpace::doClone() const
} }
void InsetVSpace::priv_dispatch(LCursor & cur, FuncRequest & cmd) void InsetVSpace::doDispatch(LCursor & cur, FuncRequest & cmd)
{ {
switch (cmd.action) { switch (cmd.action) {
@ -74,7 +74,7 @@ void InsetVSpace::priv_dispatch(LCursor & cur, FuncRequest & cmd)
break; break;
default: default:
InsetOld::priv_dispatch(cur, cmd); InsetOld::doDispatch(cur, cmd);
break; break;
} }
} }

4
src/insets/insetvspace.h
View File

@ -52,11 +52,11 @@ public:
protected: protected:
/// ///
virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
virtual std::auto_ptr<InsetBase> doClone() const; virtual std::auto_ptr<InsetBase> doClone() const;
/// ///
VSpace space_; VSpace space_;
}; };

6
src/insets/insetwrap.C
View File

@ -80,7 +80,7 @@ InsetWrap::~InsetWrap()
} }
void InsetWrap::priv_dispatch(LCursor & cur, FuncRequest & cmd) void InsetWrap::doDispatch(LCursor & cur, FuncRequest & cmd)
{ {
switch (cmd.action) { switch (cmd.action) {
case LFUN_INSET_MODIFY: { case LFUN_INSET_MODIFY: {
@ -101,12 +101,12 @@ void InsetWrap::priv_dispatch(LCursor & cur, FuncRequest & cmd)
InsetWrapMailer(*this).showDialog(&cur.bv()); InsetWrapMailer(*this).showDialog(&cur.bv());
break; break;
} }
InsetCollapsable::priv_dispatch(cur, cmd); InsetCollapsable::doDispatch(cur, cmd);
break; break;
} }
default: default:
InsetCollapsable::priv_dispatch(cur, cmd); InsetCollapsable::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/insets/insetwrap.h
View File

@ -66,7 +66,7 @@ public:
InsetWrapParams const & params() const { return params_; } InsetWrapParams const & params() const { return params_; }
protected: protected:
/// ///
virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private: private:
virtual std::auto_ptr<InsetBase> doClone() const; virtual std::auto_ptr<InsetBase> doClone() const;

2
src/insets/updatableinset.C
View File

@ -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) { switch (cmd.action) {
//case LFUN_MOUSE_RELEASE: //case LFUN_MOUSE_RELEASE:

2
src/insets/updatableinset.h
View File

@ -38,7 +38,7 @@ public:
protected: protected:
/// An updatable inset could handle lyx editing commands /// 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 /// scrolls to absolute position in bufferview-workwidth * sx units
void scroll(BufferView &, float sx) const; void scroll(BufferView &, float sx) const;
/// scrolls offset pixels /// scrolls offset pixels

4
src/lfuns.h
View File

@ -9,7 +9,7 @@
* To add a new function: * To add a new function:
* - add a new enum constant immediately before LFUN_LASTACTION * - add a new enum constant immediately before LFUN_LASTACTION
* - add an appropriate line in LyXAction.C * - 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 * - add correct test to the corresponding ::getStatus() method
*/ */
@ -24,7 +24,7 @@
* They are managed in LyXAction.C and handled in various * They are managed in LyXAction.C and handled in various
* ::dispatch() functions, starting with LyXFunc.C:dispatch(), * ::dispatch() functions, starting with LyXFunc.C:dispatch(),
* BufferView_pimpl::dispatch(), LCursor::dispatch() and * BufferView_pimpl::dispatch(), LCursor::dispatch() and
* Inset*::priv_dispatch(); * Inset*::doDispatch();
*/ */
enum kb_action { enum kb_action {
LFUN_UNKNOWN_ACTION = -1, LFUN_UNKNOWN_ACTION = -1,

4
src/mathed/ChangeLog
View File

@ -1,3 +1,7 @@
2004-11-24 Lars Gullik Bjønnes <larsbj@gullik.net>
* Most insets: rename priv_dispatch to doDispatch
2004-11-24 Lars Gullik Bjonnes <larsbj@gullik.net> 2004-11-24 Lars Gullik Bjonnes <larsbj@gullik.net>
* math_hullinset.C (operator): use common semantics * math_hullinset.C (operator): use common semantics

6
src/mathed/math_gridinset.C
View File

@ -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; //lyxerr << "*** MathGridInset: request: " << cmd << endl;
switch (cmd.action) { switch (cmd.action) {
@ -1018,7 +1018,7 @@ void MathGridInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
// GridInsetMailer(*this).showDialog(); // GridInsetMailer(*this).showDialog();
// return DispatchResult(true, true); // return DispatchResult(true, true);
//} //}
MathNestInset::priv_dispatch(cur, cmd); MathNestInset::doDispatch(cur, cmd);
break; break;
case LFUN_INSET_DIALOG_UPDATE: case LFUN_INSET_DIALOG_UPDATE:
@ -1205,7 +1205,7 @@ void MathGridInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
break; break;
default: default:
MathNestInset::priv_dispatch(cur, cmd); MathNestInset::doDispatch(cur, cmd);
} }
} }

3
src/mathed/math_gridinset.h
View File

@ -208,8 +208,7 @@ public:
//void octave(OctaveStream &) const; //void octave(OctaveStream &) const;
protected: protected:
/// virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
void priv_dispatch(LCursor & cur, FuncRequest & cmd);
/// ///
bool getStatus(LCursor & cur, FuncRequest const & cmd, bool getStatus(LCursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const; FuncStatus & flag) const;

8
src/mathed/math_hullinset.C
View File

@ -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) { switch (cmd.action) {
@ -978,7 +978,7 @@ void MathHullInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
case LFUN_FINISHED_RIGHT: case LFUN_FINISHED_RIGHT:
case LFUN_FINISHED_UP: case LFUN_FINISHED_UP:
case LFUN_FINISHED_DOWN: case LFUN_FINISHED_DOWN:
MathGridInset::priv_dispatch(cur, cmd); MathGridInset::doDispatch(cur, cmd);
notifyCursorLeaves(cur); notifyCursorLeaves(cur);
break; break;
@ -994,7 +994,7 @@ void MathHullInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
cur.idx() = 0; cur.idx() = 0;
cur.pos() = cur.lastpos(); cur.pos() = cur.lastpos();
} }
MathGridInset::priv_dispatch(cur, cmd); MathGridInset::doDispatch(cur, cmd);
break; break;
case LFUN_MATH_NUMBER: case LFUN_MATH_NUMBER:
@ -1076,7 +1076,7 @@ void MathHullInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
} }
default: default:
MathGridInset::priv_dispatch(cur, cmd); MathGridInset::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/mathed/math_hullinset.h
View File

@ -120,7 +120,7 @@ public:
protected: protected:
MathHullInset(MathHullInset const &); 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? /// do we want to handle this event?
bool getStatus(LCursor & cur, FuncRequest const & cmd, bool getStatus(LCursor & cur, FuncRequest const & cmd,

2
src/mathed/math_mboxinset.C
View File

@ -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); text_.dispatch(cur, cmd);
} }

5
src/mathed/math_mboxinset.h
View File

@ -26,9 +26,6 @@ public:
void metrics(MetricsInfo & mi, Dimension & dim) const; void metrics(MetricsInfo & mi, Dimension & dim) const;
/// draw according to cached metrics /// draw according to cached metrics
void draw(PainterInfo &, int x, int y) const; void draw(PainterInfo &, int x, int y) const;
///
void priv_dispatch(LCursor & cur, FuncRequest & cmd);
/// ///
bool inMathed() const { return false; } bool inMathed() const { return false; }
/// ///
@ -44,6 +41,8 @@ public:
/// ///
void getCursorPos(LCursor const & cur, int & x, int & y) const; void getCursorPos(LCursor const & cur, int & x, int & y) const;
protected: protected:
virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
/// ///
mutable LyXText text_; mutable LyXText text_;
/// ///

4
src/mathed/math_nestinset.C
View File

@ -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; //lyxerr << "MathNestInset: request: " << cmd << std::endl;
//CursorSlice sl = cur.current(); //CursorSlice sl = cur.current();
@ -794,7 +794,7 @@ void MathNestInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
} }
default: default:
MathDimInset::priv_dispatch(cur, cmd); MathDimInset::doDispatch(cur, cmd);
break; break;
} }
} }

2
src/mathed/math_nestinset.h
View File

@ -97,7 +97,7 @@ public:
protected: protected:
/// ///
void priv_dispatch(LCursor & cur, FuncRequest & cmd); virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
/// do we want to handle this event? /// do we want to handle this event?
bool getStatus(LCursor & cur, FuncRequest const & cmd, bool getStatus(LCursor & cur, FuncRequest const & cmd,
FuncStatus & status) const; FuncStatus & status) const;

4
src/mathed/math_scriptinset.C
View File

@ -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; //lyxerr << "MathScriptInset: request: " << cmd << std::endl;
@ -592,5 +592,5 @@ void MathScriptInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
return; return;
} }
MathNestInset::priv_dispatch(cur, cmd); MathNestInset::doDispatch(cur, cmd);
} }

3
src/mathed/math_scriptinset.h
View File

@ -98,8 +98,7 @@ public:
/// say whether we have displayed limits /// say whether we have displayed limits
void infoize2(std::ostream & os) const; void infoize2(std::ostream & os) const;
protected: protected:
/// virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
void priv_dispatch(LCursor & cur, FuncRequest & cmd);
private: private:
virtual std::auto_ptr<InsetBase> doClone() const; virtual std::auto_ptr<InsetBase> doClone() const;
/// returns x offset for main part /// returns x offset for main part

6
src/mathed/ref_inset.C
View File

@ -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) { switch (cmd.action) {
case LFUN_INSET_MODIFY: case LFUN_INSET_MODIFY:
@ -91,7 +91,7 @@ void RefInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
break; break;
default: default:
CommandInset::priv_dispatch(cur, cmd); CommandInset::doDispatch(cur, cmd);
break; break;
} }
} }
@ -143,7 +143,7 @@ int RefInset::docbook(Buffer const & buf, std::ostream & os, OutputParams const
{ {
if (cell(1).empty()) { if (cell(1).empty()) {
os << "<xref linkend=\"" << sgml::cleanID(buf, runparams, asString(cell(0))); os << "<xref linkend=\"" << sgml::cleanID(buf, runparams, asString(cell(0)));
if (runparams.flavor == OutputParams::XML) if (runparams.flavor == OutputParams::XML)
os << "\"/>"; os << "\"/>";
else else
os << "\">"; os << "\">";

3
src/mathed/ref_inset.h
View File

@ -60,8 +60,7 @@ public:
/// ///
static std::string const & getName(int type); static std::string const & getName(int type);
protected: protected:
/// virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
void priv_dispatch(LCursor & cur, FuncRequest & cmd);
}; };
#endif #endif