fix a visual cursor edge-case:

[lyx.git] / src / FuncRequest.cpp

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index d853ada38e34dd0db01b2fc0580f187aa7925380..d14503fefda271104df391c4bd6d6d627e19bad6 100644 (file)
--- a/src/FuncRequest.cpp
+++ b/src/FuncRequest.cpp
@@ -16,14 +16,12 @@
 #include <sstream>
 #include <vector>
 
+using namespace std;
 
 namespace lyx {
 
-using std::getline;
-using std::istringstream;
-using std::vector;
-using std::string;
-
+FuncRequest const FuncRequest::unknown(LFUN_UNKNOWN_ACTION);
+FuncRequest const FuncRequest::noaction(LFUN_NOACTION);
 
 FuncRequest::FuncRequest(Origin o)
        : action(LFUN_NOACTION), origin(o), x(0), y(0),
@@ -72,7 +70,7 @@ mouse_button::state FuncRequest::button() const
 }
 
 
-void split(vector<string> & args, string const & str)
+void splitArg(vector<string> & args, string const & str)
 {
        istringstream is(str);
        while (is) {
@@ -95,7 +93,7 @@ void split(vector<string> & args, string const & str)
 string FuncRequest::getArg(unsigned int i) const
 {
        vector<string> args;
-       split(args, to_utf8(argument_));
+       splitArg(args, to_utf8(argument_));
        return i < args.size() ? args[i] : string();
 }
 
@@ -106,7 +104,7 @@ bool operator==(FuncRequest const & lhs, FuncRequest const & rhs)
 }
 
 
-std::ostream & operator<<(std::ostream & os, FuncRequest const & cmd)
+ostream & operator<<(ostream & os, FuncRequest const & cmd)
 {
        return os
                << " action: " << cmd.action