mathed uglyfication

[lyx.git] / src / lyxserver.C

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 0f38a4520472784cddbfd2f7bb93ea2d1e7e0604..d258cb5474e5621c99c32672b106137bedb602c0 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -39,25 +39,37 @@
 
 #include <config.h>
 
-#include <fcntl.h>
-
 #include "lyxserver.h"
 #include "debug.h"
+#include "funcrequest.h"
+#include "LyXAction.h"
 #include "lyxfunc.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "frontends/lyx_gui.h"
 
+#include <cerrno>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #ifdef __EMX__
+#include <cstdlib>
+#include <io.h>
 #define OS2EMX_PLAIN_CHAR
 #define INCL_DOSNMPIPES
 #define INCL_DOSERRORS
+#include <os2.h>
+#include "support/os2_errortable.h"
 #endif
 
-
-using namespace lyx::support;
+using lyx::support::compare;
+using lyx::support::rtrim;
+using lyx::support::split;
+using lyx::support::unlink;
 
 using std::endl;
+using std::string;
+
 
 // provide an empty mkfifo() if we do not have one. This disables the
 // lyxserver.
@@ -130,6 +142,7 @@ void LyXComm::closeConnection()
        ready = false;
 }
 
+
 int LyXComm::startPipe(string const & filename, bool write)
 {
        int fd;
@@ -470,7 +483,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                        // support currently. (Lgb)
 
 
-                       serv->func->dispatch(cmd + ' ' + arg);
+                       serv->func->dispatch(FuncRequest(lyxaction.lookupFunc(cmd), arg));
                        string const rval = serv->func->getMessage();
 
                        //modified june 1999 stefano@zool.su.se: