Refactor InsetQuotes.h enums

[lyx.git] / src / Server.h

diff --git a/src/Server.h b/src/Server.h
index 2c1162d8d0c084c62a564d59beffd0a24c19bd43..b277284ace9b66b099750720903e437aa272972d 100644 (file)
--- a/src/Server.h
+++ b/src/Server.h
@@ -14,10 +14,9 @@
 #ifndef SERVER_H
 #define SERVER_H
 
-#include <boost/signals2/trackable.hpp>
+#include "support/signals.h"
 
 #include <vector>
-#include <sstream>
 
 #ifdef _WIN32
 #include <windows.h>
@@ -31,7 +30,7 @@ namespace lyx {
 class Server;
 
 
-/** This class managed the pipes used for communicating with clients.
+/** 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.
  When you want to send, use "send()".
@@ -39,7 +38,7 @@ class Server;
  a clean string interface.
  */
 #ifndef _WIN32
-class LyXComm : public boost::signals2::trackable {
+class LyXComm {
 #else
 class LyXComm : public QObject {
        Q_OBJECT
@@ -105,7 +104,7 @@ public:
 #endif
 
        /// Tell whether we asked another instance of LyX to open the files
-       bool deferredLoading() { return deferred_loading_; }
+       bool deferredLoading() const { return deferred_loading_; }
 
 private:
        /// the filename of the in pipe
@@ -121,7 +120,7 @@ private:
        void closeConnection();
 
        /// Load files in another running instance of LyX
-       bool loadFilesInOtherInstance();
+       bool loadFilesInOtherInstance() const;
 
 #ifndef _WIN32
        /// start a pipe
@@ -190,6 +189,9 @@ private:
 
        /// Did we defer loading of files to another instance?
        bool deferred_loading_;
+
+       /// Track object's liveness
+       support::Trackable tracker_;
 };
 
 
@@ -204,13 +206,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(); }