X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeyMap.cpp;h=7c9c4718f68c9110ff6a20750e57b7f88afa1e41;hb=6a8b25ba5110a1d4e19206f9f42d3b04312e6728;hp=354a8d62bfe1bf1484a73ee5b71380e3a3610337;hpb=1d6c4787f9392169b78cac3a924818f2ebe1145d;p=lyx.git

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index 354a8d62bf..7c9c4718f6 100644
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -16,27 +16,27 @@
 #include "KeyMap.h"
 
 #include "debug.h"
-#include "kb_sequence.h"
+#include "KeySequence.h"
 #include "LyXAction.h"
 #include "Lexer.h"
 
-#include "frontends/LyXKeySym.h"
+#include "frontends/KeySymbol.h"
 
 #include "support/filetools.h"
 
 #include <sstream>
 
+using std::endl;
+using std::string;
+
 
 namespace lyx {
 
 using support::FileName;
 using support::i18nLibFileSearch;
 
-using std::endl;
-using std::string;
-
 
-string const KeyMap::printKeySym(LyXKeySym const & key,
+string const KeyMap::printKeySym(KeySymbol const & key,
 				    key_modifier::state mod)
 {
 	string buf;
@@ -61,7 +61,7 @@ size_t KeyMap::bind(string const & seq, FuncRequest const & func)
 	       << seq << "' Action `"
 	       << func.action << '\'' << endl;
 
-	kb_sequence k(0, 0);
+	KeySequence k(0, 0);
 
 	string::size_type const res = k.parse(seq);
 	if (res == string::npos) {
@@ -171,8 +171,8 @@ bool KeyMap::read(string const & bind_file)
 
 
 FuncRequest const &
-KeyMap::lookup(LyXKeySymPtr key,
-		  key_modifier::state mod, kb_sequence * seq) const
+KeyMap::lookup(KeySymbolPtr key,
+		  key_modifier::state mod, KeySequence * seq) const
 {
 	static FuncRequest const unknown(LFUN_UNKNOWN_ACTION);
 
@@ -224,9 +224,9 @@ docstring const KeyMap::print(bool forgui) const
 }
 
 
-void KeyMap::defkey(kb_sequence * seq, FuncRequest const & func, unsigned int r)
+void KeyMap::defkey(KeySequence * seq, FuncRequest const & func, unsigned int r)
 {
-	LyXKeySymPtr code = seq->sequence[r];
+	KeySymbolPtr code = seq->sequence[r];
 	if (!code->isOK())
 		return;
 
@@ -253,7 +253,7 @@ void KeyMap::defkey(kb_sequence * seq, FuncRequest const & func, unsigned int r)
 				it->func.origin = FuncRequest::KEYBOARD;
 				return;
 			} else if (!it->table.get()) {
-				lyxerr << "Error: New binding for '" 
+				lyxerr << "Error: New binding for '"
 				       << to_utf8(seq->print(false))
 				       << "' is overriding old binding..."
 					       << endl;
@@ -292,12 +292,12 @@ docstring const KeyMap::printbindings(FuncRequest const & func) const
 
 KeyMap::Bindings KeyMap::findbindings(FuncRequest const & func) const
 {
-	return findbindings(func, kb_sequence(0, 0));
+	return findbindings(func, KeySequence(0, 0));
 }
 
 
 KeyMap::Bindings KeyMap::findbindings(FuncRequest const & func,
-			kb_sequence const & prefix) const
+			KeySequence const & prefix) const
 {
 	Bindings res;
 	if (table.empty()) return res;
@@ -306,13 +306,13 @@ KeyMap::Bindings KeyMap::findbindings(FuncRequest const & func,
 	for (Table::const_iterator cit = table.begin();
 	    cit != end; ++cit) {
 		if (cit->table.get()) {
-			kb_sequence seq = prefix;
+			KeySequence seq = prefix;
 			seq.addkey(cit->code, cit->mod.first);
 			Bindings res2 =
 				cit->table->findbindings(func, seq);
 			res.insert(res.end(), res2.begin(), res2.end());
 		} else if (cit->func == func) {
-			kb_sequence seq = prefix;
+			KeySequence seq = prefix;
 			seq.addkey(cit->code, cit->mod.first);
 			res.push_back(seq);
 		}
@@ -322,7 +322,7 @@ KeyMap::Bindings KeyMap::findbindings(FuncRequest const & func,
 }
 
 
-std::pair<LyXKeySym const *, key_modifier::state>
+std::pair<KeySymbol const *, key_modifier::state>
 KeyMap::find1keybinding(FuncRequest const & func) const
 {
 	Table::const_iterator end = table.end();
@@ -332,7 +332,7 @@ KeyMap::find1keybinding(FuncRequest const & func) const
 			return std::make_pair(cit->code.get(), cit->mod.first);
 	}
 
-	return std::make_pair<LyXKeySym const *, key_modifier::state>(0, key_modifier::none);
+	return std::make_pair<KeySymbol const *, key_modifier::state>(0, key_modifier::none);
 }