X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbmap.C;h=389416e3e44c32be50c571f9c72637563365f7c5;hb=adaef99e60e28eba8c413a3472cc71e234718af0;hp=68cde51c6a779bf80b28a777c55d711deedb35d0;hpb=9062ce972e562477eb64c294769747ebf386fa6c;p=lyx.git

diff --git a/src/kbmap.C b/src/kbmap.C
index 68cde51c6a..389416e3e4 100644
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -71,7 +71,7 @@ void kb_keymap::printKey(kb_key const & key, string & buf)
 
 
 // This binds a key to an action
-int kb_keymap::bind(char const * seq, int action)
+int kb_keymap::bind(string const & seq, int action)
 {
 	kb_sequence k;
 
@@ -167,7 +167,7 @@ void kb_keymap::print(string & buf) const
 int kb_keymap::defkey(kb_sequence * seq, int action, int idx /*= 0*/)
 {
 	unsigned int code = seq->sequence[idx];
-	if(code == NoSymbol) return -1;
+	if (code == NoSymbol) return -1;
 
 	unsigned int modmsk = seq->modifiers[idx];
 
@@ -185,7 +185,7 @@ int kb_keymap::defkey(kb_sequence * seq, int action, int idx /*= 0*/)
 					<< buf
 					<< "' is overriding old binding..."
 					<< endl;
-				if((*it).table) {
+				if ((*it).table) {
 					delete (*it).table;
 					(*it).table = 0;
 				}
@@ -232,13 +232,13 @@ kb_keymap::~kb_keymap()
 {
 	// This could be done by a destructor in kb_key.
 	Table::iterator end = table.end();
-	for(Table::iterator it = table.begin(); it != end; ++it) {
+	for (Table::iterator it = table.begin(); it != end; ++it) {
 		delete (*it).table;
 	}
 }
 
 
-string kb_keymap::keyname(kb_key const & k)
+string const kb_keymap::keyname(kb_key const & k)
 {
 	string buf;
 	printKeysym(k.code, k.mod, buf);
@@ -247,13 +247,13 @@ string kb_keymap::keyname(kb_key const & k)
 
 
 // Finds a key for a keyaction, if possible
-string kb_keymap::findbinding(int act) const
+string const kb_keymap::findbinding(int act) const
 {
 	string res;
 	if (table.empty()) return res;
 
 	Table::const_iterator end = table.end();
-	for(Table::const_iterator cit = table.begin();
+	for (Table::const_iterator cit = table.begin();
 	    cit != end; ++cit) {
 		if ((*cit).table) {
 			string suffix = (*cit).table->findbinding(act);
@@ -265,7 +265,9 @@ string kb_keymap::findbinding(int act) const
 					+ suffix + "] ";
 			}
 		} else if ((*cit).action == act) {
-			res += "[" + keyname((*cit)) + "] ";
+			res += "[";
+			res += keyname((*cit));
+			res += "] ";
 		}
 	}
 	return res;