ws changes only

[lyx.git] / src / funcrequest.C

diff --git a/src/funcrequest.C b/src/funcrequest.C
index 6382dc8695faac83d52854bb85be210be10b1b72..fd18c01bcbbcdf6343761204f16b1e2ba6567d4e 100644 (file)
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -17,15 +17,16 @@
 #include "debug.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), x(0), y(0), button_(mouse_button::none)
+       : view_(0), action(LFUN_NOACTION), x(0), y(0), button_(mouse_button::none)
 {}
 
 
@@ -111,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;
@@ -127,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);