X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsTypes.h;h=90d390cae1c01192a3b32b41887eaeaacab6530f;hb=425c190d623daeb6d05bce1aa2244b548225305a;hp=fecd1e53523d738983f29c6959e7f783396f93fa;hpb=514156adbb94a0e4a2c150ef2920d600b67cef16;p=lyx.git

diff --git a/src/graphics/GraphicsTypes.h b/src/graphics/GraphicsTypes.h
index fecd1e5352..90d390cae1 100644
--- a/src/graphics/GraphicsTypes.h
+++ b/src/graphics/GraphicsTypes.h
@@ -1,61 +1,55 @@
 // -*- C++ -*-
 /**
- *  \file GraphicsTypes.h
- *  Copyright 2002 the LyX Team
- *  Read the file COPYING
+ * \file GraphicsTypes.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
  *
- *  All that header files outside the graphics subdirectory should need to
- *  access. That just leaves insetgraphics.C to access GraphicsCache.h.
- *  It also makes life easier for files inside the graphics subdirectory!
+ * Full author contact details are available in file CREDITS.
+ *
+ * All that header files outside the graphics subdirectory should need to
+ * access.
  */
 
 #ifndef GRAPHICSTYPES_H
 #define GRAPHICSTYPES_H
 
-#include <boost/shared_ptr.hpp>
+#include "support/strfwd.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
-namespace grfx {
+namespace lyx {
+namespace graphics {
 
+/// The status of the loading process
+enum ImageStatus {
+	/** The data is in the cache, but no request to display it
+	 *  has been received.
+	 */
+	WaitingToLoad,
+	/// The image is in a loadable format and is being loaded.
+	Loading,
+	/// The image is being converted to a loadable format.
+	Converting,
+	/// The image has been loaded into memory.
+	Loaded,
+	/// The image is in memory and is being scaled, rotated, etc.
+	ScalingEtc,
+	/// All finished. Can display the image.
+	Ready,
+	///
+	ErrorNoFile,
 	///
-	class GImage;
+	ErrorConverting,
 	///
-	typedef boost::shared_ptr<GImage> ImagePtr;
+	ErrorLoading,
 	///
-	class GCacheItem;
-	/// The cache contains data of this type.
-	typedef boost::shared_ptr<GCacheItem> GraphicPtr;
+	ErrorGeneratingPixmap,
+	/// The data is not in the cache at all!
+	ErrorUnknown
+};
 
-	/// The status of the loading process
-	enum ImageStatus {
-		/** The data is in the cache, but no request to display it
-		 *  has been received.
-		 */
-		WaitingToLoad,
-		/// The image is in a loadable format and is being loaded.
-		Loading,
-		/// The image is being converted to a loadable format.
-		Converting,
-		/// The image is in memory and is being scaled, rotated, etc.
-		ScalingEtc,
-		/// All finished. Can display the image.
-		Loaded,
-		///
-		ErrorNoFile,
-		///
-		ErrorConverting,
-		///
-		ErrorLoading,
-		/// Fall back on the unmodified image?
-		ErrorScalingEtc,
-		/// The data is not in the cache at all!
-		ErrorUnknown
-	};
-}
+} // namespace graphics
+} // namespace lyx
 
 #endif // GRAPHICSTYPES_H