Fix crash noticed by Bennett:

[lyx.git] / src / LyXFunc.h

diff --git a/src/LyXFunc.h b/src/LyXFunc.h
index 3a0dd617dbc0f8ae776140e40dba1975b190a669..c0fc35c4d0a73eee3a6944fc06a4256042cabb32 100644 (file)
--- a/src/LyXFunc.h
+++ b/src/LyXFunc.h
@@ -4,10 +4,10 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,9 +15,8 @@
 #ifndef LYXFUNC_H
 #define LYXFUNC_H
 
+#include "FuncCode.h"
 #include "KeySequence.h"
-#include "lfuns.h"
-#include "TextClassPtr.h"
 
 #include "support/docstring.h"
 
@@ -25,6 +24,7 @@ namespace lyx {
 
 class Buffer;
 class BufferView;
+class DocumentClass;
 class FuncRequest;
 class FuncStatus;
 class KeySymbol;
@@ -34,10 +34,6 @@ namespace support {
 class FileName;
 }
 
-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
@@ -53,14 +49,11 @@ public:
        /// LyX dispatcher, executes lyx actions.
        void dispatch(FuncRequest const &);
 
-       ///
-       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);
@@ -80,33 +73,19 @@ 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
        ///             not the current buffer
        void gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer);
 
-       /// load a buffer into the current workarea.
-       Buffer * loadAndViewFile(support::FileName const &  name, ///< File to load.
-               bool tolastfiles = true);  ///< append to the "Open recent" menu?
-
        /// 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:
-       ///
-       BufferView * view() const;
-
-       ///
-       frontend::LyXView * lyx_view_;
-
        /// the last character added to the key sequence, in UCS4 encoded form
        char_type encoded_last_key;
 
@@ -132,19 +111,6 @@ private:
        /// send a post-dispatch status message
        void sendDispatchMessage(docstring const & msg,
                FuncRequest const & ev);
-
-       ///
-       void open(std::string const &);
-       ///
-       void doImport(std::string const &);
-       ///
-       void closeBuffer();
-       ///
-       void reloadBuffer();
-       ///
-       bool ensureBufferClean(BufferView * bv);
-       ///
-       void updateLayout(TextClassPtr const & oldlayout, Buffer * buffer);
 };
 
 /// Implementation is in LyX.cpp