X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsTypes.h;h=9a71f59f4a6ec76d2d73aa1d3ef80fa0959616a8;hb=f7b1c86393d890d5d473279d88e26bb78f8c1275;hp=7bbd90385df8770e3a3d5ff1b5a83bf3f62e5373;hpb=1eb8155fa0d2253d9504a8d660cb3d666c1224f6;p=lyx.git

diff --git a/src/graphics/GraphicsTypes.h b/src/graphics/GraphicsTypes.h
index 7bbd90385d..9a71f59f4a 100644
--- a/src/graphics/GraphicsTypes.h
+++ b/src/graphics/GraphicsTypes.h
@@ -1,27 +1,27 @@
 // -*- C++ -*-
 /**
- *  \file GraphicsTypes.h
+ * \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 are 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
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include "support/Translator.h"
 
-#include "support/translator.h"
+#include <string>
 
-namespace grfx {
+
+namespace lyx {
+namespace graphics {
 
 /// The status of the loading process
 enum ImageStatus {
@@ -65,12 +65,11 @@ enum DisplayType {
 	NoDisplay
 };
 
-/// The translator between the DisplayType and the corresponding lyx string.
-extern Translator<DisplayType, string> displayTranslator;
 
-///
-void setDisplayTranslator();
+/// The translator between the Display enum and corresponding lyx string.
+Translator<DisplayType, std::string> const & displayTranslator();
 
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
 
 #endif // GRAPHICSTYPES_H