Fix layout bug. Pasting text into a cell tried to set Standard layout, because

[lyx.git] / src / FuncRequest.h

diff --git a/src/FuncRequest.h b/src/FuncRequest.h
index e5c7afadad54287751bdfb61981506d12eeef7ec..de762b0124271a74723286cbf6aaf995c6bc7697 100644 (file)
--- a/src/FuncRequest.h
+++ b/src/FuncRequest.h
@@ -12,22 +12,21 @@
 #ifndef FUNCREQUEST_H
 #define FUNCREQUEST_H
 
-#include "lfuns.h"
-#include "frontends/mouse_state.h"
+#include "FuncCode.h"
 
 #include "support/docstring.h"
 
-#include <iosfwd>
+#include "frontends/mouse_state.h"
 
 
 namespace lyx {
 
-
 /**
  * This class encapsulates a LyX action and its argument
  * in order to pass it around easily.
  */
-class FuncRequest {
+class FuncRequest
+{
 public:
        /// Where the request came from
        enum Origin {
@@ -41,15 +40,15 @@ public:
        /// just for putting these things in std::container
        explicit FuncRequest(Origin o = INTERNAL);
        /// actions without extra argument
-       explicit FuncRequest(kb_action act, Origin o = INTERNAL);
+       explicit FuncRequest(FuncCode act, Origin o = INTERNAL);
        /// actions without extra argument
-       FuncRequest(kb_action act, int x, int y, mouse_button::state button,
+       FuncRequest(FuncCode act, int x, int y, mouse_button::state button,
                    Origin o = INTERNAL);
        /// actions with extra argument
-       FuncRequest(kb_action act, docstring const & arg,
+       FuncRequest(FuncCode act, docstring const & arg,
                    Origin o = INTERNAL);
        /// actions with extra argument. FIXME: remove this
-       FuncRequest(kb_action act, std::string const & arg,
+       FuncRequest(FuncCode act, std::string const & arg,
                    Origin o = INTERNAL);
        /// for changing requests a bit
        FuncRequest(FuncRequest const & cmd, docstring const & arg,
@@ -67,9 +66,13 @@ public:
        /// access the whole argument
        docstring const & argument() const { return argument_; }
 
+       /// 
+       static FuncRequest const unknown;
+       /// 
+       static FuncRequest const noaction;
 public:  // should be private
        /// the action
-       kb_action action;
+       FuncCode action;
 private:
        /// the action's string argument
        docstring argument_;