remove obsolete comment

[lyx.git] / src / kbmap.C

diff --git a/src/kbmap.C b/src/kbmap.C
index b744f9d88f1771fa187fd2bf154f09c9b4ce8705..5c197eb14a8884b4a09b9ed72fcb9161b802c725 100644 (file)
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -55,7 +55,7 @@ string const kb_keymap::printKeySym(LyXKeySym const & key,
 }
 
 
-string const kb_keymap::printKey(kb_key const & key) const
+docstring const kb_keymap::printKey(kb_key const & key) const
 {
        return key.code->print(key.mod.first);
 }
@@ -220,9 +220,9 @@ kb_keymap::lookup(LyXKeySymPtr key,
 }
 
 
-string const kb_keymap::print() const
+docstring const kb_keymap::print() const
 {
-       string buf;
+       docstring buf;
        Table::const_iterator end = table.end();
        for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
                buf += printKey((*cit));
@@ -252,7 +252,7 @@ void kb_keymap::defkey(kb_sequence * seq,
                        if (r + 1 == seq->length()) {
                                lyxerr[Debug::KBMAP]
                                        << "Warning: New binding for '"
-                                       << seq->print()
+                                       << to_utf8(seq->print())
                                        << "' is overriding old binding..."
                                        << endl;
                                if (it->table.get()) {
@@ -262,7 +262,8 @@ void kb_keymap::defkey(kb_sequence * seq,
                                it->func.origin = FuncRequest::KEYBOARD;
                                return;
                        } else if (!it->table.get()) {
-                               lyxerr << "Error: New binding for '" << seq->print()
+                               lyxerr << "Error: New binding for '" 
+                                      << to_utf8(seq->print())
                                       << "' is overriding old binding..."
                                               << endl;
                                return;
@@ -280,18 +281,16 @@ void kb_keymap::defkey(kb_sequence * seq,
                newone->func = func;
                newone->func.origin = FuncRequest::KEYBOARD;
                newone->table.reset();
-               return;
        } else {
                newone->table.reset(new kb_keymap);
                newone->table->defkey(seq, func, r + 1);
-               return;
        }
 }
 
 
-string const kb_keymap::printbindings(FuncRequest const & func) const
+docstring const kb_keymap::printbindings(FuncRequest const & func) const
 {
-       std::ostringstream res;
+       odocstringstream res;
        Bindings bindings = findbindings(func);
        for (Bindings::const_iterator cit = bindings.begin();
             cit != bindings.end() ; ++cit)