Fix crash with updateLabels(). I changed the the test in the assertion but endless...

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

diff --git a/src/graphics/GraphicsLoader.h b/src/graphics/GraphicsLoader.h
index 79174aef9504cc2718832bac6004238f1eeda884..145c0e585881af1db0d5f64a7816d3517d58ccd8 100644 (file)
--- a/src/graphics/GraphicsLoader.h
+++ b/src/graphics/GraphicsLoader.h
@@ -29,9 +29,10 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/signal.hpp>
 
-class InsetOld;
-
 namespace lyx {
+
+namespace support { class FileName; }
+
 namespace graphics {
 
 class Image;
@@ -42,9 +43,9 @@ 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 &);
 
@@ -54,17 +55,16 @@ public:
        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.