split LyXText::rowlist_ into individual Paragraph::rows_ chunks

[lyx.git] / src / lyxfunc.h

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index 6eca3068a0dbb0c1529bad2b8dc8a2daec82cd61..19a403b56dd2a83aa7010055a8614fae3098c6f0 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -2,14 +2,9 @@
 #ifndef LYXFUNC_H
 #define LYXFUNC_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-
 #include "FuncStatus.h"
 #include "kbsequence.h"
-#include "commandtags.h"
+#include "lfuns.h"
 #include "LString.h"
 
 #include <boost/signals/trackable.hpp>
@@ -17,6 +12,7 @@
 class LyXView;
 class LyXText;
 class FuncRequest;
+class BufferView;
 
 
 /** This class encapsulates all the LyX command operations.
@@ -36,7 +32,7 @@ public:
 
        /// Dispatch via a string argument
        void dispatch(string const & s, bool verbose = false);
- 
+
        /// Dispatch via a pseudo action, also displaying shortcut/command name
        void dispatch(int ac, bool verbose = false);
 
@@ -72,9 +68,14 @@ public:
 
 private:
        ///
-       LyXView * owner;
+       BufferView * view() const;
+
        ///
-       static int psd_idx;
+       LyXView * owner;
+
+       /// the last character added to the key sequence, in ISO encoded form
+       char encoded_last_key;
+
        ///
        kb_sequence keyseq;
        ///
@@ -82,13 +83,9 @@ private:
        ///
        key_modifier::state meta_fake_bit;
        ///
-       void moveCursorUpdate(bool flag = true, bool selecting = false);
+       void moveCursorUpdate();
        ///
        void setupLocalKeymap();
-       ///
-       kb_action lyx_dead_action;
-       ///
-       kb_action lyx_calling_dead_action;
        /// Error status, only Dispatch can change this flag
        mutable bool errorstat;
 
@@ -116,23 +113,6 @@ private:
 
        ///
        void closeBuffer();
-       ///
-       void reloadBuffer();
-       ///
-       //  This return or directly text (default) of getLyXText()
-       ///
-       LyXText * TEXT(bool) const;
-       ///
 };
 
-
-/*--------------------  inlines  --------------------------*/
-
-inline
-bool LyXFunc::wasMetaKey() const
-{
-       return (meta_fake_bit != key_modifier::none);
-}
-
-
 #endif