Tooltips for collapsables and branches

[lyx.git] / src / Server.cpp

diff --git a/src/Server.cpp b/src/Server.cpp
index e4a44343688990d8c1d49115faa3b371cf9fdb82..7843997ca5c31ba83a22fa4d1c6f99963b19b896 100644 (file)
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -48,7 +48,6 @@
 
 #include "support/FileName.h"
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
 
 #include <boost/bind.hpp>
 
@@ -59,15 +58,10 @@
 #include <fcntl.h>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::compare;
-using support::FileName;
-using support::rtrim;
-using support::split;
-
-
 /////////////////////////////////////////////////////////////////////
 //
 // LyXComm
@@ -77,7 +71,7 @@ using support::split;
 #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()
@@ -112,7 +106,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;
@@ -349,7 +343,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)
 {}