* GuiView.C (updateTab): do not update early if current tab has

[lyx.git] / src / funcrequest.C

diff --git a/src/funcrequest.C b/src/funcrequest.C
index ea709c88984960a41c4c4567514e31e055a76475..156da5c8f3e9a809d9996118f9dd713bd7370643 100644 (file)
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -16,8 +16,10 @@
 #include <sstream>
 #include <vector>
 
-using std::getline;
 
+namespace lyx {
+
+using std::getline;
 using std::istringstream;
 using std::vector;
 using std::string;
@@ -34,8 +36,14 @@ FuncRequest::FuncRequest(kb_action act, Origin o)
 {}
 
 
+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, Origin o)
-       : action(act), argument(arg), origin(o), x(0), y(0),
+       : action(act), argument_(from_utf8(arg)), origin(o), x(0), y(0),
          button_(mouse_button::none)
 {}
 
@@ -46,8 +54,14 @@ FuncRequest::FuncRequest(kb_action act, int ax, int ay,
 {}
 
 
+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(arg), origin(o),
+       : action(cmd.action), argument_(from_utf8(arg)), origin(o),
          x(cmd.x), y(cmd.y), button_(cmd.button_)
 {}
 
@@ -81,14 +95,14 @@ void split(vector<string> & args, string const & 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();
 }
 
 
@@ -96,7 +110,10 @@ std::ostream & operator<<(std::ostream & os, FuncRequest const & cmd)
 {
        return os
                << " action: " << cmd.action
-               << " arg: '" << cmd.argument << "'"
+               << " arg: '" << to_utf8(cmd.argument()) << "'"
                << " x: " << cmd.x
                << " y: " << cmd.y;
 }
+
+
+} // namespace lyx