Partial fix bug 2092: branches not propagated to child documents

[lyx.git] / src / funcrequest.C

diff --git a/src/funcrequest.C b/src/funcrequest.C
index 382ac4fa4a10a3279d12c17096d7864c32163cd4..ea709c88984960a41c4c4567514e31e055a76475 100644 (file)
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -23,28 +23,31 @@ using std::vector;
 using std::string;
 
 
-FuncRequest::FuncRequest()
-       : action(LFUN_NOACTION), x(0), y(0), button_(mouse_button::none)
+FuncRequest::FuncRequest(Origin o)
+       : action(LFUN_NOACTION), origin(o), x(0), y(0),
+         button_(mouse_button::none)
 {}
 
 
-FuncRequest::FuncRequest(kb_action act)
-       : action(act), x(0), y(0), button_(mouse_button::none)
+FuncRequest::FuncRequest(kb_action act, Origin o)
+       : action(act), origin(o), x(0), y(0), button_(mouse_button::none)
 {}
 
 
-FuncRequest::FuncRequest(kb_action act, string const & arg)
-       : action(act), argument(arg), x(0), y(0), button_(mouse_button::none)
+FuncRequest::FuncRequest(kb_action act, string const & arg, Origin o)
+       : action(act), argument(arg), origin(o), x(0), y(0),
+         button_(mouse_button::none)
 {}
 
 
-FuncRequest::FuncRequest(kb_action act, int ax, int ay, mouse_button::state but)
-       : action(act), x(ax), y(ay), button_(but)
+FuncRequest::FuncRequest(kb_action act, int ax, int ay,
+                        mouse_button::state but, Origin o)
+       : action(act), origin(o), x(ax), y(ay), button_(but)
 {}
 
 
-FuncRequest::FuncRequest(FuncRequest const & cmd, string const & arg)
-       : action(cmd.action), argument(arg),
+FuncRequest::FuncRequest(FuncRequest const & cmd, string const & arg, Origin o)
+       : action(cmd.action), argument(arg), origin(o),
          x(cmd.x), y(cmd.y), button_(cmd.button_)
 {}
 
@@ -55,20 +58,22 @@ mouse_button::state FuncRequest::button() const
 }
 
 
-void split(vector<string> & args, string str)
+void split(vector<string> & args, string const & str)
 {
        istringstream is(str);
        while (is) {
                char c;
                string s;
                is >> c;
-               if (c == '"')
-                       getline(is, s, '"');
-               else {
-                       is.putback(c);
-                       is >> s;
+               if (is) {
+                       if (c == '"')
+                               getline(is, s, '"');
+                       else {
+                               is.putback(c);
+                               is >> s;
+                       }
+                       args.push_back(s);
                }
-               args.push_back(s);
        }
 }