Embedding: saving inzip name to .lyx file so that embedded files can always be found...

[lyx.git] / src / KeyMap.cpp

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index 5f90aa3042d7044cd3c6c91f7c201e560f694b5d..36d79a4cd5e6191d2d067311ee12d785dbe12f8f 100644 (file)
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -15,29 +15,24 @@
 
 #include "KeyMap.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "KeySequence.h"
 #include "LyXAction.h"
 #include "Lexer.h"
 
 #include "support/docstream.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
 
 #include <fstream>
 #include <sstream>
 #include <utility>
 
-using std::endl;
-using std::ios;
-using std::ofstream;
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-using support::i18nLibFileSearch;
-
 
 string const KeyMap::printKeySym(KeySymbol const & key, KeyModifier mod)
 {
@@ -59,9 +54,8 @@ string const KeyMap::printKeySym(KeySymbol const & key, KeyModifier mod)
 
 size_t KeyMap::bind(string const & seq, FuncRequest const & func)
 {
-       LYXERR(Debug::KBMAP) << "BIND: Sequence `"
-              << seq << "' Action `"
-              << func.action << '\'' << endl;
+       LYXERR(Debug::KBMAP, "BIND: Sequence `" << seq << "' Action `"
+              << func.action << '\'');
 
        KeySequence k(0, 0);
 
@@ -69,9 +63,8 @@ size_t KeyMap::bind(string const & seq, FuncRequest const & func)
        if (res == string::npos) {
                bind(&k, func);
        } else {
-               LYXERR(Debug::KBMAP) << "Parse error at position " << res
-                                    << " in key sequence '" << seq << "'."
-                                    << endl;
+               LYXERR(Debug::KBMAP, "Parse error at position " << res
+                                    << " in key sequence '" << seq << "'.");
        }
 
        return res == string::npos ? 0 : res;
@@ -86,9 +79,8 @@ size_t KeyMap::unbind(string const & seq, FuncRequest const & func)
        if (res == string::npos)
                unbind(&k, func);
        else
-               LYXERR(Debug::KBMAP) << "Parse error at position " << res
-                                    << " in key sequence '" << seq << "'."
-                                    << endl;
+               LYXERR(Debug::KBMAP, "Parse error at position " << res
+                                    << " in key sequence '" << seq << "'.");
        return res == string::npos ? 0 : res;
 }
 
@@ -158,7 +150,7 @@ bool KeyMap::read(string const & bind_file, KeyMap * unbind_map)
                return false;
        }
 
-       LYXERR(Debug::KBMAP) << "Reading bind file:" << tmp << endl;
+       LYXERR(Debug::KBMAP, "Reading bind file:" << tmp);
 
        bool error = false;
        while (lexrc.isOK()) {
@@ -353,11 +345,9 @@ void KeyMap::bind(KeySequence * seq, FuncRequest const & func, unsigned int r)
                    && mod2 == it->mod.second) {
                        // overwrite binding
                        if (r + 1 == seq->length()) {
-                               LYXERR(Debug::KBMAP)
-                                       << "Warning: New binding for '"
+                               LYXERR(Debug::KBMAP, "Warning: New binding for '"
                                        << to_utf8(seq->print(KeySequence::Portable))
-                                       << "' is overriding old binding..."
-                                       << endl;
+                                       << "' is overriding old binding...");
                                if (it->table.get()) {
                                        it->table.reset();
                                }