X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsConverter.h;h=838b07bfc7d3e949958b9b3c9049ce4f8e2eb136;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=0f0dec559ee2d4d4b3546f1d6b2fef2139e53616;hpb=fad47c0fe0a45da4ac4a395817a0ad73425ef275;p=lyx.git diff --git a/src/graphics/GraphicsConverter.h b/src/graphics/GraphicsConverter.h index 0f0dec559e..838b07bfc7 100644 --- a/src/graphics/GraphicsConverter.h +++ b/src/graphics/GraphicsConverter.h @@ -17,9 +17,7 @@ #ifndef GRAPHICSCONVERTER_H #define GRAPHICSCONVERTER_H -#include #include -#include namespace lyx { @@ -27,7 +25,7 @@ namespace support { class FileName; } namespace graphics { -class Converter : boost::noncopyable { +class Converter { public: /// Can the conversion be performed? static bool isReachable(std::string const & from_format_name, @@ -39,7 +37,7 @@ public: Converter(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. @@ -47,14 +45,14 @@ public: /** 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 sig_type; typedef sig_type::slot_type slot_type; /// boost::signals::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. @@ -62,11 +60,14 @@ public: 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 const pimpl_; + Impl * const pimpl_; }; } // namespace graphics