Cosmetics.

[lyx.git] / src / Server.cpp

diff --git a/src/Server.cpp b/src/Server.cpp
index 26cc2033f90f0e3db13ae0f85e9a31a793945e78..14c1e202dd7eb09fe275338e04e72272c2b308c1 100644 (file)
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -40,15 +40,15 @@
 #include <config.h>
 
 #include "Server.h"
-#include "debug.h"
 #include "FuncRequest.h"
 #include "LyXAction.h"
 #include "LyXFunc.h"
+
 #include "frontends/Application.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
 
 #include <boost/bind.hpp>
 
@@ -58,19 +58,11 @@
 #endif
 #include <fcntl.h>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::compare;
-using support::FileName;
-using support::rtrim;
-using support::split;
-using support::unlink;
-
-using std::endl;
-using std::string;
-
-
 /////////////////////////////////////////////////////////////////////
 //
 // LyXComm
@@ -80,7 +72,7 @@ using std::string;
 #if !defined (HAVE_MKFIFO)
 // We provide a stub class that disables the lyxserver.
 
-LyXComm::LyXComm(std::string const &, Server *, ClientCallbackfct)
+LyXComm::LyXComm(string const &, Server *, ClientCallbackfct)
 {}
 
 void LyXComm::openConnection()
@@ -115,7 +107,7 @@ void LyXComm::send(string const & msg)
 #else // defined (HAVE_MKFIFO)
 
 
-LyXComm::LyXComm(std::string const & pip, Server * cli, ClientCallbackfct ccb)
+LyXComm::LyXComm(string const & pip, Server * cli, ClientCallbackfct ccb)
        : pipename_(pip), client_(cli), clientcb_(ccb)
 {
        ready_ = false;
@@ -173,7 +165,7 @@ void LyXComm::closeConnection()
        }
 
        if (!ready_) {
-               lyxerr << "LyXComm: Already disconnected" << endl;
+               LYXERR0("LyXComm: Already disconnected");
                return;
        }
 
@@ -206,7 +198,7 @@ int LyXComm::startPipe(string const & file, bool write)
        if (fd < 0) {
                lyxerr << "LyXComm: Could not open pipe " << filename << '\n'
                       << strerror(errno) << endl;
-               unlink(filename);
+               filename.removeFile();
                return -1;
        }
 
@@ -232,7 +224,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
                       << '\n' << strerror(errno) << endl;
        }
 
-       if (unlink(FileName(filename)) < 0) {
+       if (FileName(filename).removeFile() < 0) {
                lyxerr << "LyXComm: Could not remove pipe " << filename
                       << '\n' << strerror(errno) << endl;
        }
@@ -287,10 +279,9 @@ void LyXComm::read_ready()
                        return;
                }
                if (errno != 0) {
-                       lyxerr << "LyXComm: " << strerror(errno) << endl;
+                       LYXERR0("LyXComm: " << strerror(errno));
                        if (!read_buffer_.empty()) {
-                               lyxerr << "LyXComm: truncated command: "
-                                      << read_buffer_ << endl;
+                               LYXERR0("LyXComm: truncated command: " << read_buffer_);
                                read_buffer_.erase();
                        }
                        break; // reset connection
@@ -308,8 +299,7 @@ void LyXComm::read_ready()
 void LyXComm::send(string const & msg)
 {
        if (msg.empty()) {
-               lyxerr << "LyXComm: Request to send empty string. Ignoring."
-                      << endl;
+               LYXERR0("LyXComm: Request to send empty string. Ignoring.");
                return;
        }
 
@@ -318,8 +308,7 @@ void LyXComm::send(string const & msg)
        if (pipename_.empty()) return;
 
        if (!ready_) {
-               lyxerr << "LyXComm: Pipes are closed. Could not send "
-                      << msg << endl;
+               LYXERR0("LyXComm: Pipes are closed. Could not send " << msg);
        } else if (::write(outfd_, msg.c_str(), msg.length()) < 0) {
                lyxerr << "LyXComm: Error sending message: " << msg
                       << '\n' << strerror(errno)
@@ -355,7 +344,7 @@ void ServerCallback(Server * server, string const & msg)
        server->callback(msg);
 }
 
-Server::Server(LyXFunc * f, std::string const & pipes)
+Server::Server(LyXFunc * f, string const & pipes)
        : numclients_(0), func_(f), pipes_(pipes, this, &ServerCallback)
 {}
 
@@ -373,6 +362,13 @@ Server::~Server()
 }
 
 
+int compare(char const * a, char const * b, unsigned int len)
+{
+       using namespace std;
+       return strncmp(a, b, len);
+}
+
+
 // Handle data gotten from communication, called by LyXComm
 void Server::callback(string const & msg)
 {
@@ -460,8 +456,7 @@ void Server::callback(string const & msg)
                                                "Server: ignoring bye messge from unregistered client" << client);
                                }
                        } else {
-                               lyxerr <<"Server: Undefined server command "
-                                      << cmd << '.' << endl;
+                               LYXERR0("Server: Undefined server command " << cmd << '.');
                        }
                        return;
                }