X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServer.h;h=967263a7e0d0dfccfc0fe19e9c5b97df672ede99;hb=f345feecede25b164502abdacf893a36de9ef4ae;hp=91765d3250d4652817e1d17af872739efd18b616;hpb=9919ec3625edb268bf63a91b37c1220bd16c9b02;p=lyx.git

diff --git a/src/Server.h b/src/Server.h
index 91765d3250..967263a7e0 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -25,7 +25,6 @@
 
 namespace lyx {
 
-class LyXFunc;
 class Server;
 
 
@@ -42,7 +41,7 @@ class LyXComm : public boost::signals::trackable {
 class LyXComm : public QObject {
 	Q_OBJECT
 
-	friend DWORD pipeServerWrapper(void *);
+	friend DWORD WINAPI pipeServerWrapper(void *);
 
 public:
 	/// Max number of clients
@@ -144,7 +143,7 @@ private:
 	bool event(QEvent *);
 
 	/// Check whether the pipe server must be stopped
-	bool checkStopServer();
+	bool checkStopServer(DWORD timeout = 0);
 
 	/// The filename of a (in or out) pipe instance
 	std::string const pipeName(DWORD) const;
@@ -188,15 +187,12 @@ public:
 	// FIXME IN 0.13
 	// Hack! This should be changed in 0.13
 
-	// The lyx server should not take an argument "LyXFunc" but this is
-	// how it will be done for 0.12. In 0.13 we must write a non-gui
-	// bufferview.
 	// IMO lyxserver is atypical, and for the moment the only one, non-gui
 	// bufferview. We just have to find a way to handle situations like if
 	// lyxserver is using a buffer that is being edited with a bufferview.
 	// With a common buffer list this is not a problem, maybe. (Alejandro)
 	///
-	Server(LyXFunc * f, std::string const & pip);
+	Server(std::string const & pip);
 	///
 	~Server();
 	///
@@ -219,13 +215,11 @@ private:
 	///
 	int numclients_;
 	///
-	LyXFunc * func_;
-	///
 	LyXComm pipes_;
 };
 
 /// Implementation is in LyX.cpp
-extern Server & theServer();
+Server & theServer();
 
 
 } // namespace lyx