X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffuncrequest.C;h=c3b0c2d4bcf7d6e91b0d8d5484674cb610048f4f;hb=67f9c9fdae42211aa3ff8d0c6f62485bd721d8eb;hp=6382dc8695faac83d52854bb85be210be10b1b72;hpb=f239801ae38551ada215494694dfe47bb4e610be;p=lyx.git

diff --git a/src/funcrequest.C b/src/funcrequest.C
index 6382dc8695..c3b0c2d4bc 100644
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -11,107 +11,54 @@
 #include <config.h>
 
 #include "funcrequest.h"
-#include "BufferView.h"
-#include "lyxfunc.h" // only for setMessage()
-#include "frontends/LyXView.h"
-#include "debug.h"
+
 #include "support/std_sstream.h"
 
+#include <iostream>
+#include <vector>
+
+using std::getline;
 
 using std::istringstream;
 using std::vector;
-using std::getline;
-using std::endl;
+using std::string;
 
 
 FuncRequest::FuncRequest()
-	: view_(0), action(LFUN_UNKNOWN_ACTION), x(0), y(0), button_(mouse_button::none)
+	: action(LFUN_NOACTION), x(0), y(0), button_(mouse_button::none)
 {}
 
 
 FuncRequest::FuncRequest(kb_action act)
-	: view_(0), action(act), x(0), y(0), button_(mouse_button::none)
+	: action(act), x(0), y(0), button_(mouse_button::none)
 {}
 
 
 FuncRequest::FuncRequest(kb_action act, string const & arg)
-	: view_(0), action(act), argument(arg), x(0), y(0), button_(mouse_button::none)
+	: action(act), argument(arg), x(0), y(0), button_(mouse_button::none)
 {}
 
 
-FuncRequest::FuncRequest
-		(kb_action act, int ax, int ay, mouse_button::state button)
-	: view_(0), action(act), x(ax), y(ay), button_(button)
-{}
-
-
-FuncRequest::FuncRequest(BufferView * view, kb_action act)
-	: view_(view), action(act), x(0), y(0), button_(mouse_button::none)
-{}
-
-
-FuncRequest::FuncRequest(BufferView * view, kb_action act, string const & arg)
-	: view_(view), action(act), argument(arg), x(0),  y(0), button_(mouse_button::none)
-{}
-
-
-FuncRequest::FuncRequest
-		(BufferView * view, kb_action act, int ax, int ay, mouse_button::state but)
-	: view_(view), action(act), x(ax), y(ay), button_(but)
+FuncRequest::FuncRequest(kb_action act, int ax, int ay, mouse_button::state but)
+	: action(act), x(ax), y(ay), button_(but)
 {}
 
 
 FuncRequest::FuncRequest(FuncRequest const & cmd, string const & arg)
-	: view_(cmd.view_), action(cmd.action), argument(arg),
-	  x(cmd.x), y(cmd.y), button_(cmd.button_)
-{}
-
-
-FuncRequest::FuncRequest(FuncRequest const & cmd, BufferView * view)
-	: view_(view), action(cmd.action), argument(cmd.argument),
+	: action(cmd.action), argument(arg),
 	  x(cmd.x), y(cmd.y), button_(cmd.button_)
 {}
 
 
-BufferView * FuncRequest::view() const
-{
-	return view_;
-}
-
-
-void FuncRequest::setView(BufferView * view)
-{
-	view_ = view;
-}
-
-
 mouse_button::state FuncRequest::button() const
 {
 	return button_;
 }
 
 
-void FuncRequest::message(string const & msg) const
-{
-	if (view_)
-		view_->owner()->getLyXFunc().setMessage(msg);
-	else
-		lyxerr  << "Dropping message '" << msg << "'" << endl;
-}
-
-
-void FuncRequest::errorMessage(string const & msg) const
-{
-	if (view_)
-		view_->owner()->getLyXFunc().setErrorMessage(msg);
-	else
-		lyxerr  << "Dropping error message '" << msg << "'" << endl;
-}
-
-
 void split(vector<string> & args, string str)
 {
-	istringstream is(STRCONV(str));
+	istringstream is(str);
 	while (is) {
 		char c;
 		string s;
@@ -127,9 +74,25 @@ void split(vector<string> & args, string str)
 }
 
 
-string FuncRequest::getArg(int i) const
+string FuncRequest::getArg(unsigned int i) const
 {
 	vector<string> args;
 	split(args, 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;
+}
+
+
+std::ostream & operator<<(std::ostream & os, FuncRequest const & cmd)
+{
+	return os
+		<< " action: " << cmd.action 
+		<< " arg: '" << cmd.argument << "'"
+		<< " x: " << cmd.x 
+		<< " y: " << cmd.y; 
+}