* src/tabular.[Ch]: simplify plaintext methods, because there

[lyx.git] / src / lyxserver.C

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 064cf9cb80ef0ff8d6fc5664b1fe6ff3f1982372..ba1da6c533fc35389736577ac23de65d92d59b88 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -44,6 +44,9 @@
 #include "funcrequest.h"
 #include "LyXAction.h"
 #include "lyxfunc.h"
+#include "frontends/Application.h"
+
+#include "support/filename.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 
@@ -55,10 +58,14 @@
 #endif
 #include <fcntl.h>
 
-using lyx::support::compare;
-using lyx::support::rtrim;
-using lyx::support::split;
-using lyx::support::unlink;
+
+namespace lyx {
+
+using support::compare;
+using support::FileName;
+using support::rtrim;
+using support::split;
+using support::unlink;
 
 using std::endl;
 using std::string;
@@ -162,9 +169,10 @@ void LyXComm::closeConnection()
 }
 
 
-int LyXComm::startPipe(string const & filename, bool write)
+int LyXComm::startPipe(string const & file, bool write)
 {
-       if (::access(filename.c_str(), F_OK) == 0) {
+       FileName const filename(file);
+       if (::access(filename.toFilesystemEncoding().c_str(), F_OK) == 0) {
                lyxerr << "LyXComm: Pipe " << filename << " already exists.\n"
                       << "If no other LyX program is active, please delete"
                        " the pipe by hand and try again." << endl;
@@ -172,12 +180,12 @@ int LyXComm::startPipe(string const & filename, bool write)
                return -1;
        }
 
-       if (::mkfifo(filename.c_str(), 0600) < 0) {
+       if (::mkfifo(filename.toFilesystemEncoding().c_str(), 0600) < 0) {
                lyxerr << "LyXComm: Could not create pipe " << filename << '\n'
                       << strerror(errno) << endl;
                return -1;
        };
-       int const fd = ::open(filename.c_str(),
+       int const fd = ::open(filename.toFilesystemEncoding().c_str(),
                              write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK));
 
        if (fd < 0) {
@@ -188,7 +196,8 @@ int LyXComm::startPipe(string const & filename, bool write)
        }
 
        if (!write) {
-               lyx_gui::register_socket_callback(fd, boost::bind(&LyXComm::read_ready, this));
+               theApp()->registerSocketCallback(fd,
+                       boost::bind(&LyXComm::read_ready, this));
        }
 
        return fd;
@@ -201,7 +210,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
                return;
 
        if (!write) {
-               lyx_gui::unregister_socket_callback(fd);
+               theApp()->unregisterSocketCallback(fd);
        }
 
        if (::close(fd) < 0) {
@@ -209,7 +218,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
                       << '\n' << strerror(errno) << endl;
        }
 
-       if (unlink(filename) < 0) {
+       if (unlink(FileName(filename)) < 0) {
                lyxerr << "LyXComm: Could not remove pipe " << filename
                       << '\n' << strerror(errno) << endl;
        };
@@ -455,7 +464,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
 
 
                        serv->func->dispatch(FuncRequest(lyxaction.lookupFunc(cmd), arg));
-                       string const rval = lyx::to_utf8(serv->func->getMessage());
+                       string const rval = to_utf8(serv->func->getMessage());
 
                        //modified june 1999 stefano@zool.su.se:
                        //all commands produce an INFO or ERROR message
@@ -494,3 +503,6 @@ void LyXServer::notifyClient(string const & s)
        string buf = string("NOTIFY:") + s + "\n";
        pipes.send(buf);
 }
+
+
+} // namespace lyx