X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbsequence.C;h=f37afa95767c685d511bd5c58202dd2d11a8be07;hb=2c832e6578ae146a2b51967cbc78cd640959f196;hp=dc4fc71b9c7f55b2df25238a95fc865b961db51f;hpb=6e4ee366a9e19ebc3cfbaa09311f4c2c3ed161c3;p=lyx.git

diff --git a/src/kbsequence.C b/src/kbsequence.C
index dc4fc71b9c..f37afa9576 100644
--- a/src/kbsequence.C
+++ b/src/kbsequence.C
@@ -21,11 +21,16 @@
 #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;
 }
 
 
@@ -124,9 +130,9 @@ string::size_type kb_sequence::parse(string const & s)
 }
 
 
-string const kb_sequence::print() const
+docstring const kb_sequence::print() const
 {
-	string buf;
+	docstring buf;
 
 	//if (deleted_)
 	//	return buf;
@@ -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) {
@@ -145,9 +151,9 @@ string const kb_sequence::print() const
 }
 
 
-string const kb_sequence::printOptions() const
+docstring const kb_sequence::printOptions() const
 {
-	string buf;
+	docstring buf;
 
 	buf += print();
 
@@ -177,3 +183,6 @@ void kb_sequence::clear()
 	sequence.clear();
 	reset();
 }
+
+
+} // namespace lyx