X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFuncRequest.cpp;h=25ea41a82f4029034cb29fad64447200fa6a2f84;hb=0e4ca9aa88eb7b9351bb563dcd2df59c15744aa5;hp=88cd8af052d331d486cbf4d75db7296c5c299137;hpb=c2456ae609d6cdb2bff02c378b545a07dee2e8f0;p=lyx.git diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp index 88cd8af052..25ea41a82f 100644 --- a/src/FuncRequest.cpp +++ b/src/FuncRequest.cpp @@ -30,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_(0), x_(0), y_(0), - button_(mouse_button::none), modifier_(NoModifier) + : origin_(o) {} FuncRequest::FuncRequest(FuncCode act, Origin o) - : action_(act), origin_(o), view_origin_(0), x_(0), y_(0), - button_(mouse_button::none), modifier_(NoModifier) + : action_(act), origin_(o) {} FuncRequest::FuncRequest(FuncCode act, docstring const & arg, Origin o) - : action_(act), argument_(arg), origin_(o), view_origin_(0), x_(0), y_(0), - button_(mouse_button::none), modifier_(NoModifier) + : 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_(0), x_(0), y_(0), - button_(mouse_button::none), modifier_(NoModifier) + : 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_(0), x_(ax), y_(ay), - button_(but), modifier_(modifier) + 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_(0), x_(cmd.x_), y_(cmd.y_), - button_(cmd.button_), modifier_(NoModifier) + : action_(cmd.action()), argument_(arg), origin_(o), + x_(cmd.x_), y_(cmd.y_), button_(cmd.button_) {} @@ -120,7 +114,6 @@ string FuncRequest::getLongArg(unsigned int i) const return i < args.size() ? args[i] : string(); } - bool operator==(FuncRequest const & lhs, FuncRequest const & rhs) { return lhs.action() == rhs.action() && lhs.argument() == rhs.argument();