X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffuncrequest.C;h=156da5c8f3e9a809d9996118f9dd713bd7370643;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=c3b0c2d4bcf7d6e91b0d8d5484674cb610048f4f;hpb=14d27fe32402fedeba177d5cf14e391ac8060805;p=lyx.git

diff --git a/src/funcrequest.C b/src/funcrequest.C
index c3b0c2d4bc..156da5c8f3 100644
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -12,40 +12,56 @@
 
 #include "funcrequest.h"
 
-#include "support/std_sstream.h"
-
 #include <iostream>
+#include <sstream>
 #include <vector>
 
-using std::getline;
 
+namespace lyx {
+
+using std::getline;
 using std::istringstream;
 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, Origin o)
+	: action(act), 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, docstring const & arg, Origin o)
+	: action(act), argument_(arg), 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_(from_utf8(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, docstring const & arg, 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)
+	: action(cmd.action), argument_(from_utf8(arg)), origin(o),
 	  x(cmd.x), y(cmd.y), button_(cmd.button_)
 {}
 
@@ -56,20 +72,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);
 	}
 }
 
@@ -77,22 +95,25 @@ void split(vector<string> & args, string str)
 string FuncRequest::getArg(unsigned int i) const
 {
 	vector<string> args;
-	split(args, argument);
+	split(args, to_utf8(argument_));
 	return i < args.size() ? args[i] : string();
 }
 
 
 bool operator==(FuncRequest const & lhs, FuncRequest const & rhs)
 {
-	return lhs.action == rhs.action && lhs.argument == rhs.argument;
+	return lhs.action == rhs.action && lhs.argument() == rhs.argument();
 }
 
 
 std::ostream & operator<<(std::ostream & os, FuncRequest const & cmd)
 {
 	return os
-		<< " action: " << cmd.action 
-		<< " arg: '" << cmd.argument << "'"
-		<< " x: " << cmd.x 
-		<< " y: " << cmd.y; 
+		<< " action: " << cmd.action
+		<< " arg: '" << to_utf8(cmd.argument()) << "'"
+		<< " x: " << cmd.x
+		<< " y: " << cmd.y;
 }
+
+
+} // namespace lyx