X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsTypes.h;h=50533eb64a222d1b87d4f7d2f83edd53daec9f97;hb=9d00e2ec0a26dba68b90252b7fe8c02e2e448b28;hp=b8b7409f2ed73e89dcf1ce5b4f7337cbfdb70899;hpb=3aa7e91a827fa15b3e0906b975c4755a2dcdb76d;p=lyx.git

diff --git a/src/graphics/GraphicsTypes.h b/src/graphics/GraphicsTypes.h
index b8b7409f2e..50533eb64a 100644
--- a/src/graphics/GraphicsTypes.h
+++ b/src/graphics/GraphicsTypes.h
@@ -1,74 +1,74 @@
 // -*- C++ -*-
 /**
- *  \file GraphicsTypes.h
- *  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 
+ * \author Angus Leeming
  *
- * Full author contact details available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
- *  All that header files outside the graphics subdirectory should need to
- *  access.
+ * All that header files outside the graphics subdirectory should need to
+ * access.
  */
 
 #ifndef GRAPHICSTYPES_H
 #define GRAPHICSTYPES_H
 
-#include "support/translator.h"
+#include "support/Translator.h"
+#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,
-		///
-		ErrorConverting,
-		///
-		ErrorLoading,
-		///
-		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 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,
+	///
+	ErrorConverting,
+	///
+	ErrorLoading,
+	///
+	ErrorGeneratingPixmap,
+	/// The data is not in the cache at all!
+	ErrorUnknown
+};
 
-	/// How is the image to be displayed on the LyX screen?
-	enum DisplayType {
-		///
-		DefaultDisplay,
-		///
-		MonochromeDisplay,
-		///
-		GrayscaleDisplay,
-		///
-		ColorDisplay,
-		///
-		NoDisplay
-	};
-	
-	/// The translator between the Display enum and corresponding lyx string.
-	extern Translator< DisplayType, string > displayTranslator;
+/// How is the image to be displayed on the LyX screen?
+enum DisplayType {
+	///
+	DefaultDisplay,
+	///
+	MonochromeDisplay,
+	///
+	GrayscaleDisplay,
+	///
+	ColorDisplay,
+	///
+	NoDisplay
+};
 
-	void setDisplayTranslator();
-	
-} // namespace grfx
+
+/// The translator between the Display enum and corresponding lyx string.
+Translator<DisplayType, std::string> const & displayTranslator();
+
+} // namespace graphics
+} // namespace lyx
 
 #endif // GRAPHICSTYPES_H