Add support for document-local layout information. GUI is to follow.

[lyx.git] / src / LyXFunc.h

diff --git a/src/LyXFunc.h b/src/LyXFunc.h
index 692fc732335ffd71eb2b8d02a509c7738c5adb85..85e74533d3f874864f8b3be69032226c7792d15a 100644 (file)
--- a/src/LyXFunc.h
+++ b/src/LyXFunc.h
@@ -15,8 +15,8 @@
 #ifndef LYXFUNC_H
 #define LYXFUNC_H
 
+#include "FuncCode.h"
 #include "KeySequence.h"
-#include "lfuns.h"
 
 #include "support/docstring.h"
 
@@ -24,11 +24,11 @@ namespace lyx {
 
 class Buffer;
 class BufferView;
+class DocumentClass;
 class FuncRequest;
 class FuncStatus;
 class KeySymbol;
 class Text;
-class TextClassIndex;
 
 namespace support {
 class FileName;
@@ -38,7 +38,6 @@ namespace frontend {
 class LyXView;
 }
 
-
 /** This class encapsulates all the LyX command operations.
     This is the class of the LyX's "high level event handler".
     Every user command is processed here, either invocated from
@@ -56,12 +55,12 @@ public:
 
        ///
        void setLyXView(frontend::LyXView * lv);
-
+       
        ///
        void initKeySequences(KeyMap * kb);
 
        /// return the status bar state string
-       docstring const viewStatusMessage();
+       docstring viewStatusMessage();
 
        ///
        void processKeySym(KeySymbol const & key, KeyModifier state);
@@ -81,7 +80,7 @@ public:
        /// Buffer to store result messages
        docstring const getMessage() const { return dispatch_buffer; }
        /// Handle a accented char key sequence
-       void handleKeyFunc(kb_action action);
+       void handleKeyFunc(FuncCode 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
@@ -89,13 +88,9 @@ public:
        void gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer);
 
        /// cursor x position before dispatch started
-       int cursorBeforeDispatchX() const {
-               return cursorPosBeforeDispatchX_;
-       }
+       int cursorBeforeDispatchX() const { return cursorPosBeforeDispatchX_; }
        /// cursor y position before dispatch started
-       int cursorBeforeDispatchY() const {
-               return cursorPosBeforeDispatchY_;
-       }
+       int cursorBeforeDispatchY() const { return cursorPosBeforeDispatchY_; }
 
 private:
        ///
@@ -130,14 +125,12 @@ private:
        void sendDispatchMessage(docstring const & msg,
                FuncRequest const & ev);
 
-       ///
-       void closeBuffer();
        ///
        void reloadBuffer();
        ///
        bool ensureBufferClean(BufferView * bv);
        ///
-       void updateLayout(TextClassIndex const & oldlayout, Buffer * buffer);
+       void updateLayout(DocumentClass * oldlayout, Buffer * buffer);
 };
 
 /// Implementation is in LyX.cpp