more cleanup:

[lyx.git] / src / kbsequence.C

diff --git a/src/kbsequence.C b/src/kbsequence.C
index aeab8ef4d03b8d4eb1556ed1bd23b50e4b48f47e..f37afa95767c685d511bd5c58202dd2d11a8be07 100644 (file)
--- a/src/kbsequence.C
+++ b/src/kbsequence.C
@@ -1,27 +1,36 @@
 /**
  * \file kbsequence.C
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #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
@@ -38,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;
 }
 
 
@@ -120,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;
@@ -130,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) {
@@ -141,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();
 
@@ -173,3 +183,6 @@ void kb_sequence::clear()
        sequence.clear();
        reset();
 }
+
+
+} // namespace lyx