#ifndef GRAPHICSCONVERTER_H
#define GRAPHICSCONVERTER_H
-#include <boost/scoped_ptr.hpp>
-#include <boost/signal.hpp>
-#include <boost/noncopyable.hpp>
+#include <boost/signals2.hpp>
namespace lyx {
namespace graphics {
-class Converter : boost::noncopyable {
+class Converter {
public:
/// Can the conversion be performed?
static bool isReachable(std::string const & from_format_name,
/** 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.
+ /// Needed for the pimpl
~Converter();
/// We are explicit about when we begin the conversion process.
/** 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.
*/
- typedef boost::signal<void(bool)> sig_type;
+ typedef boost::signals2::signal<void(bool)> sig_type;
typedef sig_type::slot_type slot_type;
///
- boost::signals::connection connect(slot_type const &) const;
+ boost::signals2::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.
support::FileName const & convertedFile() const;
private:
+ /// noncopyable
+ Converter(Converter const &);
+ void operator=(Converter const &);
+
/// 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_;
+ Impl * const pimpl_;
};
} // namespace graphics