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

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

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index 39d34e341fb89a0091261eae5e6e622228a065d2..e84cfa96f8c5e78122223be26bfc7fc5e7997de9 100644 (file)
--- a/src/FuncRequest.cpp
+++ b/src/FuncRequest.cpp
@@ -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_)
 {}
 

diff --git a/src/FuncRequest.h b/src/FuncRequest.h
index b8cfd196271dcda200c871de5b1dffa96133cad3..7fd3e1222f290cfaa143594361eb95724212be3c 100644 (file)
--- a/src/FuncRequest.h
+++ b/src/FuncRequest.h
@@ -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