#include "frontends/LyXKeySym.h"
#include "frontends/LyXKeySymFactory.h"
+
+namespace lyx {
+
using std::make_pair;
+using std::string;
-int kb_sequence::addkey(LyXKeySymPtr key,
- key_modifier::state mod, key_modifier::state nmod)
+FuncRequest const &
+kb_sequence::addkey(LyXKeySymPtr key,
+ key_modifier::state mod, key_modifier::state nmod)
{
// adding a key to a deleted sequence
// starts a new sequence
return curmap->lookup(key, mod, this);
}
- return LFUN_UNKNOWN_ACTION;
+ static FuncRequest unknown(LFUN_UNKNOWN_ACTION);
+ return unknown;
}
KeySequence::size_type i, length = sequence.size();
for (i = 0; i < length; ++i) {
- buf += kb_keymap::printKeysym(sequence[i], modifiers[i].first);
+ buf += sequence[i]->print(modifiers[i].first);
// append a blank
if (i + 1 < length) {
if (!curmap)
return buf;
- buf += _(" options: ");
+ buf += to_utf8(_(" options: "));
buf += curmap->print();
return buf;
}
sequence.clear();
reset();
}
+
+
+} // namespace lyx