X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbsequence.C;h=dc1706dda6939b84980c55bc396ddbecf97b6545;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=c8b236a917f51fad37ccbc6327b9daf1ee32b6fc;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/kbsequence.C b/src/kbsequence.C
index c8b236a917..dc1706dda6 100644
--- a/src/kbsequence.C
+++ b/src/kbsequence.C
@@ -12,20 +12,25 @@
 
 #include <config.h>
 
-#include "gettext.h"
-
-#include "frontends/mouse_state.h"
-#include "frontends/LyXKeySymFactory.h"
 #include "kbsequence.h"
+
+#include "gettext.h"
 #include "kbmap.h"
 #include "lfuns.h"
-#include "debug.h"
+
+#include "frontends/LyXKeySym.h"
+#include "frontends/LyXKeySymFactory.h"
+
+
+namespace lyx {
 
 using std::make_pair;
+using std::string;
 
 
-int kb_sequence::addkey(LyXKeySymPtr key,
-			key_modifier::state mod, key_modifier::state nmod)
+FuncRequest const &
+kb_sequence::addkey(LyXKeySymPtr key,
+		    key_modifier::state mod, key_modifier::state nmod)
 {
 	// adding a key to a deleted sequence
 	// starts a new sequence
@@ -42,7 +47,8 @@ int kb_sequence::addkey(LyXKeySymPtr key,
 		return curmap->lookup(key, mod, this);
 	}
 
-	return LFUN_UNKNOWN_ACTION;
+	static FuncRequest unknown(LFUN_UNKNOWN_ACTION);
+	return unknown;
 }
 
 
@@ -134,7 +140,7 @@ string const kb_sequence::print() const
 	KeySequence::size_type i, length = sequence.size();
 
 	for (i = 0; i < length; ++i) {
-		buf += kb_keymap::printKeysym(sequence[i], modifiers[i].first);
+		buf += sequence[i]->print(modifiers[i].first);
 
 		// append a blank
 		if (i + 1 < length) {
@@ -154,7 +160,7 @@ string const kb_sequence::printOptions() const
 	if (!curmap)
 		return buf;
 
-	buf += _("   options: ");
+	buf += to_utf8(_("   options: "));
 	buf += curmap->print();
 	return buf;
 }
@@ -177,3 +183,6 @@ void kb_sequence::clear()
 	sequence.clear();
 	reset();
 }
+
+
+} // namespace lyx