Properly fix bug 3258.

[lyx.git] / src / LyXFunc.h

diff --git a/src/LyXFunc.h b/src/LyXFunc.h
index ec31fc263413f0f000c46733beb0ab6a47c4ee93..60862dc406da8139f21aadbbe6940f054b0dd476 100644 (file)
--- a/src/LyXFunc.h
+++ b/src/LyXFunc.h
@@ -15,7 +15,7 @@
 #ifndef LYXFUNC_H
 #define LYXFUNC_H
 
-#include "kb_sequence.h"
+#include "KeySequence.h"
 #include "lfuns.h"
 
 #include "support/docstring.h"
@@ -28,8 +28,8 @@ namespace lyx {
 class BufferView;
 class FuncRequest;
 class FuncStatus;
-class LyXKeySym;
-class LyXText;
+class KeySymbol;
+class Text;
 class LyXView;
 
 
@@ -51,13 +51,13 @@ public:
        void setLyXView(LyXView * lv);
 
        ///
-       void initKeySequences(kb_keymap * kb);
+       void initKeySequences(KeyMap * kb);
 
        /// return the status bar state string
        docstring const viewStatusMessage();
 
        ///
-       void processKeySym(LyXKeySymPtr key, key_modifier::state state);
+       void processKeySym(KeySymbolPtr key, key_modifier::state state);
 
        ///
        FuncStatus getStatus(FuncRequest const & action) const;
@@ -77,7 +77,7 @@ public:
        void handleKeyFunc(kb_action action);
        /// goto a bookmark
        /// openFile: whether or not open a file if the file is not opened
-       /// switchToBuffer: whether or not switch to buffer if the buffer is 
+       /// switchToBuffer: whether or not switch to buffer if the buffer is
        ///             not the current buffer
        void gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer);
 
@@ -92,9 +92,9 @@ private:
        char_type encoded_last_key;
 
        ///
-       boost::scoped_ptr<kb_sequence> keyseq;
+       boost::scoped_ptr<KeySequence> keyseq;
        ///
-       boost::scoped_ptr<kb_sequence> cancel_meta_seq;
+       boost::scoped_ptr<KeySequence> cancel_meta_seq;
        ///
        key_modifier::state meta_fake_bit;