#include "KeyMap.h"
-#include "debug.h"
#include "KeySequence.h"
#include "LyXAction.h"
#include "Lexer.h"
+#include "support/debug.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()) {
void KeyMap::write(string const & bind_file, bool append, bool unbind) const
{
ofstream os(bind_file.c_str(),
- append ? (ios::app | ios:: out): ios::out);
+ append ? (ios::app | ios::out) : ios::out);
if (!append)
os << "## This file is automatically generated by lyx\n"
BindingList::const_iterator it = list.begin();
BindingList::const_iterator it_end = list.end();
for (; it != it_end; ++it) {
- kb_action action = it->request.action;
+ FuncCode action = it->request.action;
string arg = to_utf8(it->request.argument());
os << tag << " \""
&& 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();
}
remove = it;
if (it->table.get())
it->table.reset();
- }
+ }
} else if (it->table.get()) {
it->table->unbind(seq, func, r + 1);
if (it->table->empty())
LyXAction::const_func_iterator fit = lyxaction.func_begin();
LyXAction::const_func_iterator fit_end = lyxaction.func_end();
for (; fit != fit_end; ++fit) {
- kb_action action = fit->second;
+ FuncCode action = fit->second;
bool has_action = false;
BindingList::const_iterator it = list.begin();
BindingList::const_iterator it_end = list.end();