* new function to set border around selection

[lyx.git] / src / client / client.cpp

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 5540f1a2f5cdf6058ab57f1e71ab2e9ed5f73856..e65e7ae731c9fc61468e8f99b35a225f43b32f5b 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -54,22 +54,13 @@
 #include <map>
 #include <iostream>
 
-
-namespace lyx {
-
-using support::FileName;
-using support::prefixIs;
+using namespace std;
+using namespace lyx::support;
 
 using ::boost::scoped_ptr;
 namespace fs = ::boost::filesystem;
 
-using std::string;
-using std::vector;
-using std::cout;
-using std::cerr;
-using std::cin;
-using std::endl;
-
+namespace lyx {
 
 namespace support {
 
@@ -257,7 +248,7 @@ private:
 
 LyXDataSocket::LyXDataSocket(FileName const & address)
 {
-       if ((fd_ = support::socktools::connect(address)) == -1) {
+       if ((fd_ = socktools::connect(address)) == -1) {
                connected_ = false;
        } else {
                connected_ = true;
@@ -350,8 +341,8 @@ void LyXDataSocket::writeln(string const & line)
 class CmdLineParser {
 public:
        typedef int (*optfunc)(vector<docstring> const & args);
-       std::map<string, optfunc> helper;
-       std::map<string, bool> isset;
+       map<string, optfunc> helper;
+       map<string, bool> isset;
        bool parse(int, char * []);
        vector<char *> nonopt;
 };
@@ -430,7 +421,7 @@ int h(vector<docstring> const &)
 
 
 docstring clientName =
-       from_ascii(support::itoa(::getppid()) + ">" + support::itoa(::getpid()));
+       from_ascii(itoa(::getppid()) + ">" + itoa(::getpid()));
 
 int n(vector<docstring> const & arg)
 {
@@ -562,7 +553,7 @@ int main(int argc, char * argv[])
        } else {
                // We have to look for an address.
                // serverPid can be empty.
-               vector<fs::path> addrs = support::lyxSockets(to_filesystem8bit(cmdline::mainTmp), cmdline::serverPid);
+               vector<fs::path> addrs = lyxSockets(to_filesystem8bit(cmdline::mainTmp), cmdline::serverPid);
                vector<fs::path>::const_iterator addr = addrs.begin();
                vector<fs::path>::const_iterator end = addrs.end();
                for (; addr != end; ++addr) {