Just to get this going bit by bit.
Index: lfuns.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lfuns.h,v
retrieving revision 1.37
diff -u -p -B -b -w -r1.37 lfuns.h
--- lfuns.h 22 Oct 2004 10:24:55 -0000 1.37
+++ lfuns.h 24 Nov 2004 01:13:06 -0000
@@ -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,
Index: insets/insetbase.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbase.C,v
retrieving revision 1.35
diff -u -p -B -b -w -r1.35 insetbase.C
--- insets/insetbase.C 23 Nov 2004 23:04:47 -0000 1.35
+++ insets/insetbase.C 24 Nov 2004 01:13:06 -0000
@@ -124,11 +124,11 @@ void InsetBase::dispatch(LCursor & cur,
{
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();
Index: insets/insetbase.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbase.h,v
retrieving revision 1.43
diff -u -p -B -b -w -r1.43 insetbase.h
--- insets/insetbase.h 23 Nov 2004 23:04:47 -0000 1.43
+++ insets/insetbase.h 24 Nov 2004 01:13:06 -0000
@@ -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<InsetBase> doClone() const = 0;
};
Index: insets/insetbibitem.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbibitem.C,v
retrieving revision 1.50
diff -u -p -B -b -w -r1.50 insetbibitem.C
--- insets/insetbibitem.C 23 Nov 2004 23:04:47 -0000 1.50
+++ insets/insetbibitem.C 24 Nov 2004 01:13:07 -0000
@@ -55,7 +55,7 @@ auto_ptr<InsetBase> InsetBibitem::doClon
}
-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
}
default:
- InsetCommand::priv_dispatch(cur, cmd);
+ InsetCommand::doDispatch(cur, cmd);
break;
}
}
Index: insets/insetbibitem.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbibitem.h,v
retrieving revision 1.24
diff -u -p -B -b -w -r1.24 insetbibitem.h
--- insets/insetbibitem.h 23 Nov 2004 23:04:47 -0000 1.24
+++ insets/insetbibitem.h 24 Nov 2004 01:13:07 -0000
@@ -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<InsetBase> doClone() const;
Index: insets/insetbibtex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbibtex.C,v
retrieving revision 1.50
diff -u -p -B -b -w -r1.50 insetbibtex.C
--- insets/insetbibtex.C 23 Nov 2004 23:04:47 -0000 1.50
+++ insets/insetbibtex.C 24 Nov 2004 01:13:07 -0000
@@ -68,7 +68,7 @@ std::auto_ptr<InsetBase> InsetBibtex::do
}
-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
}
default:
- InsetCommand::priv_dispatch(cur, cmd);
+ InsetCommand::doDispatch(cur, cmd);
break;
}
}
Index: insets/insetbibtex.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbibtex.h,v
retrieving revision 1.35
diff -u -p -B -b -w -r1.35 insetbibtex.h
--- insets/insetbibtex.h 23 Nov 2004 23:04:47 -0000 1.35
+++ insets/insetbibtex.h 24 Nov 2004 01:13:07 -0000
@@ -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<InsetBase> doClone() const;
Index: insets/insetbox.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbox.C,v
retrieving revision 1.23
diff -u -p -B -b -w -r1.23 insetbox.C
--- insets/insetbox.C 23 Nov 2004 23:04:47 -0000 1.23
+++ insets/insetbox.C 24 Nov 2004 01:13:07 -0000
@@ -170,7 +170,7 @@ bool InsetBox::showInsetDialog(BufferVie
}
-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 & c
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;
}
}
Index: insets/insetbox.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbox.h,v
retrieving revision 1.14
diff -u -p -B -b -w -r1.14 insetbox.h
--- insets/insetbox.h 23 Nov 2004 23:04:47 -0000 1.14
+++ insets/insetbox.h 24 Nov 2004 01:13:07 -0000
@@ -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;
Index: insets/insetbranch.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbranch.C,v
retrieving revision 1.50
diff -u -p -B -b -w -r1.50 insetbranch.C
--- insets/insetbranch.C 23 Nov 2004 23:04:47 -0000 1.50
+++ insets/insetbranch.C 24 Nov 2004 01:13:07 -0000
@@ -111,7 +111,7 @@ bool InsetBranch::showInsetDialog(Buffer
}
-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
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
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
break;
default:
- InsetCollapsable::priv_dispatch(cur, cmd);
+ InsetCollapsable::doDispatch(cur, cmd);
break;
}
}
Index: insets/insetbranch.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbranch.h,v
retrieving revision 1.17
diff -u -p -B -b -w -r1.17 insetbranch.h
--- insets/insetbranch.h 23 Nov 2004 23:04:47 -0000 1.17
+++ insets/insetbranch.h 24 Nov 2004 01:13:07 -0000
@@ -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;
Index: insets/insetcharstyle.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcharstyle.C,v
retrieving revision 1.28
diff -u -p -B -b -w -r1.28 insetcharstyle.C
--- insets/insetcharstyle.C 23 Nov 2004 23:04:47 -0000 1.28
+++ insets/insetcharstyle.C 24 Nov 2004 01:13:07 -0000
@@ -163,7 +163,7 @@ void InsetCharStyle::getDrawFont(LyXFont
}
-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(LCurs
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;
}
}
Index: insets/insetcharstyle.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcharstyle.h,v
retrieving revision 1.10
diff -u -p -B -b -w -r1.10 insetcharstyle.h
--- insets/insetcharstyle.h 23 Nov 2004 23:04:47 -0000 1.10
+++ insets/insetcharstyle.h 24 Nov 2004 01:13:07 -0000
@@ -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;
Index: insets/insetcollapsable.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcollapsable.C,v
retrieving revision 1.261
diff -u -p -B -b -w -r1.261 insetcollapsable.C
--- insets/insetcollapsable.C 11 Nov 2004 08:18:30 -0000 1.261
+++ insets/insetcollapsable.C 24 Nov 2004 01:13:07 -0000
@@ -251,30 +251,30 @@ InsetBase * InsetCollapsable::editXY(LCu
}
-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
// << " 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(LCu
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(LCu
break;
default:
- InsetText::priv_dispatch(cur, cmd);
+ InsetText::doDispatch(cur, cmd);
break;
}
}
Index: insets/insetcollapsable.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcollapsable.h,v
retrieving revision 1.177
diff -u -p -B -b -w -r1.177 insetcollapsable.h
--- insets/insetcollapsable.h 13 Aug 2004 19:14:14 -0000 1.177
+++ insets/insetcollapsable.h 24 Nov 2004 01:13:07 -0000
@@ -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;
///
Index: insets/insetcommand.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcommand.C,v
retrieving revision 1.114
diff -u -p -B -b -w -r1.114 insetcommand.C
--- insets/insetcommand.C 24 Jul 2004 10:55:25 -0000 1.114
+++ insets/insetcommand.C 24 Nov 2004 01:13:07 -0000
@@ -98,7 +98,7 @@ int InsetCommand::docbook(Buffer const &
}
-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
}
default:
- InsetOld::priv_dispatch(cur, cmd);
+ InsetOld::doDispatch(cur, cmd);
break;
}
Index: insets/insetcommand.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcommand.h,v
retrieving revision 1.86
diff -u -p -B -b -w -r1.86 insetcommand.h
--- insets/insetcommand.h 18 Mar 2004 12:53:38 -0000 1.86
+++ insets/insetcommand.h 24 Nov 2004 01:13:07 -0000
@@ -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(); }
///
Index: insets/insetert.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetert.C,v
retrieving revision 1.198
diff -u -p -B -b -w -r1.198 insetert.C
--- insets/insetert.C 23 Nov 2004 23:04:47 -0000 1.198
+++ insets/insetert.C 24 Nov 2004 01:13:07 -0000
@@ -209,9 +209,9 @@ int InsetERT::docbook(Buffer const &, 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 & c
}
default:
- InsetCollapsable::priv_dispatch(cur, cmd);
+ InsetCollapsable::doDispatch(cur, cmd);
break;
}
}
Index: insets/insetert.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetert.h,v
retrieving revision 1.109
diff -u -p -B -b -w -r1.109 insetert.h
--- insets/insetert.h 23 Nov 2004 23:04:47 -0000 1.109
+++ insets/insetert.h 24 Nov 2004 01:13:07 -0000
@@ -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:
Index: insets/insetexternal.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetexternal.C,v
retrieving revision 1.152
diff -u -p -B -b -w -r1.152 insetexternal.C
--- insets/insetexternal.C 23 Nov 2004 23:04:47 -0000 1.152
+++ insets/insetexternal.C 24 Nov 2004 01:13:07 -0000
@@ -433,7 +433,7 @@ void InsetExternal::statusChanged() cons
}
-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(LCurso
break;
default:
- InsetOld::priv_dispatch(cur, cmd);
+ InsetOld::doDispatch(cur, cmd);
}
}
Index: insets/insetexternal.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetexternal.h,v
retrieving revision 1.75
diff -u -p -B -b -w -r1.75 insetexternal.h
--- insets/insetexternal.h 23 Nov 2004 23:04:47 -0000 1.75
+++ insets/insetexternal.h 24 Nov 2004 01:13:07 -0000
@@ -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<InsetBase> doClone() const;
Index: insets/insetfloat.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetfloat.C,v
retrieving revision 1.131
diff -u -p -B -b -w -r1.131 insetfloat.C
--- insets/insetfloat.C 23 Nov 2004 23:04:47 -0000 1.131
+++ insets/insetfloat.C 24 Nov 2004 01:13:07 -0000
@@ -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 &
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;
}
}
Index: insets/insetfloat.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetfloat.h,v
retrieving revision 1.66
diff -u -p -B -b -w -r1.66 insetfloat.h
--- insets/insetfloat.h 23 Nov 2004 23:04:47 -0000 1.66
+++ insets/insetfloat.h 24 Nov 2004 01:13:07 -0000
@@ -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<InsetBase> doClone() const;
Index: insets/insetgraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphics.C,v
retrieving revision 1.264
diff -u -p -B -b -w -r1.264 insetgraphics.C
--- insets/insetgraphics.C 23 Nov 2004 23:04:47 -0000 1.264
+++ insets/insetgraphics.C 24 Nov 2004 01:13:07 -0000
@@ -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(LCurso
break;
default:
- InsetOld::priv_dispatch(cur, cmd);
+ InsetOld::doDispatch(cur, cmd);
break;
}
}
Index: insets/insetgraphics.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphics.h,v
retrieving revision 1.101
diff -u -p -B -b -w -r1.101 insetgraphics.h
--- insets/insetgraphics.h 23 Nov 2004 23:04:48 -0000 1.101
+++ insets/insetgraphics.h 24 Nov 2004 01:13:07 -0000
@@ -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;
Index: insets/insetinclude.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetinclude.C,v
retrieving revision 1.197
diff -u -p -B -b -w -r1.197 insetinclude.C
--- insets/insetinclude.C 23 Nov 2004 23:04:48 -0000 1.197
+++ insets/insetinclude.C 24 Nov 2004 01:13:08 -0000
@@ -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
break;
default:
- InsetOld::priv_dispatch(cur, cmd);
+ InsetOld::doDispatch(cur, cmd);
break;
}
}
Index: insets/insetinclude.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetinclude.h,v
retrieving revision 1.102
diff -u -p -B -b -w -r1.102 insetinclude.h
--- insets/insetinclude.h 23 Nov 2004 23:04:48 -0000 1.102
+++ insets/insetinclude.h 24 Nov 2004 01:13:08 -0000
@@ -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<InsetBase> doClone() const;
Index: insets/insetlabel.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetlabel.C,v
retrieving revision 1.98
diff -u -p -B -b -w -r1.98 insetlabel.C
--- insets/insetlabel.C 23 Nov 2004 23:04:48 -0000 1.98
+++ insets/insetlabel.C 24 Nov 2004 01:13:08 -0000
@@ -92,7 +92,7 @@ void changeRefsIfUnique(BufferView & bv,
} // 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 &
}
default:
- InsetCommand::priv_dispatch(cur, cmd);
+ InsetCommand::doDispatch(cur, cmd);
break;
}
}
Index: insets/insetlabel.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetlabel.h,v
retrieving revision 1.65
diff -u -p -B -b -w -r1.65 insetlabel.h
--- insets/insetlabel.h 23 Nov 2004 23:04:48 -0000 1.65
+++ insets/insetlabel.h 24 Nov 2004 01:13:08 -0000
@@ -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<InsetBase> doClone() const;
};
Index: insets/insetnote.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetnote.C,v
retrieving revision 1.77
diff -u -p -B -b -w -r1.77 insetnote.C
--- insets/insetnote.C 23 Nov 2004 23:04:48 -0000 1.77
+++ insets/insetnote.C 24 Nov 2004 01:13:08 -0000
@@ -184,7 +184,7 @@ bool InsetNote::showInsetDialog(BufferVi
}
-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 &
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;
}
}
Index: insets/insetnote.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetnote.h,v
retrieving revision 1.45
diff -u -p -B -b -w -r1.45 insetnote.h
--- insets/insetnote.h 23 Nov 2004 23:04:48 -0000 1.45
+++ insets/insetnote.h 24 Nov 2004 01:13:08 -0000
@@ -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;
Index: insets/insetref.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetref.C,v
retrieving revision 1.92
diff -u -p -B -b -w -r1.92 insetref.C
--- insets/insetref.C 2 Nov 2004 11:25:18 -0000 1.92
+++ insets/insetref.C 24 Nov 2004 01:13:08 -0000
@@ -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 & c
return;
default:
- return InsetCommand::priv_dispatch(cur, cmd);
+ return InsetCommand::doDispatch(cur, cmd);
}
}
Index: insets/insetref.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetref.h,v
retrieving revision 1.66
diff -u -p -B -b -w -r1.66 insetref.h
--- insets/insetref.h 23 Nov 2004 23:04:48 -0000 1.66
+++ insets/insetref.h 24 Nov 2004 01:13:08 -0000
@@ -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<InsetBase> doClone() const {
return std::auto_ptr<InsetBase>(new InsetRef(*this));
Index: insets/insettabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettabular.C,v
retrieving revision 1.441
diff -u -p -B -b -w -r1.441 insettabular.C
--- insets/insettabular.C 23 Nov 2004 23:04:48 -0000 1.441
+++ insets/insettabular.C 24 Nov 2004 01:13:08 -0000
@@ -410,7 +410,7 @@ InsetBase * InsetTabular::editXY(LCursor
}
-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;
Index: insets/insettabular.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettabular.h,v
retrieving revision 1.196
diff -u -p -B -b -w -r1.196 insettabular.h
--- insets/insettabular.h 23 Nov 2004 23:04:48 -0000 1.196
+++ insets/insettabular.h 24 Nov 2004 01:13:08 -0000
@@ -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:
Index: insets/insettext.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettext.C,v
retrieving revision 1.599
diff -u -p -B -b -w -r1.599 insettext.C
--- insets/insettext.C 23 Nov 2004 23:04:48 -0000 1.599
+++ insets/insettext.C 24 Nov 2004 01:13:08 -0000
@@ -290,9 +290,9 @@ InsetBase * InsetText::editXY(LCursor &
}
-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;
Index: insets/insettext.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettext.h,v
retrieving revision 1.263
diff -u -p -B -b -w -r1.263 insettext.h
--- insets/insettext.h 23 Nov 2004 23:04:49 -0000 1.263
+++ insets/insettext.h 24 Nov 2004 01:13:08 -0000
@@ -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<InsetBase> doClone() const;
Index: insets/insetvspace.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetvspace.C,v
retrieving revision 1.14
diff -u -p -B -b -w -r1.14 insetvspace.C
--- insets/insetvspace.C 23 Nov 2004 23:04:49 -0000 1.14
+++ insets/insetvspace.C 24 Nov 2004 01:13:08 -0000
@@ -60,7 +60,7 @@ std::auto_ptr<InsetBase> InsetVSpace::do
}
-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
break;
default:
- InsetOld::priv_dispatch(cur, cmd);
+ InsetOld::doDispatch(cur, cmd);
break;
}
}
Index: insets/insetvspace.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetvspace.h,v
retrieving revision 1.8
diff -u -p -B -b -w -r1.8 insetvspace.h
--- insets/insetvspace.h 23 Nov 2004 23:04:49 -0000 1.8
+++ insets/insetvspace.h 24 Nov 2004 01:13:08 -0000
@@ -52,7 +52,7 @@ public:
protected:
///
- virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd);
+ virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
private:
virtual std::auto_ptr<InsetBase> doClone() const;
Index: insets/insetwrap.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetwrap.C,v
retrieving revision 1.68
diff -u -p -B -b -w -r1.68 insetwrap.C
--- insets/insetwrap.C 23 Nov 2004 23:04:49 -0000 1.68
+++ insets/insetwrap.C 24 Nov 2004 01:13:08 -0000
@@ -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 &
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;
}
}
Index: insets/insetwrap.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetwrap.h,v
retrieving revision 1.34
diff -u -p -B -b -w -r1.34 insetwrap.h
--- insets/insetwrap.h 23 Nov 2004 23:04:49 -0000 1.34
+++ insets/insetwrap.h 24 Nov 2004 01:13:08 -0000
@@ -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<InsetBase> doClone() const;
Index: insets/updatableinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/updatableinset.C,v
retrieving revision 1.46
diff -u -p -B -b -w -r1.46 updatableinset.C
--- insets/updatableinset.C 14 Aug 2004 14:03:41 -0000 1.46
+++ insets/updatableinset.C 24 Nov 2004 01:13:08 -0000
@@ -89,7 +89,7 @@ void UpdatableInset::scroll(BufferView &
}
-void UpdatableInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+void UpdatableInset::doDispatch(LCursor & cur, FuncRequest & cmd)
{
switch (cmd.action) {
//case LFUN_MOUSE_RELEASE:
Index: insets/updatableinset.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/updatableinset.h,v
retrieving revision 1.35
diff -u -p -B -b -w -r1.35 updatableinset.h
--- insets/updatableinset.h 18 Mar 2004 12:53:41 -0000 1.35
+++ insets/updatableinset.h 24 Nov 2004 01:13:08 -0000
@@ -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
Index: mathed/math_gridinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_gridinset.C,v
retrieving revision 1.153
diff -u -p -B -b -w -r1.153 math_gridinset.C
--- mathed/math_gridinset.C 23 Nov 2004 23:04:50 -0000 1.153
+++ mathed/math_gridinset.C 24 Nov 2004 01:13:08 -0000
@@ -1008,7 +1008,7 @@ void MathGridInset::splitCell(LCursor &
}
-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(LCurso
// 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(LCurso
break;
default:
- MathNestInset::priv_dispatch(cur, cmd);
+ MathNestInset::doDispatch(cur, cmd);
}
}
Index: mathed/math_gridinset.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_gridinset.h,v
retrieving revision 1.83
diff -u -p -B -b -w -r1.83 math_gridinset.h
--- mathed/math_gridinset.h 23 Nov 2004 23:04:50 -0000 1.83
+++ mathed/math_gridinset.h 24 Nov 2004 01:13:08 -0000
@@ -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;
Index: mathed/math_hullinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_hullinset.C,v
retrieving revision 1.158
diff -u -p -B -b -w -r1.158 math_hullinset.C
--- mathed/math_hullinset.C 23 Nov 2004 23:04:50 -0000 1.158
+++ mathed/math_hullinset.C 24 Nov 2004 01:13:09 -0000
@@ -970,7 +970,7 @@ void MathHullInset::doExtern(LCursor & c
}
-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(LCurso
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(LCurso
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(LCurso
}
default:
- MathGridInset::priv_dispatch(cur, cmd);
+ MathGridInset::doDispatch(cur, cmd);
break;
}
}
Index: mathed/math_hullinset.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_hullinset.h,v
retrieving revision 1.59
diff -u -p -B -b -w -r1.59 math_hullinset.h
--- mathed/math_hullinset.h 23 Nov 2004 23:04:50 -0000 1.59
+++ mathed/math_hullinset.h 24 Nov 2004 01:13:09 -0000
@@ -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,
Index: mathed/math_mboxinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_mboxinset.C,v
retrieving revision 1.11
diff -u -p -B -b -w -r1.11 math_mboxinset.C
--- mathed/math_mboxinset.C 23 Nov 2004 23:04:52 -0000 1.11
+++ mathed/math_mboxinset.C 24 Nov 2004 01:13:09 -0000
@@ -90,7 +90,7 @@ int MathMBoxInset::latex(Buffer const &
}
-void MathMBoxInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+void MathMBoxInset::doDispatch(LCursor & cur, FuncRequest & cmd)
{
text_.dispatch(cur, cmd);
}
Index: mathed/math_mboxinset.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_mboxinset.h,v
retrieving revision 1.8
diff -u -p -B -b -w -r1.8 math_mboxinset.h
--- mathed/math_mboxinset.h 23 Nov 2004 23:04:52 -0000 1.8
+++ mathed/math_mboxinset.h 24 Nov 2004 01:13:09 -0000
@@ -27,9 +27,6 @@ public:
/// 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; }
///
bool isActive() const { return true; }
@@ -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_;
///
Index: mathed/math_nestinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_nestinset.C,v
retrieving revision 1.139
diff -u -p -B -b -w -r1.139 math_nestinset.C
--- mathed/math_nestinset.C 7 Nov 2004 09:39:34 -0000 1.139
+++ mathed/math_nestinset.C 24 Nov 2004 01:13:09 -0000
@@ -380,7 +380,7 @@ void MathNestInset::handleFont2(LCursor
}
-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(LCurso
}
default:
- MathDimInset::priv_dispatch(cur, cmd);
+ MathDimInset::doDispatch(cur, cmd);
break;
}
}
Index: mathed/math_nestinset.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_nestinset.h,v
retrieving revision 1.65
diff -u -p -B -b -w -r1.65 math_nestinset.h
--- mathed/math_nestinset.h 13 Aug 2004 19:14:17 -0000 1.65
+++ mathed/math_nestinset.h 24 Nov 2004 01:13:09 -0000
@@ -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;
Index: mathed/math_scriptinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_scriptinset.C,v
retrieving revision 1.119
diff -u -p -B -b -w -r1.119 math_scriptinset.C
--- mathed/math_scriptinset.C 23 Nov 2004 23:04:52 -0000 1.119
+++ mathed/math_scriptinset.C 24 Nov 2004 01:13:09 -0000
@@ -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(LCur
return;
}
- MathNestInset::priv_dispatch(cur, cmd);
+ MathNestInset::doDispatch(cur, cmd);
}
Index: mathed/math_scriptinset.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_scriptinset.h,v
retrieving revision 1.69
diff -u -p -B -b -w -r1.69 math_scriptinset.h
--- mathed/math_scriptinset.h 23 Nov 2004 23:04:52 -0000 1.69
+++ mathed/math_scriptinset.h 24 Nov 2004 01:13:09 -0000
@@ -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<InsetBase> doClone() const;
/// returns x offset for main part
Index: mathed/ref_inset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/ref_inset.C,v
retrieving revision 1.48
diff -u -p -B -b -w -r1.48 ref_inset.C
--- mathed/ref_inset.C 2 Nov 2004 11:25:20 -0000 1.48
+++ mathed/ref_inset.C 24 Nov 2004 01:13:09 -0000
@@ -56,7 +56,7 @@ void RefInset::infoize(std::ostream & os
}
-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 & c
break;
default:
- CommandInset::priv_dispatch(cur, cmd);
+ CommandInset::doDispatch(cur, cmd);
break;
}
}
Index: mathed/ref_inset.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/ref_inset.h,v
retrieving revision 1.25
diff -u -p -B -b -w -r1.25 ref_inset.h
--- mathed/ref_inset.h 2 Nov 2004 11:25:20 -0000 1.25
+++ mathed/ref_inset.h 24 Nov 2004 01:13:09 -0000
@@ -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
--
Lgb
