rename priv_dispatch to doDispatch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9301 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 817d0786790b185f9996deab92de0d8be9b79fd1..8cc8566dd6d496a1d47d5425a781dd2dc40bcc80 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -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>
 
        * insettabular.C (tabularFeatures): fix multicolumn handling

diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C
index 9968f41d7323ea0507f686a4e199b06fdb8e180f..07604664521bb981aac570caa87e5dd6144a2a0a 100644 (file)
--- 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 adb1bd09447583abb1a5fb6dc7286ca3d60e6526..90a17044e947db071778a2e9df9eb75441be2ab5 100644 (file)
--- 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<InsetBase> doClone() const = 0;
 };

diff --git a/src/insets/insetbibitem.C b/src/insets/insetbibitem.C
index f90e68efecb184f8281d98fd1ed9c51f0119ac1d..7338afbbbfa47559c3b66fc33851b8651faf414f 100644 (file)
--- a/src/insets/insetbibitem.C
+++ b/src/insets/insetbibitem.C
@@ -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) {
 
@@ -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 b91d9f01590cb0d7228e3506d43b1060300037e8..df192ae5038b7fb54d725fa2a852af3582d1f336 100644 (file)
--- 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<InsetBase> doClone() const;
 

diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C
index 22c3886751c26fd60fcbcb94aa7b47573346528d..73ca790e50296ee3b8f9153b26cc62cb960ae606 100644 (file)
--- a/src/insets/insetbibtex.C
+++ b/src/insets/insetbibtex.C
@@ -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) {
 
@@ -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 1ab4d856944001767fe902377a6a6a2b70de51ef..f2148395a000d878877176f09310bbb0c6af75fd 100644 (file)
--- 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<InsetBase> doClone() const;
 

diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C
index e1836d5e23d3b3731aea90124f572ff14cb36685..1007564430f7bf6d9f704a4d65fddcb21386bfd7 100644 (file)
--- 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 a29ac78520a7451f2fb71d2575087da4d0b37fa5..a15b0c5366d51ca3a17b799eb4b63f8cf9acc25d 100644 (file)
--- 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 d199b7ce06c5b39030c64a4fa249eae727ef49c2..8eae1a7a0af5fb0548cf096914111db9231f3e27 100644 (file)
--- 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 f0c002ba05fbf2c3bb787693b97bf8b74c93bdc3..9d5d3cd48ce0fe65a6c8c1b457b5c915c62b19c3 100644 (file)
--- 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 9d8e51eb43cca743245898c31c6133a8daf37fc6..444f647e9245afd76e877877299a9f6eab2cfcee 100644 (file)
--- 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 c926e0ccf19c7b46682dcdca2feb561311c32ed3..ae06acf1b89196c2ae55a56074d57ba19868699e 100644 (file)
--- 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 633b1d60ec1952103e97bffb3c2f103838c54c0e..52d6723e1660d660595ccd46755990753f9c57a9 100644 (file)
--- 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 335c0ddb340546c28586d5d816bd8487cfebbbef..8322ca17059beff5ced31686108557996e20e58c 100644 (file)
--- 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 77a357b05eec3321777c47dfed2bf7bf1fa9bed6..bc4d9bf7faf7b1b99783964d4eaed1ab495d5185 100644 (file)
--- 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 1548d7c84d2eaa1d96be80e4365be517ad6bbed5..3848a76a402511c6873be4953453f40673b5b29d 100644 (file)
--- 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 f8de91372a2ac4ce9777ca660b936ab2cabd888e..d81362a13419564997edba48e9130698d916ab2b 100644 (file)
--- 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 9cb08225e3e4f485a78bb711e73c0ffaac62b27a..40b9e139a2c9c5292f2f1d64ab5234701212b64c 100644 (file)
--- 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 33e477c44d95ba653d2e00285d5b0ec3df30df30..15e572ac8388e9678b8ec17f1c15c3ae92a36c97 100644 (file)
--- 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 34901ec1d76be4de6da0be035909bd72fc47f40e..3a68c55d1cf3ee7c25f6883d2b21318e594e5304 100644 (file)
--- 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<InsetBase> doClone() const;
 

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 156bd62f704add00bc919f28cebb4aa24cce67b5..87c8482532c729c7cd2143e0d770e84eab9cf1ad 100644 (file)
--- 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 a5b4867fba1f76860e04e80554a4ebccf5a77753..1bb48f78af49cb896d3ca99a1449876a86b0302a 100644 (file)
--- 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<InsetBase> doClone() const;
 

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 8fd76dee93867838e51e13197e5def442620afa4..bed26acef733f9790f6ba7aaa6e00339245ca99a 100644 (file)
--- 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 2a552da5116fa6095a87f46cc3ae6f982121cf2c..0fe0c6daff43712ada94c14974f578ae933ff2ed 100644 (file)
--- 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 cb9a12c09a972d3221b56078038c95627ddaa43d..c1278f01a841e0507ddb8f6e69421aec30a333bc 100644 (file)
--- 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 3e140a22f7c66fb13cc1f3ad1b23ab7aacea9015..028a05f2f24116e3cca24b8067c7b4d54c284347 100644 (file)
--- 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<InsetBase> doClone() const;
 

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 7e19d69bd22c4286dc8295eb69d9ece91a9f1add..edffe585ade7da28aff342fa2d4f14670d5c5708 100644 (file)
--- 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 8ea8190e2ff1d60062a324c267aa139c8e2b62fc..e0aecd27efbc3cdf6f466f700295cf211b08482c 100644 (file)
--- 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<InsetBase> doClone() const;
 };

diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index ec0eb9018d6dc8a1b3c0e8a99f5fe6c5f113a7ee..7efca67d458b0928a2092715d960ed9bb2bc3c6b 100644 (file)
--- 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 9f46783116bf8668e1e19b3d2a667ce558812daa..5f4a34040ae6c30054c98bdfa3d571cf12b26e37 100644 (file)
--- 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 08d586e07244dd3d5102fd44ecdac3e22fb9589c..d104146ff150c2add54752bc0c4b2a8d895aca82 100644 (file)
--- 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 f5fcd2bc7793e4d8711fc6340916cdda060b7bc2..8ae06c9e54b621c1417b534cbb9341ceb121b26b 100644 (file)
--- 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<InsetBase> doClone() const {
                return std::auto_ptr<InsetBase>(new InsetRef(*this));

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 838cde35d58f509412449d2d67d9a1ea24d7e214..60c735940907dcba45255e7b2629932376c7274f 100644 (file)
--- 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 54e279e3d2ce14a1475b2041ef95b742401fefab..b6a6f93970afbe7cb5beb1799c06f86e05c2b3eb 100644 (file)
--- 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 8578d2c22250cb2eabffbf3fa3f3b8d0c1977980..d571d5f43a46d1a29261eb4f3405271198e8cc42 100644 (file)
--- 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 4372b628e33bef8cd85bfcc191ec92fd791112aa..ad86205f1bf06cefa66fd67023a5e0b8abc36932 100644 (file)
--- 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<InsetBase> doClone() const;
 

diff --git a/src/insets/insetvspace.C b/src/insets/insetvspace.C
index 368d1a259bcebb2f1024cf1b45667e08af543224..c6596972fa2e4d9d0f2df6470e75a931e18fe2e4 100644 (file)
--- a/src/insets/insetvspace.C
+++ b/src/insets/insetvspace.C
@@ -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) {
 
@@ -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 e12046ece0ac1159dcdf59636d311d75d3fc69f5..3fe0caf90c82bacd770d43ff4446f925cd227399 100644 (file)
--- 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<InsetBase> doClone() const;
-       
+
        ///
        VSpace space_;
 };

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 60f264e69bf9a6455940c4f6ba06c0aac20215a6..66d8ae29e93627cc26d107c3a3329b3e85049ebd 100644 (file)
--- 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 7ed0dc42a5e5a0986547b412bc225eb522f29af5..1acd4acc21c9c928581254722ec60abecd0eafb7 100644 (file)
--- 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<InsetBase> doClone() const;
 

diff --git a/src/insets/updatableinset.C b/src/insets/updatableinset.C
index 4ba16bc04673eb27c65a0343207ffac4cc334af6..a989682a68a25454cbb16ad803b5d8f927e9377a 100644 (file)
--- 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 c0c89b5682093656cfbb3668022c32ab762f1004..1bc7253025fd145e4f00539533cee6cbb2f76642 100644 (file)
--- 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 c37368e40b8b2c77a8beeeffaf31bb2322252b42..d614278d5f553963fdeaf52f622cef75462abb75 100644 (file)
--- 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 5bd6636eb1a0686132813074aacfacbf249f58d8..174691e6c964f067d4a28d8b8758bf234f4a3535 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -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>
 
        * math_hullinset.C (operator): use common semantics

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index dd25e080413667743dbd78d1087b63fe3c532756..26d56cf4e7251d4457051006fa281f8258e1a377 100644 (file)
--- 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 52ff62a52bb78caf092b5671ddfdeea115a2c8cc..7b0b329552cf40efaeb3b22545c92c69f01e50be 100644 (file)
--- 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 7bf1b7903e08f88daae19c92dfd8a85f28ea3428..64ac084e3d9002081fa818707cc93011dfc0f55d 100644 (file)
--- 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 8f6d205d50d5eebbaf8f0223d93eb33ec1bb32d8..d82b845c5b37a6cb450aff5990d38145742c029d 100644 (file)
--- 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 43ddc1823b3dddca3d4c1b9f632e6c4ec256b6f2..ec3faecf38f55e4b1227617857ff84f9e53b10d7 100644 (file)
--- 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 a7199541c7ba961b7eb35fbe3bc3f871bbf60a56..f1926208270ce37b4118b27fd3ee20c5ffabbb1a 100644 (file)
--- 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 7648cf26ca19ce6ce0cd90451a58a71a79f58632..79d058907e3ce0f105bca9010f9d95b3ddebe3d4 100644 (file)
--- 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 819d64dc647051def384e1aa30947116b78da727..fb9d3b313479aca6bfd86c82a33941af28f92589 100644 (file)
--- 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 55f9a6159af2d0be1f4bdb1379aaadbddaa3c3b0..cf23765572186e00b490bb7606b1210e4e5316e8 100644 (file)
--- 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 fc853613eadceda3b7521e3c485f780129ce1627..b6fa642d1d9a9506bc33b99066faf21a702ce6ca 100644 (file)
--- 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<InsetBase> doClone() const;
        /// returns x offset for main part

diff --git a/src/mathed/ref_inset.C b/src/mathed/ref_inset.C
index e3e7d1108f2aaf3c259d4e1d597f42628230286a..12d502a153e88441e6b75b0858a47397859b4a1d 100644 (file)
--- 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 << "<xref linkend=\"" << sgml::cleanID(buf, runparams, asString(cell(0)));
-               if (runparams.flavor == OutputParams::XML) 
+               if (runparams.flavor == OutputParams::XML)
                        os << "\"/>";
                else
                        os << "\">";

diff --git a/src/mathed/ref_inset.h b/src/mathed/ref_inset.h
index 0e3b80043b59462ea03f19c9ec8d1c8e7f48cf2e..cdd17806705ea5f372285f51426a923b00808beb 100644 (file)
--- 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