X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsCacheItem.h;h=6f7f968bc6a44086af831849470043faa4053c0e;hb=38c2cde0d8695ac5287bae218c4a33a2acf18ef8;hp=cceee96f32b028e1634305a4a8a6e8682eae9aed;hpb=d33cedef34146407ff9c8a7d45a091bceca74bdd;p=lyx.git diff --git a/src/graphics/GraphicsCacheItem.h b/src/graphics/GraphicsCacheItem.h index cceee96f32..6f7f968bc6 100644 --- a/src/graphics/GraphicsCacheItem.h +++ b/src/graphics/GraphicsCacheItem.h @@ -30,8 +30,7 @@ #include "GraphicsTypes.h" -#include -#include +#include "support/signals.h" namespace lyx { @@ -47,14 +46,16 @@ class Converter; class CacheItem { public: /// - CacheItem(support::FileName const & file); - - /// Define an empty d-tor out-of-line to keep boost::scoped_ptr happy. + CacheItem(support::FileName const & file, support::FileName const & doc_file); + /// Needed for the pimpl ~CacheItem(); /// support::FileName const & filename() const; + /// Try to load a display format. + bool tryDisplayFormat() const; + /// It's in the cache. Now start the loading process. void startLoading() const; @@ -65,11 +66,8 @@ public: void startMonitoring() const; /// bool monitoring() const; - /** Returns the check sum of filename() so that, for example, you can - * ascertain whether to output a new PostScript version of the file - * for a LaTeX run. - */ - unsigned long checksum() const; + /// perform a modification check asynchronously + void checkModifiedAsync() const; /** Get the image associated with filename(). * If the image is not yet loaded, returns 0. @@ -84,10 +82,9 @@ public: /** Connect and you'll be informed when the loading status of the image * changes. */ - typedef boost::signal sig_type; - typedef sig_type::slot_type slot_type; + typedef signals2::signal::slot_type slot_type; /// - boost::signals::connection connect(slot_type const &) const; + signals2::connection connect(slot_type const &) const; private: /// noncopyable @@ -96,9 +93,8 @@ private: /// Use the Pimpl idiom to hide the internals. class Impl; - /// The pointer never changes although *pimpl_'s contents may. - boost::scoped_ptr const pimpl_; + Impl * const pimpl_; }; } // namespace graphics