X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeyMap.cpp;h=8c28b50031263e981064e2de056da0c0f67c0a11;hb=21514ad5129df123605cc11b1dc04d525ce4a295;hp=bf63ffe0bebdebd6645d02033e252490eca9a0f2;hpb=91f6855ca26d328f190180328edda3015c89d2f7;p=lyx.git

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index bf63ffe0be..8c28b50031 100644
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -59,7 +59,7 @@ 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 << '\'');
+	       << func.action() << '\'');
 
 	KeySequence k(0, 0);
 
@@ -113,7 +113,7 @@ void KeyMap::bind(KeySequence * seq, FuncRequest const & func, unsigned int r)
 					it->prefixes.reset();
 				}
 				it->func = func;
-				it->func.origin = FuncRequest::KEYBOARD;
+				it->func.setOrigin(FuncRequest::KEYBOARD);
 				return;
 			} else if (!it->prefixes.get()) {
 				lyxerr << "Error: New binding for '"
@@ -133,7 +133,7 @@ void KeyMap::bind(KeySequence * seq, FuncRequest const & func, unsigned int r)
 	newone->mod = seq->modifiers[r];
 	if (r + 1 == seq->length()) {
 		newone->func = func;
-		newone->func.origin = FuncRequest::KEYBOARD;
+		newone->func.setOrigin(FuncRequest::KEYBOARD);
 		newone->prefixes.reset();
 	} else {
 		newone->prefixes.reset(new KeyMap);
@@ -226,8 +226,8 @@ bool KeyMap::read(string const & bind_file, KeyMap * unbind_map, BindReadType rt
 
 		static string const defaultBindfile = "cua";
 		if (bind_file == defaultBindfile) {
-			frontend::Alert::warning(_("Could not find cua bind file"),
-				_("Unable to find the default bind file `cua'.\n"
+			frontend::Alert::warning(_("Could not find `cua.bind' file"),
+				_("Unable to find the default bind file `cua.bind'.\n"
 				   "Please check your installation."));
 			return false;
 		}
@@ -262,11 +262,11 @@ bool KeyMap::read(FileName const & bind_file, KeyMap * unbind_map)
 
 	lexrc.setFile(bind_file);
 	if (!lexrc.isOK()) {
-		LYXERR0("KeyMap::read: cannot open bind file:" << bind_file.absFilename());
+		LYXERR0("KeyMap::read: cannot open bind file:" << bind_file.absFileName());
 		return false;
 	}
 
-	LYXERR(Debug::KBMAP, "Reading bind file:" << bind_file.absFilename());
+	LYXERR(Debug::KBMAP, "Reading bind file:" << bind_file.absFileName());
 
 	bool error = false;
 	while (lexrc.isOK()) {
@@ -296,7 +296,7 @@ bool KeyMap::read(FileName const & bind_file, KeyMap * unbind_map)
 			string cmd = lexrc.getString();
 
 			FuncRequest func = lyxaction.lookupFunc(cmd);
-			if (func.action == LFUN_UNKNOWN_ACTION) {
+			if (func.action() == LFUN_UNKNOWN_ACTION) {
 				lexrc.printError("BN_BIND: Unknown LyX function `$$Token'");
 				error = true;
 				break;
@@ -322,7 +322,7 @@ bool KeyMap::read(FileName const & bind_file, KeyMap * unbind_map)
 			string cmd = lexrc.getString();
 
 			FuncRequest func = lyxaction.lookupFunc(cmd);
-			if (func.action == LFUN_UNKNOWN_ACTION) {
+			if (func.action() == LFUN_UNKNOWN_ACTION) {
 				lexrc.printError("BN_UNBIND: Unknown LyX"
 						 " function `$$Token'");
 				error = true;
@@ -349,7 +349,7 @@ bool KeyMap::read(FileName const & bind_file, KeyMap * unbind_map)
 	}
 
 	if (error)
-		LYXERR0("KeyMap::read: error while reading bind file:" << bind_file.absFilename());
+		LYXERR0("KeyMap::read: error while reading bind file:" << bind_file.absFileName());
 	return !error;
 }
 
@@ -368,7 +368,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) {
-		FuncCode action = it->request.action;
+		FuncCode action = it->request.action();
 		string arg = to_utf8(it->request.argument());
 
 		os << tag << " \""
@@ -485,15 +485,15 @@ KeyMap::BindingList KeyMap::listBindings(bool unbound, KeyMap::ItemType tag) con
 	BindingList list;
 	listBindings(list, KeySequence(0, 0), tag);
 	if (unbound) {
-		LyXAction::const_func_iterator fit = lyxaction.func_begin();
-		LyXAction::const_func_iterator fit_end = lyxaction.func_end();
-		for (; fit != fit_end; ++fit) {
+		LyXAction::const_iterator fit = lyxaction.func_begin();
+		LyXAction::const_iterator const fen = lyxaction.func_end();
+		for (; fit != fen; ++fit) {
 			FuncCode action = fit->second;
 			bool has_action = false;
-			BindingList::const_iterator it = list.begin();
-			BindingList::const_iterator it_end = list.end();
-			for (; it != it_end; ++it)
-				if (it->request.action == action) {
+			BindingList::const_iterator bit = list.begin();
+			BindingList::const_iterator const ben = list.end();
+			for (; bit != ben; ++bit)
+				if (bit->request.action() == action) {
 					has_action = true;
 					break;
 				}