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 a174ac4f727671a4963aad55cd8ac4aa5d81c488..7cc25765ab04470a55feff6b4803ef910591f4cd 100644 (file)
--- 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 734371e0b742a1b5e13857817c5465566c85eb28..177e74e1bfa34ef5829bf846b8aa443f7c70fda8 100644 (file)
--- 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 0ace8febe384a627164a8a1f683fbca10db6eca5..77b511ccf7ad1eac2b720b839a824fbb888ec437 100644 (file)
--- 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();