Align fontenc with document fonts

[lyx.git] / src / FuncRequest.cpp

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index 62ba9cdd0cf2251bde4eb6de4b5b1b8aaff4d414..a2c975c6ef6aebf82727529998f7d93ab1ac9c9f 100644 (file)
--- a/src/FuncRequest.cpp
+++ b/src/FuncRequest.cpp
@@ -30,45 +30,47 @@ FuncRequest const FuncRequest::unknown(LFUN_UNKNOWN_ACTION);
 FuncRequest const FuncRequest::noaction(LFUN_NOACTION);
 
 FuncRequest::FuncRequest(Origin o)
-       : action_(LFUN_NOACTION), origin_(o), x_(0), y_(0),
-         button_(mouse_button::none), modifier_(NoModifier)
+       : action_(LFUN_NOACTION), origin_(o), view_origin_(0), x_(0), y_(0),
+         button_(mouse_button::none), modifier_(NoModifier), allow_async_(true)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, Origin o)
-       : action_(act), origin_(o), x_(0), y_(0),
-       button_(mouse_button::none), modifier_(NoModifier)
+       : action_(act), origin_(o), view_origin_(0), x_(0), y_(0),
+       button_(mouse_button::none), modifier_(NoModifier), allow_async_(true)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, docstring const & arg, Origin o)
-       : action_(act), argument_(arg), origin_(o), x_(0), y_(0),
-         button_(mouse_button::none), modifier_(NoModifier)
+       : action_(act), argument_(arg), origin_(o), view_origin_(0), x_(0), y_(0),
+         button_(mouse_button::none), modifier_(NoModifier), allow_async_(true)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, string const & arg, Origin o)
-       : action_(act), argument_(from_utf8(arg)), origin_(o), x_(0), y_(0),
-         button_(mouse_button::none), modifier_(NoModifier)
+       : action_(act), argument_(from_utf8(arg)),
+         origin_(o), view_origin_(0), x_(0), y_(0),
+         button_(mouse_button::none), modifier_(NoModifier), allow_async_(true)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, int ax, int ay,
                         mouse_button::state but, KeyModifier modifier, Origin o)
-       : action_(act), origin_(o), x_(ax), y_(ay), button_(but),
-    modifier_(modifier)
+       : action_(act), origin_(o), view_origin_(0), x_(ax), y_(ay),
+         button_(but), modifier_(modifier), allow_async_(true)
 {}
 
 
 FuncRequest::FuncRequest(FuncRequest const & cmd, docstring const & arg, Origin o)
-       : action_(cmd.action()), argument_(arg), origin_(o),
-         x_(cmd.x_), y_(cmd.y_), button_(cmd.button_), modifier_(NoModifier)
+       : action_(cmd.action()), argument_(arg),
+         origin_(o), view_origin_(0), x_(cmd.x_), y_(cmd.y_),
+         button_(cmd.button_), modifier_(NoModifier), allow_async_(true)
 {}
 
 
 namespace {
 
-// Extracts arguments from str into args. Arguments are delimted by
+// Extracts arguments from str into args. Arguments are delimited by
 // whitespace or by double quotes.
 // We extract at most max + 1 arguments, treating args[max] as
 // continuing to eol.
@@ -101,7 +103,7 @@ void splitArg(vector<string> & args, string const & str,
        }
 }
 
-}
+} // namespace
 
 string FuncRequest::getArg(unsigned int i) const
 {
@@ -118,7 +120,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();