X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServer.h;h=215b7e930d5854e6c7b08c0d073d6d793e72957f;hb=31a197d88c5521a3ff566597d22b7877d3e151c2;hp=e20406a6d418c7ca9388011164d5818627bf4f75;hpb=a7018252b75316b7855f04c51be2342dc269f96c;p=lyx.git

diff --git a/src/Server.h b/src/Server.h
index e20406a6d4..215b7e930d 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -14,8 +14,8 @@
 #ifndef SERVER_H
 #define SERVER_H
 
-#include "support/signals.h"
-
+#include <memory>
+#include <string>
 #include <vector>
 
 #ifdef _WIN32
@@ -30,6 +30,21 @@ namespace lyx {
 class Server;
 
 
+/// A small utility to track the lifetime of an object.
+class Trackable {
+public:
+	Trackable() : p_(std::make_shared<int>(0)) {}
+	Trackable(Trackable const &) : Trackable() {}
+	Trackable(Trackable &&) : Trackable() {}
+	Trackable & operator=(Trackable const &) { return *this; }
+	Trackable & operator=(Trackable &&) { return *this; }
+	// This weak pointer lets you know if the parent object has been destroyed
+	std::weak_ptr<void> p() const { return p_; }
+private:
+	std::shared_ptr<void> const p_;
+};
+
+
 /** This class manages the pipes used for communicating with clients.
  Usage: Initialize with pipe-filename-base, client class to receive
  messages, and callback-function that will be called with the messages.
@@ -120,7 +135,7 @@ private:
 	void closeConnection();
 
 	/// Load files in another running instance of LyX
-	bool loadFilesInOtherInstance();
+	bool loadFilesInOtherInstance() const;
 
 #ifndef _WIN32
 	/// start a pipe
@@ -191,7 +206,7 @@ private:
 	bool deferred_loading_;
 
 	/// Track object's liveness
-	support::Trackable tracker_;
+	Trackable tracker_;
 };
 
 
@@ -206,13 +221,13 @@ public:
 	// 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(std::string const & pip);
+	Server(std::string const & pipes);
 	///
 	~Server();
 	///
 	void notifyClient(std::string const &);
 	///
-	bool deferredLoadingToOtherInstance() { return pipes_.deferredLoading(); }
+	bool deferredLoadingToOtherInstance() const { return pipes_.deferredLoading(); }
 
 	/// whilst crashing etc.
 	void emergencyCleanup() { pipes_.emergencyCleanup(); }