Fix bug #12772

[lyx.git] / src / FuncRequest.h

diff --git a/src/FuncRequest.h b/src/FuncRequest.h
index 6dfde4bfd7709b013456633f8f14ebe24c999a7c..efbe425f57fc25d609f91cc0b42163d0584ebf95 100644 (file)
--- a/src/FuncRequest.h
+++ b/src/FuncRequest.h
@@ -14,7 +14,7 @@
 
 #include "FuncCode.h"
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include "frontends/KeyModifier.h"
 #include "frontends/mouse_state.h"
@@ -86,7 +86,7 @@ public:
        ///
        mouse_button::state button() const { return button_; }
        ///
-       KeyModifier modifier() { return modifier_; }
+       KeyModifier modifier() const { return modifier_; }
 
        /// argument parsing, extract argument i as std::string
        std::string getArg(unsigned int i) const;
@@ -98,6 +98,9 @@ public:
        static FuncRequest const unknown;
        ///
        static FuncRequest const noaction;
+       ///
+       static FuncRequest const prefix;
+
        ///
        bool allowAsync() const { return allow_async_; }
        ///
@@ -105,30 +108,32 @@ public:
 
 private:
        /// the action
-       FuncCode action_;
+       FuncCode action_ = LFUN_NOACTION;
        /// the action's string argument
        docstring argument_;
        /// who initiated the action
-       Origin origin_;
+       Origin origin_ = INTERNAL;
        /// to which view should be this command sent (see bug #11004)
        /// NULL=current view
-       frontend::GuiView* view_origin_;
+       frontend::GuiView* view_origin_ = nullptr;
        /// the x coordinate of a mouse press
-       int x_;
+       int x_ = 0;
        /// the y coordinate of a mouse press
-       int y_;
+       int y_ = 0;
        /// some extra information (like button number)
-       mouse_button::state button_;
+       mouse_button::state button_ = mouse_button::none;
        ///
-       KeyModifier modifier_;
+       KeyModifier modifier_ = NoModifier;
        /// Commands should be run synchronously when they
        /// are launched via "command-sequence" or "repeat" or "buffer-forall"
-       bool allow_async_;
+       bool allow_async_ = true;
 };
 
 
 bool operator==(FuncRequest const & lhs, FuncRequest const & rhs);
 
+bool operator!=(FuncRequest const & lhs, FuncRequest const & rhs);
+
 std::ostream & operator<<(std::ostream &, FuncRequest const &);
 
 LyXErr & operator<<(LyXErr &, FuncRequest const &);