dispatch -> priv_dispatch where necessary

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

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index 7dd20d53f1edaceaaa0c0d30de77db26d7cdc2dc..89135398fa1a367c6327180c0534e5c896686695 100644 (file)
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -1041,8 +1041,8 @@ void MathGridInset::splitCell(idx_type & idx, pos_type & pos)
 }
 
 
-dispatch_result MathGridInset::dispatch
-       (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+dispatch_result MathGridInset::priv_dispatch(FuncRequest const & cmd,
+       idx_type & idx, pos_type & pos)
 {
        switch (cmd.action) {
 

diff --git a/src/mathed/math_gridinset.h b/src/mathed/math_gridinset.h
index 45c722d5501fceaa2b8126f3e5a7e0ad8f98108a..1757d245b865b15545d7a8c40ca531d3817086e4 100644 (file)
--- a/src/mathed/math_gridinset.h
+++ b/src/mathed/math_gridinset.h
@@ -136,7 +136,8 @@ public:
        /// identifies GridInset
        MathGridInset const * asGridInset() const { return this; }
        /// local dispatcher
-       dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
+       dispatch_result priv_dispatch(FuncRequest const & cmd,
+               idx_type & idx, pos_type & pos);
 
        ///
        col_type ncols() const;

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 4761fe637641a2c4076a3c66d11cb1f43939b466..0a81fcf1a516f2e1572dc3b421513f76c6f3b41d 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -510,7 +510,7 @@ void MathHullInset::setType(string const & type)
 
 void MathHullInset::mutate(string const & newtype)
 {
-       //lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'" << endl;
+       lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'" << endl;
 
        // we try to move along the chain
        // none <-> simple <-> equation <-> eqnarray
@@ -771,7 +771,7 @@ void MathHullInset::doExtern
 }
 
 
-dispatch_result MathHullInset::dispatch
+dispatch_result MathHullInset::priv_dispatch
        (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
 {
        switch (cmd.action) {
@@ -839,6 +839,7 @@ dispatch_result MathHullInset::dispatch
                        return DISPATCHED_POP;
 
                case LFUN_MATH_MUTATE: {
+                       lyxerr << "Hull: MUTATE: " << cmd.argument << endl;
                        row_type r = row(idx);
                        col_type c = col(idx);
                        mutate(cmd.argument);

diff --git a/src/mathed/math_hullinset.h b/src/mathed/math_hullinset.h
index 8e06ef542e605dd30c572017b6dad8fb8a013048..82256f7494630d384de82c8d48b1b8fd52902e60 100644 (file)
--- a/src/mathed/math_hullinset.h
+++ b/src/mathed/math_hullinset.h
@@ -51,7 +51,8 @@ public:
        ///
        bool ams() const;
        /// local dispatcher
-       dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
+       dispatch_result priv_dispatch(FuncRequest const & cmd,
+               idx_type & idx, pos_type & pos);
        /// Appends \c list with all labels found within this inset.
        void getLabelList(Buffer const &,
                          std::vector<std::string> & list) const;

diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index a603b4d0f5b069d91c3c639a3e58d1c5ca7abf41..3e4f3457bf525ecb9f464af3716970586e49869b 100644 (file)
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -285,8 +285,8 @@ void MathNestInset::notifyCursorLeaves(idx_type idx)
 }
 
 
-dispatch_result MathNestInset::dispatch
-       (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+dispatch_result MathNestInset::priv_dispatch(FuncRequest const & cmd,
+       idx_type & idx, pos_type & pos)
 {
        BufferView * bv = cmd.view();
 
@@ -307,7 +307,7 @@ dispatch_result MathNestInset::dispatch
 
                case LFUN_MOUSE_PRESS:
                        if (cmd.button() == mouse_button::button2)
-                               return dispatch(FuncRequest(bv, LFUN_PASTESELECTION), idx, pos);
+                               return priv_dispatch(FuncRequest(bv, LFUN_PASTESELECTION), idx, pos);
                        return UNDISPATCHED;
 
                default:

diff --git a/src/mathed/math_nestinset.h b/src/mathed/math_nestinset.h
index 4af8f0ab19c6679254230a2357c3303b8dbb57ec..4db158a2bac34fa5b6a69d628bfbd279fc9322a3 100644 (file)
--- a/src/mathed/math_nestinset.h
+++ b/src/mathed/math_nestinset.h
@@ -103,8 +103,8 @@ public:
        void normalize(NormalStream & os) const;
 
        /// local dispatcher
-       dispatch_result
-               dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
+       dispatch_result priv_dispatch(FuncRequest const & cmd,
+               idx_type & idx, pos_type & pos);
 
 protected:
        /// we store the cells in a vector