From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Wed, 29 Oct 2003 13:34:11 +0000 (+0000)
Subject: FINISHED_POP -> FINISHED
X-Git-Tag: 1.6.10~15868
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3df493e9d621df9124900680337a6754b492a087;p=features.git

FINISHED_POP -> FINISHED


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

diff --git a/src/ChangeLog b/src/ChangeLog
index f727aa2711..fccc3eae36 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-29  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* dispatchresult.h: remove FINISHED_POP as FINISHED has the same
+	meaning.
+
 2003-10-29  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* dispatchresult.h: rename DISPATCHED_POP to FINISHED_POP, remove
diff --git a/src/dispatchresult.h b/src/dispatchresult.h
index 0700dd517a..f533534a57 100644
--- a/src/dispatchresult.h
+++ b/src/dispatchresult.h
@@ -35,8 +35,7 @@ enum dispatch_result_t {
 	FINISHED,
 	FINISHED_RIGHT,
 	FINISHED_UP,
-	FINISHED_DOWN,
-	FINISHED_POP
+	FINISHED_DOWN
 };
 
 /** \c DispatchResult is a wrapper for dispatch_result_t.
diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index df03a27f37..1b383c23b0 100644
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -2,7 +2,14 @@
 
 	* math_hullinset.C (priv_dispatch): 
 	* math_gridinset.C (priv_dispatch): 
+	* math_cursor.C (dispatch): FINISHED_POP -> FINISHED
+
+2003-10-29  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* math_hullinset.C (priv_dispatch):
+	* math_gridinset.C (priv_dispatch):
 	* math_cursor.C (dispatch): DISPATCHED_POP -> FINISHED_POP
+	(dispatch): 
 
 	* math_scriptinset.h: change dispatch to priv_dispatch and make it
 	protected
diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C
index bfea72d107..0dde4c4661 100644
--- a/src/mathed/math_cursor.C
+++ b/src/mathed/math_cursor.C
@@ -1439,7 +1439,7 @@ DispatchResult MathCursor::dispatch(FuncRequest const & cmd)
 		CursorPos & pos = Cursor_[i];
 		DispatchResult res = pos.inset_->dispatch(cmd, pos.idx_, pos.pos_);
 		if (res != UNDISPATCHED) {
-			if (res == FINISHED_POP) {
+			if (res == FINISHED) {
 				Cursor_.shrink(i + 1);
 				selClear();
 			}
diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index ffc31f08e6..b5d39f4b26 100644
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -1072,12 +1072,12 @@ DispatchResult MathGridInset::priv_dispatch(FuncRequest const & cmd,
 				idx = nargs() - 1;
 			if (pos > cell(idx).size())
 				pos = cell(idx).size();
-			return FINISHED_POP;
+			return FINISHED;
 
 		case LFUN_CELL_SPLIT:
 			//recordUndo(bv, Undo::ATOMIC);
 			splitCell(idx, pos);
-			return FINISHED_POP;
+			return FINISHED;
 
 		case LFUN_BREAKLINE: {
 			//recordUndo(bv, Undo::INSERT);
@@ -1096,7 +1096,7 @@ DispatchResult MathGridInset::priv_dispatch(FuncRequest const & cmd,
 			pos = cell(idx).size();
 
 			//mathcursor->normalize();
-			return FINISHED_POP;
+			return FINISHED;
 		}
 
 		case LFUN_TABULAR_FEATURE: {
@@ -1152,8 +1152,8 @@ DispatchResult MathGridInset::priv_dispatch(FuncRequest const & cmd,
 				swapCol(col(idx));
 			else
 				return UNDISPATCHED;
-			lyxerr << "returning DISPATCHED_POP" << endl;
-			return FINISHED_POP;
+			lyxerr << "returning FINISHED" << endl;
+			return FINISHED;
 		}
 
 		case LFUN_PASTE: {
@@ -1184,7 +1184,7 @@ DispatchResult MathGridInset::priv_dispatch(FuncRequest const & cmd,
 					for (col_type c = 0; c < grid.ncols(); ++c)
 						cell(i).append(grid.cell(grid.index(r, c)));
 			}
-			return FINISHED_POP;
+			return FINISHED;
 		}
 
 		default:
diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index dd55c413d6..179baddf22 100644
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -782,7 +782,7 @@ DispatchResult MathHullInset::priv_dispatch
 				mutate("eqnarray");
 				idx = 1;
 				pos = 0;
-				return FINISHED_POP;
+				return FINISHED;
 			}
 			return MathGridInset::priv_dispatch(cmd, idx, pos);
 
@@ -837,7 +837,7 @@ DispatchResult MathHullInset::priv_dispatch
 
 		case LFUN_MATH_EXTERN:
 			doExtern(cmd, idx, pos);
-			return FINISHED_POP;
+			return FINISHED;
 
 		case LFUN_MATH_MUTATE: {
 			lyxerr << "Hull: MUTATE: " << cmd.argument << endl;
@@ -849,14 +849,14 @@ DispatchResult MathHullInset::priv_dispatch
 				idx = nargs() - 1;
 			if (pos > cell(idx).size())
 				pos = cell(idx).size();
-			return FINISHED_POP;
+			return FINISHED;
 		}
 
 		case LFUN_MATH_DISPLAY: {
 			mutate(type_ == "simple" ? "equation" : "simple");
 			idx = 0;
 			pos = cell(idx).size();
-			return FINISHED_POP;
+			return FINISHED;
 		}
 
 		default: