remove redundant lyxerr.debugging checks; macro LYXERR already checks whether the...

[lyx.git] / src / kbmap.C

diff --git a/src/kbmap.C b/src/kbmap.C
index d2492e73096562303a0d39e2c6e11569144ece70..a9d1460c85f2ed0207586e3b1ba6187b3e4aa8be 100644 (file)
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -26,7 +26,11 @@
 
 #include <sstream>
 
-using lyx::support::i18nLibFileSearch;
+
+namespace lyx {
+
+using support::FileName;
+using support::i18nLibFileSearch;
 
 using std::endl;
 using std::string;
@@ -51,19 +55,11 @@ string const kb_keymap::printKeySym(LyXKeySym const & key,
 }
 
 
-string const kb_keymap::printKey(kb_key const & key) const
-{
-       return key.code->print(key.mod.first);
-}
-
-
 string::size_type kb_keymap::bind(string const & seq, FuncRequest const & func)
 {
-       if (lyxerr.debugging(Debug::KBMAP)) {
-               lyxerr << "BIND: Sequence `"
-                      << seq << "' Action `"
-                      << func.action << '\'' << endl;
-       }
+       LYXERR(Debug::KBMAP) << "BIND: Sequence `"
+              << seq << "' Action `"
+              << func.action << '\'' << endl;
 
        kb_sequence k(0, 0);
 
@@ -71,7 +67,7 @@ string::size_type kb_keymap::bind(string const & seq, FuncRequest const & func)
        if (res == string::npos) {
                defkey(&k, func);
        } else {
-               lyxerr[Debug::KBMAP] << "Parse error at position " << res
+               LYXERR(Debug::KBMAP) << "Parse error at position " << res
                                     << " in key sequence '" << seq << "'."
                                     << endl;
        }
@@ -103,7 +99,7 @@ bool kb_keymap::read(string const & bind_file)
        if (lyxerr.debugging(Debug::PARSER))
                lexrc.printTable(lyxerr);
 
-       string const tmp = i18nLibFileSearch("bind", bind_file, "bind");
+       FileName const tmp(i18nLibFileSearch("bind", bind_file, "bind"));
        lexrc.setFile(tmp);
        if (!lexrc.isOK()) {
                lyxerr << "kb_keymap::read: cannot open bind file:"
@@ -111,7 +107,7 @@ bool kb_keymap::read(string const & bind_file)
                return false;
        }
 
-       lyxerr[Debug::KBMAP] << "Reading bind file:" << tmp << endl;
+       LYXERR(Debug::KBMAP) << "Reading bind file:" << tmp << endl;
 
        bool error = false;
        while (lexrc.isOK()) {
@@ -197,7 +193,7 @@ kb_keymap::lookup(LyXKeySymPtr key,
                        if (cit->table.get()) {
                                // this is a prefix key - set new map
                                seq->curmap = cit->table.get();
-                               static FuncRequest prefix(LFUN_PREFIX);
+                               static FuncRequest prefix(LFUN_COMMAND_PREFIX);
                                return prefix;
                        } else {
                                // final key - reset map
@@ -216,12 +212,12 @@ kb_keymap::lookup(LyXKeySymPtr key,
 }
 
 
-string const kb_keymap::print() const
+docstring const kb_keymap::print(bool forgui) const
 {
-       string buf;
+       docstring buf;
        Table::const_iterator end = table.end();
        for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
-               buf += printKey((*cit));
+               buf += cit->code->print(cit->mod.first, forgui);
                buf += ' ';
        }
        return buf;
@@ -246,9 +242,9 @@ void kb_keymap::defkey(kb_sequence * seq,
                    && mod2 == it->mod.second) {
                        // overwrite binding
                        if (r + 1 == seq->length()) {
-                               lyxerr[Debug::KBMAP]
+                               LYXERR(Debug::KBMAP)
                                        << "Warning: New binding for '"
-                                       << seq->print()
+                                       << to_utf8(seq->print(false))
                                        << "' is overriding old binding..."
                                        << endl;
                                if (it->table.get()) {
@@ -258,7 +254,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(false))
                                       << "' is overriding old binding..."
                                               << endl;
                                return;
@@ -276,22 +273,20 @@ 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)
-               res << '[' << cit->print() << ']';
+               res << '[' << cit->print(true) << ']';
        return res.str();
 }
 
@@ -342,3 +337,6 @@ kb_keymap::find1keybinding(FuncRequest const & func) const
 
        return std::make_pair<LyXKeySym const *, key_modifier::state>(0, key_modifier::none);
 }
+
+
+} // namespace lyx