X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbsequence.C;h=f37afa95767c685d511bd5c58202dd2d11a8be07;hb=2c832e6578ae146a2b51967cbc78cd640959f196;hp=2cae7938db17f0f892c18f35896030cc78a2c15a;hpb=495cd0eea03f9f5471a247e60ce70abfd1114ada;p=lyx.git diff --git a/src/kbsequence.C b/src/kbsequence.C index 2cae7938db..f37afa9576 100644 --- a/src/kbsequence.C +++ b/src/kbsequence.C @@ -21,7 +21,11 @@ #include "frontends/LyXKeySym.h" #include "frontends/LyXKeySymFactory.h" + +namespace lyx { + using std::make_pair; +using std::string; FuncRequest const & @@ -126,9 +130,9 @@ string::size_type kb_sequence::parse(string const & s) } -string const kb_sequence::print() const +docstring const kb_sequence::print() const { - string buf; + docstring buf; //if (deleted_) // return buf; @@ -136,7 +140,7 @@ string const kb_sequence::print() const 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) { @@ -147,9 +151,9 @@ string const kb_sequence::print() const } -string const kb_sequence::printOptions() const +docstring const kb_sequence::printOptions() const { - string buf; + docstring buf; buf += print(); @@ -179,3 +183,6 @@ void kb_sequence::clear() sequence.clear(); reset(); } + + +} // namespace lyx