anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up a bit.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29015 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-04-02 15:53:23 +00:00
parent 2b9cf569da
commit 9098af80aa
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/KeyMap.cpp
View File

@ -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;
}

8
src/KeySequence.cpp
View File

@ -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;
}

3
src/KeySequence.h
View File

@ -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();