the AM_* flags patch

[lyx.git] / src / graphics / GraphicsTypes.h

diff --git a/src/graphics/GraphicsTypes.h b/src/graphics/GraphicsTypes.h
index 455c26f1f7ed1f0217127bfc32641e50fb64e7ee..1b34eabd77d535603e4aaa1cc4de85f8fe6aea5b 100644 (file)
--- a/src/graphics/GraphicsTypes.h
+++ b/src/graphics/GraphicsTypes.h
@@ -1,15 +1,15 @@
 // -*- 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
@@ -17,7 +17,9 @@
 
 #include "support/translator.h"
 
-namespace grfx {
+
+namespace lyx {
+namespace graphics {
 
 /// The status of the loading process
 enum ImageStatus {
@@ -61,12 +63,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