X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeyMap.cpp;h=61e4562cf09dc85a5702b596046a62e9d927a562;hb=77713af55868140483a1a7f5704dd93b97dbe116;hp=2bb5c091948f67168bc33c025cf24375591e446c;hpb=4c7a5d00245799695ea81aa0192151eed8f9c5fb;p=lyx.git

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index 2bb5c09194..61e4562cf0 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);
@@ -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,15 +368,15 @@ 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());
 
+		string const cmd = lyxaction.getActionName(action)
+			+ (arg.empty() ? string() : " " + arg) ;
 		os << tag << " \""
-				<< to_utf8(it->sequence.print(KeySequence::BindFile))
-				<< "\" \""
-				<< lyxaction.getActionName(action)
-				<< (arg.empty() ? "" : " ") << arg
-				<< "\"\n";
+		   << to_utf8(it->sequence.print(KeySequence::BindFile))
+		   << "\" " << Lexer::quoteString(cmd)
+		   << "\n";
 	}
 	os << "\n";
 	os.close();
@@ -493,7 +493,7 @@ KeyMap::BindingList KeyMap::listBindings(bool unbound, KeyMap::ItemType tag) con
 			BindingList::const_iterator bit = list.begin();
 			BindingList::const_iterator const ben = list.end();
 			for (; bit != ben; ++bit)
-				if (bit->request.action_ == action) {
+				if (bit->request.action() == action) {
 					has_action = true;
 					break;
 				}