X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FPreviewImage.h;h=6b5ac7e66cd1d1e0495a0b84a5aa37570fa7adfd;hb=38c2cde0d8695ac5287bae218c4a33a2acf18ef8;hp=67b67ed856cb84472f32dfc53201637bfcce3e38;hpb=f68a2bfb915bf590b9dd11061750b7922e5c1deb;p=lyx.git

diff --git a/src/graphics/PreviewImage.h b/src/graphics/PreviewImage.h
index 67b67ed856..6b5ac7e66c 100644
--- a/src/graphics/PreviewImage.h
+++ b/src/graphics/PreviewImage.h
@@ -1,24 +1,28 @@
 // -*- C++ -*-
 /**
- *  \file PreviewImage.h
- *  Copyright 2002 the LyX Team
- *  Read the file COPYING
+ * \file PreviewImage.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef PREVIEWIMAGE_H
 #define PREVIEWIMAGE_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include "support/strfwd.h"
+
+namespace lyx {
+
+namespace support { class FileName; }
 
-#include "LString.h"
-#include <boost/scoped_ptr.hpp>
+class Dimension;
 
-namespace grfx {
+namespace graphics {
 
+class Cache;
 class PreviewLoader;
 class Image;
 
@@ -28,33 +32,34 @@ public:
 	 *  descent = height * (1 - ascent_frac)
 	 */
 	PreviewImage(PreviewLoader & parent,
-		     string const & latex_snippet,
-		     string const & bitmap_file,
+		     std::string const & latex_snippet,
+		     support::FileName const & bitmap_file,
 		     double ascent_frac);
 	///
 	~PreviewImage();
 
-	/// We are explicit about when we begin the loading process.
-	void startLoading();
-
-	///
-	string const & snippet() const;
-	///
-	int ascent() const;
 	///
-	int descent() const;
-	///
-	int width() const;
+	std::string const & snippet() const;
 	///
+	Dimension dim() const;
+
+	/** If the image is not yet loaded (WaitingToLoad), then this method
+	 *  triggers that.
+	 */
 	Image const * image() const;
+	///
+	support::FileName const & filename() const;
+
+	PreviewLoader & previewLoader() const;
 
 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 // PREVIEWIMAGE_H