X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServerSocket.cpp;h=2c753570add4e49daeb1ec57e7f3fdb90c441e36;hb=24fe5b08c0e1dfb739738acb6fc995da7315d35f;hp=3eed16cae45f47ca1934619aa23aecd21a6d8e1b;hpb=f07105d0e5d7feea9a09abea413bfd5d4d059108;p=lyx.git

diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index 3eed16cae4..2c753570ad 100644
--- a/src/ServerSocket.cpp
+++ b/src/ServerSocket.cpp
@@ -16,53 +16,51 @@
 
 #include "ServerSocket.h"
 
-#include "debug.h"
 #include "FuncRequest.h"
 #include "LyXAction.h"
 #include "LyXFunc.h"
 
 #include "frontends/Application.h"
 
+#include "support/debug.h"
 #include "support/environment.h"
 #include "support/FileName.h"
-#include "support/lyxlib.h"
 #include "support/socktools.h"
 
 #include <boost/bind.hpp>
 
 #include <cerrno>
+#include <ostream>
 
 #if defined (_WIN32)
 # include <io.h>
 #endif
 
-using boost::shared_ptr;
-
-using std::auto_ptr;
-using std::endl;
-using std::string;
+using namespace std;
+using namespace lyx::support;
 
+using boost::shared_ptr;
 
 namespace lyx {
 
 // Address is the unix address for the socket.
 // MAX_CLIENTS is the maximum number of clients
 // that can connect at the same time.
-ServerSocket::ServerSocket(LyXFunc * f, support::FileName const & addr)
+ServerSocket::ServerSocket(LyXFunc * f, FileName const & addr)
 	: func(f),
-	  fd_(support::socktools::listen(addr, 3)),
+	  fd_(socktools::listen(addr, 3)),
 	  address_(addr)
 {
 	if (fd_ == -1) {
-		lyxerr << "lyx: Disabling LyX socket." << endl;
+		LYXERR(Debug::LYXSERVER, "lyx: Disabling LyX socket.");
 		return;
 	}
 
 	// These env vars are used by DVI inverse search
 	// Needed by xdvi
-	support::setEnv("XEDITOR", "lyxclient -g %f %l");
+	setEnv("XEDITOR", "lyxclient -g %f %l");
 	// Needed by lyxclient
-	support::setEnv("LYXSOCKET", address_.absFilename());
+	setEnv("LYXSOCKET", address_.absFilename());
 
 	theApp()->registerSocketCallback(
 		fd_,
@@ -82,7 +80,8 @@ ServerSocket::~ServerSocket()
 		theApp()->unregisterSocketCallback(fd_);
 		if (::close(fd_) != 0)
 			lyxerr << "lyx: Server socket " << fd_
-			       << " IO error on closing: " << strerror(errno);
+			       << " IO error on closing: " << strerror(errno)
+			       << endl;
 	}
 	address_.removeFile();
 	LYXERR(Debug::LYXSERVER, "lyx: Server socket quitting");
@@ -99,7 +98,7 @@ string const ServerSocket::address() const
 // is OK and if the number of clients does not exceed MAX_CLIENTS
 void ServerSocket::serverCallback()
 {
-	int const client_fd = support::socktools::accept(fd_);
+	int const client_fd = socktools::accept(fd_);
 
 	if (fd_ == -1) {
 		LYXERR(Debug::LYXSERVER, "lyx: Failed to accept new client");
@@ -129,7 +128,7 @@ void ServerSocket::dataCallback(int fd)
 	shared_ptr<LyXDataSocket> client = clients[fd];
 
 	string line;
-	string::size_type pos;
+	size_t pos;
 	bool saidbye = false;
 	while (!saidbye && client->readln(line)) {
 		// The protocol must be programmed here
@@ -192,8 +191,8 @@ void ServerSocket::writeln(string const & line)
 //	lyxerr << "ServerSocket debug dump.\n"
 //	     << "fd = " << fd_ << ", address = " << address_.absFilename() << ".\n"
 //	     << "Clients: " << clients.size() << ".\n";
-//	std::map<int, shared_ptr<LyXDataSocket> >::const_iterator client = clients.begin();
-//	std::map<int, shared_ptr<LyXDataSocket> >::const_iterator end = clients.end();
+//	map<int, shared_ptr<LyXDataSocket> >::const_iterator client = clients.begin();
+//	map<int, shared_ptr<LyXDataSocket> >::const_iterator end = clients.end();
 //	for (; client != end; ++client)
 //		lyxerr << "fd = " << client->first << '\n';
 // }
@@ -248,7 +247,7 @@ bool LyXDataSocket::readln(string & line)
 	}
 
 	// Cut a line from buffer
-	string::size_type pos = buffer_.find('\n');
+	size_t pos = buffer_.find('\n');
 	if (pos == string::npos) {
 		LYXERR(Debug::LYXSERVER, "lyx: Data socket " << fd_
 					 << ": line not completed.");