X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsLoader.h;h=c4ed587f66ca57ac7494835e81723050d441a462;hb=06254d11dfdf670fab3548dc2a2674e7a261262c;hp=9f67927fbb7b69f67a3daed52fa4c0d71c4f792a;hpb=13349032cb4dc8ef44146aa652ff6bbff6698249;p=lyx.git

diff --git a/src/graphics/GraphicsLoader.h b/src/graphics/GraphicsLoader.h
index 9f67927fbb..c4ed587f66 100644
--- a/src/graphics/GraphicsLoader.h
+++ b/src/graphics/GraphicsLoader.h
@@ -1,14 +1,14 @@
 // -*- C++ -*-
 /**
- *  \file GraphicsLoader.h
+ * \file GraphicsLoader.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- *  \author Angus Leeming
+ * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
- *  The public face of the graphics cache.
+ * The public face of the graphics cache.
  *
  *  * The user supplies an image file and the display parameters.
  *  * He can change the file or the display parameters through a reset() method.
@@ -18,26 +18,21 @@
  *  * When (status() == Ready), he can use image() to access the loaded image
  *    and pass it to the Painter.
  *
- *  What could be simpler?
+ * What could be simpler?
  */
 
 #ifndef GRAPHICSLOADER_H
 #define GRAPHICSLOADER_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "GraphicsTypes.h"
-#include "LString.h"
 
-#include <boost/signals/signal0.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <boost/signal.hpp>
+
+namespace lyx {
 
-class Inset;
-class BufferView;
+namespace support { class FileName; }
 
-namespace grfx {
+namespace graphics {
 
 class Image;
 class Params;
@@ -47,33 +42,32 @@ public:
 	/// Must use the reset methods to make this instance usable.
 	Loader();
 	/// The image is not transformed, just displayed as-is.
-	Loader(string const & file_with_path, DisplayType = ColorDisplay);
+	Loader(support::FileName const & file_with_path, DisplayType = ColorDisplay);
 	/// The image is transformed before display.
-	Loader(string const & file_with_path, Params const &);
-
-	/// Define an empty d-tor out-of-line to keep boost::scoped_ptr happy.
+	Loader(support::FileName const & file_with_path, Params const &);
+	///
+	Loader(Loader const &);
+	/// Needed for the pimpl
 	~Loader();
 
+	Loader & operator=(Loader const &);
+
 	/// The file can be changed, or the display params, or both.
-	void reset(string const & file_with_path,
+	void reset(support::FileName const & file_with_path,
 		   DisplayType = ColorDisplay) const;
 	///
-	void reset(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.
-	string const & filename() const;
+	support::FileName const & filename() const;
 	///
-	bool empty() const { return filename().empty(); }
-
-	/// We are explicit about when we begin the loading process.
-	void startLoading() const;
 
-	/** starting loading of the image is conditional upon the
-	 *  inset being visible or not.
+	/** starting loading of the image is done by a urgency-based
+	 *  decision. Here we only call LoaderQueue::touch to request it.
 	 */
-	void startLoading(Inset const &, BufferView const &) const;
+	void startLoading() const;
 
 	/** Monitor any changes to the file.
 	 *  There is no point monitoring the file before startLoading() is
@@ -82,7 +76,7 @@ public:
 	void startMonitoring() const;
 	///
 	bool monitoring() const;
-	/** Returns the check sum of filename() so that, for example, you can
+	/** Returns the check checksum of filename() so that, for example, you can
 	 *  ascertain whether to output a new PostScript version of the file
 	 *  for a LaTeX run.
 	 */
@@ -94,7 +88,8 @@ public:
 	/** Connect and you'll be informed when the loading status of the image
 	 *  changes.
 	 */
-	typedef boost::signal0<void>::slot_type slot_type;
+	typedef boost::signal<void()> sig_type;
+	typedef sig_type::slot_type slot_type;
 	///
 	boost::signals::connection connect(slot_type const &) const;
 
@@ -107,9 +102,10 @@ 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 grfx
+} // namespace graphics
+} // namespace lyx
 
 #endif // GRAPHICSLOADER_H