tex2lyx: add strike-outs etc. to the TeX testfile

[lyx.git] / src / FuncRequest.cpp

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index c9761609e98168836dc593bb6b7c25a00abcab78..1d98ca1ea0116fdcd707f5e8eca8a8ba3114b703 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_(0), action_(LFUN_NOACTION), origin_(o), x_(0), y_(0),
+       : action_(LFUN_NOACTION), origin_(o), x_(0), y_(0),
          button_(mouse_button::none)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, Origin o)
-       : argument_(0), action_(act), origin_(o), x_(0), y_(0),
+       : 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)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, int ax, int ay,
                         mouse_button::state but, Origin o)
-       : argument_(0), action_(act), origin_(o), x_(ax), y_(ay), button_(but)
+       : action_(act), 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_)
 {}
 
@@ -74,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);
@@ -86,7 +86,7 @@ void splitArg(vector<string> & args, string const & str,
                        getline(is, s);
                        args.push_back(trim(s));
                        return;
-               }               
+               }
 
                char c;
                string s;