changelogs

[lyx.git] / src / funcrequest.C

diff --git a/src/funcrequest.C b/src/funcrequest.C
index 108fe2a2617599ea154a901c32a0fb64e2380004..3286d9329d8cb4c7eea7564d8a0b4819b27521ae 100644 (file)
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -11,15 +11,11 @@
 #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 <sstream>
+#include <vector>
 
-using std::endl;
 using std::getline;
 
 using std::istringstream;
@@ -27,91 +23,41 @@ using std::vector;
 using std::string;
 
 
-FuncRequest::FuncRequest()
-       : view_(0), action(LFUN_NOACTION), x(0), y(0), button_(mouse_button::none)
+FuncRequest::FuncRequest(Origin o)
+       : action(LFUN_NOACTION), origin(o), 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)
+FuncRequest::FuncRequest(kb_action act, Origin o)
+       : action(act), origin(o), 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)
+FuncRequest::FuncRequest(kb_action act, string const & arg, Origin o)
+       : action(act), argument(arg), origin(o), 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(kb_action act, int ax, int ay, 
+                        mouse_button::state but, Origin o)
+       : action(act), origin(o), x(ax), y(ay), button_(but)
 {}
 
 
-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(FuncRequest const & cmd, string const & arg)
-       : view_(cmd.view_), action(cmd.action), argument(arg),
+FuncRequest::FuncRequest(FuncRequest const & cmd, string 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, BufferView * view)
-       : view_(view), action(cmd.action), argument(cmd.argument),
-         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(str);
@@ -147,8 +93,8 @@ bool operator==(FuncRequest const & lhs, FuncRequest const & rhs)
 std::ostream & operator<<(std::ostream & os, FuncRequest const & cmd)
 {
        return os
-               << " action: " << cmd.action 
+               << " action: " << cmd.action
                << " arg: '" << cmd.argument << "'"
-               << " x: " << cmd.x 
-               << " y: " << cmd.y; 
+               << " x: " << cmd.x
+               << " y: " << cmd.y;
 }