Sync with master

[lyx.git] / src / graphics / GraphicsConverter.h

diff --git a/src/graphics/GraphicsConverter.h b/src/graphics/GraphicsConverter.h
index d380c36577af6638e5ea23365de376fb04a06cab..582c3f08d474a3d0f1ca1d7319e49bcbf623781d 100644 (file)
--- a/src/graphics/GraphicsConverter.h
+++ b/src/graphics/GraphicsConverter.h
@@ -17,8 +17,9 @@
 #ifndef GRAPHICSCONVERTER_H
 #define GRAPHICSCONVERTER_H
 
-#include <boost/scoped_ptr.hpp>
-#include <boost/signal.hpp>
+#include "support/signals.h"
+
+#include <memory>
 
 namespace lyx {
 
@@ -35,25 +36,24 @@ public:
        /** One Converter per conversion ensures that the (hidden) signal
         *  is always connected to the expected slot.
         */
-       Converter(support::FileName const & from_file, std::string const & to_file_base,
+       Converter(support::FileName const & doc_fname,
+                 support::FileName const & from_file, std::string const & to_file_base,
                  std::string const & from_format, std::string const & to_format);
 
-       /// Define an empty d-tor out-of-line to keep boost::scoped_ptr happy.
-       ~Converter();
-
        /// We are explicit about when we begin the conversion process.
        void startConversion() const;
 
        /** Connect and you'll be informed when the conversion process has
         *  finished.
-        *  If the conversion is succesful, then the listener is passed \c true.
+        *  If the conversion is successful, then the listener is passed \c true.
+        *  The connection is closed when this is destroyed.
         */
-       typedef boost::signal<void(bool)> sig_type;
+       typedef signal<void(bool)> sig_type;
        typedef sig_type::slot_type slot_type;
        ///
-       boost::signals::connection connect(slot_type const &) const;
+       connection connect(slot_type const &) const;
 
-       /** If the conversion is succesful, this returns the name of the
+       /** If the conversion is successful, this returns the name of the
         *  resulting file.
         *  If conversion fails or has not been completed, however, it
         *  returns an empty string.
@@ -67,9 +67,8 @@ private:
 
        /// Use the Pimpl idiom to hide the internals.
        class Impl;
-
        /// The pointer never changes although *pimpl_'s contents may.
-       boost::scoped_ptr<Impl> const pimpl_;
+       std::shared_ptr<Impl> const pimpl_;
 };
 
 } // namespace graphics