* BufferView::updateMetrics(): split up the method in two for the SinglePar case.

[lyx.git] / src / LyXFunc.h

diff --git a/src/LyXFunc.h b/src/LyXFunc.h
index ec31fc263413f0f000c46733beb0ab6a47c4ee93..56c5f7cf7e471e694a604569d06936e1adf8e594 100644 (file)
--- a/src/LyXFunc.h
+++ b/src/LyXFunc.h
@@ -15,23 +15,26 @@
 #ifndef LYXFUNC_H
 #define LYXFUNC_H
 
-#include "kb_sequence.h"
+#include "KeySequence.h"
 #include "lfuns.h"
+#include "TextClass.h"
 
 #include "support/docstring.h"
 
-#include <boost/scoped_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
 namespace lyx {
 
+class Buffer;
 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,16 +51,16 @@ public:
        void dispatch(FuncRequest const &);
 
        ///
-       void setLyXView(LyXView * lv);
+       void setLyXView(frontend::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(KeySymbol const & key, key_modifier::state state);
 
        ///
        FuncStatus getStatus(FuncRequest const & action) const;
@@ -77,7 +80,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 +89,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;
+       KeySequence keyseq;
        ///
-       boost::scoped_ptr<kb_sequence> cancel_meta_seq;
+       KeySequence cancel_meta_seq;
        ///
        key_modifier::state meta_fake_bit;
 
@@ -123,6 +126,8 @@ private:
        void reloadBuffer();
        ///
        bool ensureBufferClean(BufferView * bv);
+       ///
+       void updateLayout(TextClassPtr const & oldlayout, Buffer * buffer);
 };
 
 /// Implementation is in LyX.cpp