X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFuncRequest.cpp;h=25ea41a82f4029034cb29fad64447200fa6a2f84;hb=d4d4654d6325e92aff96523b64e1d403655a71cc;hp=de93a9f5f3901d502441193bbe69aaf0ae0a337f;hpb=196d9caeb0b9f74d02750f774de1ca63a483803f;p=features.git diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp index de93a9f5f3..25ea41a82f 100644 --- a/src/FuncRequest.cpp +++ b/src/FuncRequest.cpp @@ -14,7 +14,6 @@ #include "LyXAction.h" #include "support/debug.h" -#include "support/docstring.h" #include "support/lstrings.h" #include @@ -31,41 +30,35 @@ FuncRequest const FuncRequest::unknown(LFUN_UNKNOWN_ACTION); FuncRequest const FuncRequest::noaction(LFUN_NOACTION); FuncRequest::FuncRequest(Origin o) - : action_(LFUN_NOACTION), origin_(o), view_origin_(nullptr), x_(0), y_(0), - button_(mouse_button::none), modifier_(NoModifier), allow_async_(true) + : origin_(o) {} FuncRequest::FuncRequest(FuncCode act, Origin o) - : action_(act), origin_(o), view_origin_(nullptr), x_(0), y_(0), - button_(mouse_button::none), modifier_(NoModifier), allow_async_(true) + : action_(act), origin_(o) {} FuncRequest::FuncRequest(FuncCode act, docstring const & arg, Origin o) - : action_(act), argument_(arg), origin_(o), view_origin_(nullptr), x_(0), y_(0), - button_(mouse_button::none), modifier_(NoModifier), allow_async_(true) + : action_(act), argument_(arg), origin_(o) {} FuncRequest::FuncRequest(FuncCode act, string const & arg, Origin o) - : action_(act), argument_(from_utf8(arg)), - origin_(o), view_origin_(nullptr), x_(0), y_(0), - button_(mouse_button::none), modifier_(NoModifier), allow_async_(true) + : FuncRequest(act, from_utf8(arg), o) {} FuncRequest::FuncRequest(FuncCode act, int ax, int ay, - mouse_button::state but, KeyModifier modifier, Origin o) - : action_(act), origin_(o), view_origin_(nullptr), x_(ax), y_(ay), - button_(but), modifier_(modifier), allow_async_(true) + mouse_button::state button, KeyModifier modifier, Origin o) + : action_(act), origin_(o), + x_(ax), y_(ay), button_(button), modifier_(modifier) {} FuncRequest::FuncRequest(FuncRequest const & cmd, docstring const & arg, Origin o) - : action_(cmd.action()), argument_(arg), - origin_(o), view_origin_(nullptr), x_(cmd.x_), y_(cmd.y_), - button_(cmd.button_), modifier_(NoModifier), allow_async_(true) + : action_(cmd.action()), argument_(arg), origin_(o), + x_(cmd.x_), y_(cmd.y_), button_(cmd.button_) {}