more IU

[lyx.git] / src / mathed / math_nestinset.C

diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index 9411cc01ad27da63ad108fbf73d44d68990529a6..36c90752345b9f5985e801c132b0b36cdbcdd3d5 100644 (file)
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -14,9 +14,11 @@
 #include "math_cursor.h"
 #include "math_mathmlstream.h"
 #include "math_parser.h"
-#include "funcrequest.h"
-#include "debug.h"
 #include "BufferView.h"
+#include "dispatchresult.h"
+#include "debug.h"
+#include "funcrequest.h"
+#include "LColor.h"
 #include "frontends/Painter.h"
 
 
@@ -101,22 +103,22 @@ bool MathNestInset::idxLeft(idx_type & idx, pos_type & pos) const
 }
 
 
-bool MathNestInset::idxFirst(idx_type & i, pos_type & pos) const
+bool MathNestInset::idxFirst(idx_type & idx, pos_type & pos) const
 {
        if (nargs() == 0)
                return false;
-       i = 0;
+       idx = 0;
        pos = 0;
        return true;
 }
 
 
-bool MathNestInset::idxLast(idx_type & i, pos_type & pos) const
+bool MathNestInset::idxLast(idx_type & idx, pos_type & pos) const
 {
        if (nargs() == 0)
                return false;
-       i = nargs() - 1;
-       pos = cell(i).size();
+       idx = nargs() - 1;
+       pos = cell(idx).size();
        return true;
 }
 
@@ -195,17 +197,6 @@ void MathNestInset::validate(LaTeXFeatures & features) const
 }
 
 
-bool MathNestInset::match(MathAtom const & at) const
-{
-       if (nargs() != at->nargs())
-               return false;
-       for (idx_type i = 0; i < nargs(); ++i)
-               if (!cell(i).match(at->cell(i)))
-                       return false;
-       return true;
-}
-
-
 void MathNestInset::replace(ReplaceData & rep)
 {
        for (idx_type i = 0; i < nargs(); ++i)
@@ -284,8 +275,9 @@ void MathNestInset::notifyCursorLeaves(idx_type idx)
 }
 
 
-dispatch_result MathNestInset::dispatch
-       (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+DispatchResult
+MathNestInset::priv_dispatch(FuncRequest const & cmd,
+                            idx_type & idx, pos_type & pos)
 {
        BufferView * bv = cmd.view();
 
@@ -296,7 +288,7 @@ dispatch_result MathNestInset::dispatch
                        mathed_parse_cell(ar, cmd.argument);
                        cell(idx).insert(pos, ar);
                        pos += ar.size();
-                       return DISPATCHED;
+                       return DispatchResult(true, true);
                }
 
                case LFUN_PASTESELECTION:
@@ -306,11 +298,11 @@ dispatch_result MathNestInset::dispatch
 
                case LFUN_MOUSE_PRESS:
                        if (cmd.button() == mouse_button::button2)
-                               return dispatch(FuncRequest(bv, LFUN_PASTESELECTION), idx, pos);
-                       return UNDISPATCHED;
+                               return priv_dispatch(FuncRequest(bv, LFUN_PASTESELECTION), idx, pos);
+                       return DispatchResult(false);
 
                default:
-                       return MathInset::dispatch(cmd, idx, pos);
+                       return MathInset::priv_dispatch(cmd, idx, pos);
        }
 }
 
@@ -354,5 +346,3 @@ void MathNestInset::drawMarkers2(PainterInfo & pi, int x, int y) const
        pi.pain.line(x, a, x + 3, a, LColor::mathframe);
        pi.pain.line(t - 3, a, t, a, LColor::mathframe);
 }
-
-