* src/LaTeX.C

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

diff --git a/src/graphics/GraphicsLoader.C b/src/graphics/GraphicsLoader.C
index bea847426a961b48801a6ea18cdfba1af9c67122..dc128a1b6bd98bec92f6da4623641f70f0ba69b1 100644 (file)
--- a/src/graphics/GraphicsLoader.C
+++ b/src/graphics/GraphicsLoader.C
@@ -24,6 +24,9 @@ using std::string;
 
 
 namespace lyx {
+
+using support::FileName;
+       
 namespace graphics {
 
 class Loader::Impl : public boost::signals::trackable {
@@ -33,7 +36,7 @@ public:
        ///
        ~Impl();
        ///
-       void resetFile(string const &);
+       void resetFile(FileName const &);
        ///
        void resetParams(Params const &);
        ///
@@ -70,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);
@@ -106,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;
@@ -117,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);
@@ -167,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;
 }
@@ -201,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;