ws changes only

[lyx.git] / src / funcrequest.C

diff --git a/src/funcrequest.C b/src/funcrequest.C
index 1b5c4126aa4ed417fdd2fb61fd9f6506b9ef61b3..fd18c01bcbbcdf6343761204f16b1e2ba6567d4e 100644 (file)
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -15,48 +15,50 @@
 #include "lyxfunc.h" // only for setMessage()
 #include "frontends/LyXView.h"
 #include "debug.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
+using std::endl;
+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), button_(mouse_button::none)
+       : view_(0), action(LFUN_NOACTION), x(0), y(0), button_(mouse_button::none)
 {}
 
 
 FuncRequest::FuncRequest(kb_action act)
-       : view_(0), action(act), button_(mouse_button::none)
+       : view_(0), action(act), x(0), y(0), button_(mouse_button::none)
 {}
 
 
 FuncRequest::FuncRequest(kb_action act, string const & arg)
-       : view_(0), action(act), argument(arg), button_(mouse_button::none)
+       : view_(0), 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), argument(), x(ax), y(ay), button_(button)
+       : view_(0), action(act), x(ax), y(ay), button_(button)
 {}
 
 
 FuncRequest::FuncRequest(BufferView * view, kb_action act)
-       : view_(view), action(act), button_(mouse_button::none)
+       : 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), button_(mouse_button::none)
+       : 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), argument(), x(ax), y(ay), button_(but)
+       : view_(view), action(act), x(ax), y(ay), button_(but)
 {}
 
 
@@ -110,7 +112,7 @@ void FuncRequest::errorMessage(string const & msg) const
 
 void split(vector<string> & args, string str)
 {
-       istringstream is(STRCONV(str));
+       istringstream is(str);
        while (is) {
                char c;
                string s;
@@ -126,7 +128,7 @@ 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);