read ChangeLog, a lot of whitespace changes. experimental use of libtool

[features.git] / src / lyxserver.C

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 6e00f3d6576a0121531c2bac843f2f2fa855c375..4c94d0780568060109adf86cb0379973bd2594d1 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -54,6 +54,7 @@
 #include "lyxfunc.h"
 #include "lyx_main.h"
 #include "debug.h"
+#include "LyXAction.h"
 #include "support/lstrings.h"
 
 #ifdef __EMX__
@@ -118,7 +119,7 @@ void LyXComm::openConnection() {
                lyxerr << "LyXComm: Pipe " << tmp << " already exists.\n"
                       << "If no other LyX program is active, please delete"
                        " the pipe by hand and try again." << endl;
-               pipename = string();
+               pipename.clear();
                return;
        }
 #ifndef __EMX__
@@ -169,7 +170,7 @@ void LyXComm::openConnection() {
                lyxerr << "LyXComm: Pipe " << tmp << " already exists.\n"
                       << "If no other LyX program is active, please delete"
                        " the pipe by hand and try again." << endl;
-               pipename = string();
+               pipename.clear();
                return;
        }
 #ifndef __EMX__
@@ -289,7 +290,7 @@ void LyXComm::closeConnection() {
 // Receives messages and sends then to client
 void LyXComm::callback(int fd, void *v)
 {
-       LyXComm * c = (LyXComm *) v;
+       LyXComm * c = static_cast<LyXComm*>(v);
  
        if (lyxerr.debugging(Debug::LYXSERVER)) {
                lyxerr << "LyXComm: Receiving from fd " << fd << endl;