tex2lyx/text.cpp: fix 2 typos

[lyx.git] / src / FuncRequest.cpp

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index 03ff0c833891e95dd734d1f27c267e96a5abd193..1d98ca1ea0116fdcd707f5e8eca8a8ba3114b703 100644 (file)
--- a/src/FuncRequest.cpp
+++ b/src/FuncRequest.cpp
@@ -35,18 +35,19 @@ FuncRequest::FuncRequest(Origin o)
 
 
 FuncRequest::FuncRequest(FuncCode act, Origin o)
-       : action_(act), origin_(o), x_(0), y_(0), button_(mouse_button::none)
+       : action_(act), 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)
 {}
 
@@ -58,13 +59,13 @@ FuncRequest::FuncRequest(FuncCode act, int ax, int ay,
 
 
 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_)
 {}
 
@@ -73,9 +74,9 @@ namespace {
 
 // Extracts arguments from str into args. Arguments are delimted by
 // whitespace or by double quotes.
-// We extract at most max + 1 arguments, treating args[max] as 
+// We extract at most max + 1 arguments, treating args[max] as
 // continuing to eol.
-void splitArg(vector<string> & args, string const & str, 
+void splitArg(vector<string> & args, string const & str,
                unsigned int max = UINT_MAX)
 {
        istringstream is(str);
@@ -85,7 +86,7 @@ void splitArg(vector<string> & args, string const & str,
                        getline(is, s);
                        args.push_back(trim(s));
                        return;
-               }               
+               }
 
                char c;
                string s;