X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FForkedCalls.h;h=1ed2f75ad5b8dfc5991a2fcad7cb3495b49368dd;hb=9c1142c88061ed357b8f15bc151707a07303f3ea;hp=772939890b4bfa139b576bdf59e2f4493cb6130c;hpb=1821c6d8a32fe9cfac4f705038f19161814f6700;p=lyx.git diff --git a/src/support/ForkedCalls.h b/src/support/ForkedCalls.h index 772939890b..1ed2f75ad5 100644 --- a/src/support/ForkedCalls.h +++ b/src/support/ForkedCalls.h @@ -14,14 +14,16 @@ #ifndef FORKEDCALLS_H #define FORKEDCALLS_H -#include "support/shared_ptr.h" #include "support/strfwd.h" -#include +#include #ifdef HAVE_SYS_TYPES_H # include #endif +#include + + namespace lyx { namespace support { @@ -40,7 +42,7 @@ public: /// virtual ~ForkedProcess() {} /// - virtual shared_ptr clone() const = 0; + virtual std::shared_ptr clone() const = 0; /** A SignalType signal can be emitted once the forked process * has finished. It passes: @@ -51,7 +53,7 @@ public: * we can return easily to C++ methods, rather than just globally * accessible functions. */ - typedef boost::signal SignalType; + typedef boost::signals2::signal SignalType; /** The signal is connected in the calling routine to the desired * slot. We pass a shared_ptr rather than a reference to the signal @@ -61,7 +63,7 @@ public: * * It doesn't matter if the slot disappears, SigC takes care of that. */ - typedef shared_ptr SignalTypePtr; + typedef std::shared_ptr SignalTypePtr; /** Invoking the following methods makes sense only if the command * is running asynchronously! @@ -150,10 +152,11 @@ private: class ForkedCall : public ForkedProcess { public: /// - ForkedCall(std::string const & path = empty_string()); + ForkedCall(std::string const & path = empty_string(), + std::string const & lpath = empty_string()); /// - virtual shared_ptr clone() const { - return shared_ptr(new ForkedCall(*this)); + virtual std::shared_ptr clone() const { + return std::make_shared(*this); } /** Start the child process.