X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServer.cpp;h=99be0afa5a4f1dda97e35906e0a99fe2af299293;hb=2f71fca7df3c7149542cadf577395ecedf82bbf5;hp=b36fdd1627487b5878eacb5122f3fa649773d425;hpb=9d0ea8aeff32833a90b3fe64df0c5518a9e241be;p=lyx.git

diff --git a/src/Server.cpp b/src/Server.cpp
index b36fdd1627..99be0afa5a 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -40,15 +40,15 @@
 #include <config.h>
 
 #include "Server.h"
-#include "support/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,18 +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 std::endl;
-using std::string;
-
-
 /////////////////////////////////////////////////////////////////////
 //
 // LyXComm
@@ -79,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()
@@ -114,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;
@@ -172,7 +165,7 @@ void LyXComm::closeConnection()
 	}
 
 	if (!ready_) {
-		lyxerr << "LyXComm: Already disconnected" << endl;
+		LYXERR0("LyXComm: Already disconnected");
 		return;
 	}
 
@@ -286,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
@@ -307,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;
 	}
 
@@ -317,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)
@@ -354,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)
 {}
 
@@ -372,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)
 {
@@ -459,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;
 		}
@@ -499,7 +495,7 @@ void Server::callback(string const & msg)
 }
 
 
-// Send a notify messge to a client, called by WorkAreaKeyPress
+// Send a notify message to a client, called by WorkAreaKeyPress
 void Server::notifyClient(string const & s)
 {
 	pipes_.send("NOTIFY:" + s + "\n");