changelogs

[lyx.git] / src / funcrequest.C

diff --git a/src/funcrequest.C b/src/funcrequest.C
index c3b0c2d4bcf7d6e91b0d8d5484674cb610048f4f..3286d9329d8cb4c7eea7564d8a0b4819b27521ae 100644 (file)
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -12,9 +12,8 @@
 
 #include "funcrequest.h"
 
-#include "support/std_sstream.h"
-
 #include <iostream>
+#include <sstream>
 #include <vector>
 
 using std::getline;
@@ -24,28 +23,31 @@ using std::vector;
 using std::string;
 
 
-FuncRequest::FuncRequest()
-       : 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)
-       : 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)
-       : 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 but)
-       : action(act), x(ax), y(ay), button_(but)
+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(FuncRequest const & cmd, string const & arg)
-       : 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_)
 {}
 
@@ -91,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;
 }