anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Swap the argument_ and action_ variables, so that r34105 really does do

Browse Source 
nothing but rename things. This is an attempt at #6646.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34123 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-04-12 15:40:51 +00:00
parent c1221f9890
commit a37feaf896
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/FuncRequest.cpp
View File

@ -29,43 +29,43 @@ FuncRequest const FuncRequest::unknown(LFUN_UNKNOWN_ACTION);
FuncRequest const FuncRequest::noaction(LFUN_NOACTION);
FuncRequest::FuncRequest(Origin o)
: argument_(), action_(LFUN_NOACTION), origin_(o), x_(0), y_(0),
: action_(LFUN_NOACTION), argument_(), origin_(o), x_(0), y_(0),
button_(mouse_button::none)
{}
FuncRequest::FuncRequest(FuncCode act, Origin o)
: argument_(), action_(act), origin_(o), x_(0), y_(0),
: action_(act), argument_(), origin_(o), x_(0), y_(0),
button_(mouse_button::none)
{}
FuncRequest::FuncRequest(FuncCode act, docstring const & arg, Origin o)
: argument_(arg), action_(act), origin_(o), x_(0), y_(0),
: action_(act), argument_(arg), origin_(o), x_(0), y_(0),
button_(mouse_button::none)
{}
FuncRequest::FuncRequest(FuncCode act, string const & arg, Origin o)
: argument_(from_utf8(arg)), action_(act), origin_(o), x_(0), y_(0),
: action_(act), argument_(from_utf8(arg)), origin_(o), x_(0), y_(0),
button_(mouse_button::none)
{}
FuncRequest::FuncRequest(FuncCode act, int ax, int ay,
mouse_button::state but, Origin o)
: argument_(), action_(act), origin_(o), x_(ax), y_(ay), button_(but)
: action_(act), argument_(), origin_(o), x_(ax), y_(ay), button_(but)
{}
FuncRequest::FuncRequest(FuncRequest const & cmd, docstring const & arg, Origin o)
: argument_(arg), action_(cmd.action()), origin_(o),
: action_(cmd.action()), argument_(arg), origin_(o),
x_(cmd.x_), y_(cmd.y_), button_(cmd.button_)
{}
FuncRequest::FuncRequest(FuncRequest const & cmd, string const & arg, Origin o)
: argument_(from_utf8(arg)), action_(cmd.action()), origin_(o),
: action_(cmd.action()), argument_(from_utf8(arg)), origin_(o),
x_(cmd.x_), y_(cmd.y_), button_(cmd.button_)
{}

4
src/FuncRequest.h
View File

@ -88,10 +88,10 @@ public:
///
static FuncRequest const noaction;
private:
/// the action's string argument
docstring argument_;
/// the action
FuncCode action_;
/// the action's string argument
docstring argument_;
/// who initiated the action
Origin origin_;
/// the x coordinate of a mouse press