remove a few uses of boost::scoped_ptr

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

diff --git a/src/graphics/GraphicsLoader.h b/src/graphics/GraphicsLoader.h
index 79174aef9504cc2718832bac6004238f1eeda884..b1c82d9067d39fb47f7a8424154d7f09d7882d34 100644 (file)
--- a/src/graphics/GraphicsLoader.h
+++ b/src/graphics/GraphicsLoader.h
@@ -26,12 +26,12 @@
 
 #include "GraphicsTypes.h"
 
-#include <boost/scoped_ptr.hpp>
 #include <boost/signal.hpp>
 
-class InsetOld;
-
 namespace lyx {
+
+namespace support { class FileName; }
+
 namespace graphics {
 
 class Image;
@@ -42,29 +42,27 @@ public:
        /// Must use the reset methods to make this instance usable.
        Loader();
        /// The image is not transformed, just displayed as-is.
-       Loader(std::string const & file_with_path, DisplayType = ColorDisplay);
+       Loader(support::FileName const & file_with_path, DisplayType = ColorDisplay);
        /// The image is transformed before display.
-       Loader(std::string const & file_with_path, Params const &);
+       Loader(support::FileName const & file_with_path, Params const &);
        ///
        Loader(Loader const &);
-
-       /// Define an empty d-tor out-of-line to keep boost::scoped_ptr happy.
+       /// Needed for the pimpl
        ~Loader();
 
        Loader & operator=(Loader const &);
 
        /// The file can be changed, or the display params, or both.
-       void reset(std::string const & file_with_path,
+       void reset(support::FileName const & file_with_path,
                   DisplayType = ColorDisplay) const;
        ///
-       void reset(std::string const & file_with_path, Params const &) const;
+       void reset(support::FileName const & file_with_path, Params const &) const;
        ///
        void reset(Params const &) const;
 
        /// Returns the absolute path of the loaded (loading?) file.
-       std::string const & filename() const;
+       support::FileName const & filename() const;
        ///
-       bool empty() const { return filename().empty(); }
 
        /** starting loading of the image is done by a urgency-based
         *  decision. Here we only call LoaderQueue::touch to request it.
@@ -104,7 +102,7 @@ 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_;
+       Impl * const pimpl_;
 };
 
 } // namespace graphics