* src/LaTeX.C

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

diff --git a/src/graphics/GraphicsLoader.C b/src/graphics/GraphicsLoader.C
index 3d91ce13ab82e425e8077edd979e85da3fd1c68f..dc128a1b6bd98bec92f6da4623641f70f0ba69b1 100644 (file)
--- a/src/graphics/GraphicsLoader.C
+++ b/src/graphics/GraphicsLoader.C
@@ -5,36 +5,38 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "GraphicsLoader.h"
 
-#include "GraphicsCache.h"
 #include "GraphicsCacheItem.h"
 #include "GraphicsImage.h"
 #include "GraphicsParams.h"
 #include "LoaderQueue.h"
 
-#include "frontends/LyXView.h"
-
 #include <boost/bind.hpp>
-#include <boost/signals/trackable.hpp>
 
-#include <list>
+
+using std::string;
+
 
 namespace lyx {
+
+using support::FileName;
+       
 namespace graphics {
 
-struct Loader::Impl : boost::signals::trackable {
+class Loader::Impl : public boost::signals::trackable {
+public:
        ///
        Impl();
        ///
        ~Impl();
        ///
-       void resetFile(string const &);
+       void resetFile(FileName const &);
        ///
        void resetParams(Params const &);
        ///
@@ -53,7 +55,7 @@ struct Loader::Impl : boost::signals::trackable {
        /// We modify a local copy of the image once it is loaded.
        Image::ImagePtr image_;
        /// This signal is emitted when the image loading status changes.
-       boost::signal0<void> signal_;
+       boost::signal<void()> signal_;
 
 private:
        ///
@@ -63,7 +65,6 @@ private:
 
        ///
        Params params_;
-
 };
 
 
@@ -72,14 +73,14 @@ Loader::Loader()
 {}
 
 
-Loader::Loader(string const & file, DisplayType type)
+Loader::Loader(FileName const & file, DisplayType type)
        : pimpl_(new Impl)
 {
        reset(file, type);
 }
 
 
-Loader::Loader(string const & file, Params const & params)
+Loader::Loader(FileName const & file, Params const & params)
        : pimpl_(new Impl)
 {
        reset(file, params);
@@ -108,7 +109,7 @@ Loader & Loader::operator=(Loader const & other)
 }
 
 
-void Loader::reset(string const & file, DisplayType type) const
+void Loader::reset(FileName const & file, DisplayType type) const
 {
        Params params;
        params.display = type;
@@ -119,7 +120,7 @@ void Loader::reset(string const & file, DisplayType type) const
 }
 
 
-void Loader::reset(string const & file, Params const & params) const
+void Loader::reset(FileName const & file, Params const & params) const
 {
        pimpl_->resetParams(params);
        pimpl_->resetFile(file);
@@ -169,9 +170,9 @@ unsigned long Loader::checksum() const
 }
 
 
-string const & Loader::filename() const
+FileName const & Loader::filename() const
 {
-       static string const empty;
+       static FileName const empty;
        return pimpl_->cached_item_.get() ?
                pimpl_->cached_item_->filename() : empty;
 }
@@ -203,14 +204,14 @@ Loader::Impl::Impl()
 
 Loader::Impl::~Impl()
 {
-       resetFile(string());
+       resetFile(FileName());
 }
 
 
-void Loader::Impl::resetFile(string const & file)
+void Loader::Impl::resetFile(FileName const & file)
 {
-       string const old_file = cached_item_.get() ?
-               cached_item_->filename() : string();
+       FileName const old_file = cached_item_.get() ?
+               cached_item_->filename() : FileName();
 
        if (file == old_file)
                return;