#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)
{
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);
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;
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;
}
return false;
}
- LYXERR(Debug::KBMAP) << "Reading bind file:" << tmp << endl;
+ LYXERR(Debug::KBMAP, "Reading bind file:" << tmp);
bool error = false;
while (lexrc.isOK()) {
&& 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();
}