rename assert.h to lassert.h

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

diff --git a/src/graphics/GraphicsConverter.h b/src/graphics/GraphicsConverter.h
index 30021cbf1afc28a1371b551c96476954ed9c54d3..f84b9e9b11b5e7cdcaffabff9a205948d8b8358f 100644 (file)
--- a/src/graphics/GraphicsConverter.h
+++ b/src/graphics/GraphicsConverter.h
@@ -17,14 +17,15 @@
 #ifndef GRAPHICSCONVERTER_H
 #define GRAPHICSCONVERTER_H
 
-#include <boost/scoped_ptr.hpp>
 #include <boost/signal.hpp>
-#include <boost/utility.hpp>
 
 namespace lyx {
+
+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,
@@ -33,10 +34,10 @@ public:
        /** One Converter per conversion ensures that the (hidden) signal
         *  is always connected to the expected slot.
         */
-       Converter(std::string const & from_file,   std::string const & to_file_base,
+       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.
@@ -56,14 +57,17 @@ public:
         *  If conversion fails or has not been completed, however, it
         *  returns an empty string.
         */
-       std::string const & convertedFile() const;
+       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