X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeyMap.cpp;h=d1c7040c7d0c83dfe8fa491a20edd3392910386a;hb=2df6a6a37876dcfaa755c9aaf6a5ddc1ad58c63e;hp=f6cc6848b5bef4d65b5068a50ac90cf45e99f23d;hpb=9383f4c3c6f9cfab2d658701ba66e2b54cd68bea;p=lyx.git

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index f6cc6848b5..d1c7040c7d 100644
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -15,12 +15,13 @@
 
 #include "KeyMap.h"
 
-#include "support/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>
@@ -28,12 +29,10 @@
 #include <utility>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-using support::i18nLibFileSearch;
-
 
 string const KeyMap::printKeySym(KeySymbol const & key, KeyModifier mod)
 {
@@ -251,7 +250,7 @@ bool KeyMap::read(string const & bind_file, KeyMap * unbind_map)
 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"
@@ -262,7 +261,7 @@ void KeyMap::write(string const & bind_file, bool append, bool unbind) const
 	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 << " \""
@@ -404,7 +403,7 @@ void KeyMap::unbind(KeySequence * seq, FuncRequest const & func, unsigned int r)
 					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())
@@ -477,7 +476,7 @@ KeyMap::BindingList KeyMap::listBindings(bool unbound, int tag) const
 		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();