X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFuncRequest.cpp;h=c912b3a0ae14094b8a425da79722a19dfd9af27d;hb=e903d0158e1d92c0d9c17656af10df9fa9a3d723;hp=497c3b0ba1d38d7897eb558a40d802987b91e164;hpb=4c7a5d00245799695ea81aa0192151eed8f9c5fb;p=lyx.git

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index 497c3b0ba1..c912b3a0ae 100644
--- a/src/FuncRequest.cpp
+++ b/src/FuncRequest.cpp
@@ -13,6 +13,7 @@
 #include "FuncRequest.h"
 #include "LyXAction.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
 #include <climits>
@@ -35,18 +36,19 @@ FuncRequest::FuncRequest(Origin o)
 
 
 FuncRequest::FuncRequest(FuncCode act, Origin o)
-	: action_(act), origin_(o), x_(0), y_(0), button_(mouse_button::none)
+	: action_(act), origin_(o), x_(0), y_(0),
+	button_(mouse_button::none)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, docstring const & arg, Origin o)
-	: argument_(arg), action_(act), origin_(o), x_(0), y_(0),
+	: action_(act), argument_(arg), origin_(o), x_(0), y_(0),
 	  button_(mouse_button::none)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, string const & arg, Origin o)
-	: argument_(from_utf8(arg)), action_(act), origin_(o), x_(0), y_(0),
+	: action_(act), argument_(from_utf8(arg)), origin_(o), x_(0), y_(0),
 	  button_(mouse_button::none)
 {}
 
@@ -58,30 +60,24 @@ FuncRequest::FuncRequest(FuncCode act, int ax, int ay,
 
 
 FuncRequest::FuncRequest(FuncRequest const & cmd, docstring const & arg, Origin o)
-	: argument_(arg), action_(cmd.action_), 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)
-	: argument_(from_utf8(arg)), action_(cmd.action_), origin_(o),
+	: action_(cmd.action()), argument_(from_utf8(arg)), origin_(o),
 	  x_(cmd.x_), y_(cmd.y_), button_(cmd.button_)
 {}
 
 
-mouse_button::state FuncRequest::button() const
-{
-	return button_;
-}
-
-
 namespace {
 
 // Extracts arguments from str into args. Arguments are delimted by
 // whitespace or by double quotes.
-// We extract at most max + 1 arguments, treating args[max] as 
+// We extract at most max + 1 arguments, treating args[max] as
 // continuing to eol.
-void splitArg(vector<string> & args, string const & str, 
+void splitArg(vector<string> & args, string const & str,
 		unsigned int max = UINT_MAX)
 {
 	istringstream is(str);
@@ -91,7 +87,7 @@ void splitArg(vector<string> & args, string const & str,
 			getline(is, s);
 			args.push_back(trim(s));
 			return;
-		}		
+		}
 
 		char c;
 		string s;
@@ -130,19 +126,26 @@ string FuncRequest::getLongArg(unsigned int i) const
 
 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();
 }
 
 
 ostream & operator<<(ostream & os, FuncRequest const & cmd)
 {
 	return os
-		<< " action: " << cmd.action_ 
-		<< " [" << lyxaction.getActionName(cmd.action_) << "] " 
+		<< " action: " << cmd.action()
+		<< " [" << lyxaction.getActionName(cmd.action()) << "] "
 		<< " arg: '" << to_utf8(cmd.argument()) << "'"
-		<< " x: " << cmd.x_
-		<< " y: " << cmd.y_;
+		<< " x: " << cmd.x()
+		<< " y: " << cmd.y();
 }
 
 
+LyXErr & operator<<(LyXErr &l, FuncRequest const &fr)
+{
+	ostringstream oss;
+	oss << fr;
+	return l << oss.str();
+}
+
 } // namespace lyx