X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffuncrequest.C;h=156da5c8f3e9a809d9996118f9dd713bd7370643;hb=cd4033aef3a3f1efdb5a676b8bab3d367f53a830;hp=90807deb06789f90b4fc2137064b469c30896640;hpb=1fc0c01877f19d8194b6b22e61aa3db5fa2b1671;p=lyx.git

diff --git a/src/funcrequest.C b/src/funcrequest.C
index 90807deb06..156da5c8f3 100644
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -16,10 +16,10 @@
 #include <sstream>
 #include <vector>
 
-using lyx::docstring;
 
-using std::getline;
+namespace lyx {
 
+using std::getline;
 using std::istringstream;
 using std::vector;
 using std::string;
@@ -43,7 +43,7 @@ FuncRequest::FuncRequest(kb_action act, docstring const & arg, Origin o)
 
 
 FuncRequest::FuncRequest(kb_action act, string const & arg, Origin o)
-	: action(act), argument_(lyx::from_utf8(arg)), origin(o), x(0), y(0),
+	: action(act), argument_(from_utf8(arg)), origin(o), x(0), y(0),
 	  button_(mouse_button::none)
 {}
 
@@ -61,7 +61,7 @@ FuncRequest::FuncRequest(FuncRequest const & cmd, docstring const & arg, Origin
 
 
 FuncRequest::FuncRequest(FuncRequest const & cmd, string const & arg, Origin o)
-	: action(cmd.action), argument_(lyx::from_utf8(arg)), origin(o),
+	: action(cmd.action), argument_(from_utf8(arg)), origin(o),
 	  x(cmd.x), y(cmd.y), button_(cmd.button_)
 {}
 
@@ -95,7 +95,7 @@ void split(vector<string> & args, string const & str)
 string FuncRequest::getArg(unsigned int i) const
 {
 	vector<string> args;
-	split(args, lyx::to_utf8(argument_));
+	split(args, to_utf8(argument_));
 	return i < args.size() ? args[i] : string();
 }
 
@@ -110,7 +110,10 @@ std::ostream & operator<<(std::ostream & os, FuncRequest const & cmd)
 {
 	return os
 		<< " action: " << cmd.action
-		<< " arg: '" << lyx::to_utf8(cmd.argument()) << "'"
+		<< " arg: '" << to_utf8(cmd.argument()) << "'"
 		<< " x: " << cmd.x
 		<< " y: " << cmd.y;
 }
+
+
+} // namespace lyx