Streamlining CollapseStatus stuff

[lyx.git] / src / LyXFunc.h

diff --git a/src/LyXFunc.h b/src/LyXFunc.h
index 370ce6ab7f6a38dc0f039f1bd1ef1d2feade5b39..2e8f286bda81351a372942d485da97f29d9c0694 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,10 +28,12 @@ namespace lyx {
 class BufferView;
 class FuncRequest;
 class FuncStatus;
-class LyXKeySym;
-class LyXText;
-class LyXView;
+class KeySymbol;
+class Text;
 
+namespace frontend {
+class LyXView;
+}
 
 /** This class encapsulates all the LyX command operations.
     This is the class of the LyX's "high level event handler".
@@ -48,7 +50,7 @@ public:
        void dispatch(FuncRequest const &);
 
        ///
-       void setLyXView(LyXView * lv);
+       void setLyXView(frontend::LyXView * lv);
 
        ///
        void initKeySequences(KeyMap * kb);
@@ -57,7 +59,7 @@ public:
        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 +79,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);
 
@@ -86,15 +88,15 @@ private:
        BufferView * view() const;
 
        ///
-       LyXView * lyx_view_;
+       frontend::LyXView * lyx_view_;
 
        /// the last character added to the key sequence, in UCS4 encoded form
        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;