From: Richard Heck <rgheck@comcast.net>
Date: Thu, 2 Apr 2009 15:53:23 +0000 (+0000)
Subject: Clean up a bit.
X-Git-Tag: 2.0.0~6971
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9098af80aa420a44fa818ca2d1dc627d1a94a963;p=features.git

Clean up a bit.


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

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index a174ac4f72..7cc25765ab 100644
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -262,8 +262,7 @@ FuncRequest const & KeyMap::lookup(KeySymbol const &key,
 		  KeyModifier mod, KeySequence * seq) const
 {
 	if (table.empty()) {
-		seq->curmap = seq->stdmap;
-		seq->mark_deleted();
+		seq->reset();
 		return FuncRequest::unknown;
 	}
 
@@ -281,16 +280,14 @@ FuncRequest const & KeyMap::lookup(KeySymbol const &key,
 				return prefix;
 			} else {
 				// final key - reset map
-				seq->curmap = seq->stdmap;
-				seq->mark_deleted();
+				seq->reset();
 				return cit->func;
 			}
 		}
 	}
 
 	// error - key not found:
-	seq->curmap = seq->stdmap;
-	seq->mark_deleted();
+	seq->reset();
 
 	return FuncRequest::unknown;
 }
diff --git a/src/KeySequence.cpp b/src/KeySequence.cpp
index 734371e0b7..177e74e1bf 100644
--- a/src/KeySequence.cpp
+++ b/src/KeySequence.cpp
@@ -169,15 +169,9 @@ docstring const KeySequence::printOptions(bool forgui) const
 }
 
 
-void KeySequence::mark_deleted()
-{
-	deleted_ = true;
-}
-
-
 void KeySequence::reset()
 {
-	mark_deleted();
+	deleted_ = true;
 	curmap = stdmap;
 }
 
diff --git a/src/KeySequence.h b/src/KeySequence.h
index 0ace8febe3..77b511ccf7 100644
--- a/src/KeySequence.h
+++ b/src/KeySequence.h
@@ -82,9 +82,6 @@ public:
 	 */
 	docstring const printOptions(bool forgui) const;
 
-	/// Mark the sequence as deleted.
-	void mark_deleted();
-
 	/// Reset sequence to become "deleted"
 	void reset();