fix mathed crash

[lyx.git] / src / funcrequest.C

diff --git a/src/funcrequest.C b/src/funcrequest.C
index 28007f08e68e871ba424cfb55ea9ac25fd430b31..c3b0c2d4bcf7d6e91b0d8d5484674cb610048f4f 100644 (file)
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -1,110 +1,61 @@
 /**
  * \file funcrequest.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "funcrequest.h"
-#include "BufferView.h"
-#include "lyxfunc.h" // only for setMessage()
-#include "frontends/LyXView.h"
-#include "debug.h"
-#include "Lsstream.h"
 
+#include "support/std_sstream.h"
+
+#include <iostream>
+#include <vector>
 
-using std::vector;
 using std::getline;
 
+using std::istringstream;
+using std::vector;
+using std::string;
+
 
 FuncRequest::FuncRequest()
-       : view_(0), action(LFUN_UNKNOWN_ACTION)
+       : action(LFUN_NOACTION), x(0), y(0), button_(mouse_button::none)
 {}
 
 
 FuncRequest::FuncRequest(kb_action act)
-       : view_(0), action(act)
+       : action(act), x(0), y(0), button_(mouse_button::none)
 {}
 
 
 FuncRequest::FuncRequest(kb_action act, string const & arg)
-       : view_(0), action(act), argument(arg)
-{}
-
-
-FuncRequest::FuncRequest
-               (kb_action act, int ax, int ay, mouse_button::state button)
-       : view_(0), action(act), argument(), x(ax), y(ay), button_(button)
-{}
-
-
-FuncRequest::FuncRequest(BufferView * view, kb_action act)
-       : view_(view), action(act)
+       : action(act), argument(arg), x(0), y(0), button_(mouse_button::none)
 {}
 
 
-FuncRequest::FuncRequest(BufferView * view, kb_action act, string const & arg)
-       : view_(view), action(act), argument(arg)
-{}
-
-
-FuncRequest::FuncRequest
-               (BufferView * view, kb_action act, int ax, int ay, mouse_button::state but)
-       : view_(view), action(act), argument(), 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 << "'\n";
-}
-
-
-void FuncRequest::errorMessage(string const & msg) const
-{
-       if (view_)
-               view_->owner()->getLyXFunc().setErrorMessage(msg);
-       else
-               lyxerr  << "Dropping error message '" << msg << "'\n";
-}
-
-
 void split(vector<string> & args, string str)
 {
        istringstream is(str);
@@ -123,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; 
+}