Merge branch 'master' into biblatex2

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

diff --git a/src/graphics/GraphicsTypes.h b/src/graphics/GraphicsTypes.h
index 455c26f1f7ed1f0217127bfc32641e50fb64e7ee..90d390cae1c01192a3b32b41887eaeaacab6530f 100644 (file)
--- a/src/graphics/GraphicsTypes.h
+++ b/src/graphics/GraphicsTypes.h
@@ -1,23 +1,25 @@
 // -*- 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
 
-#include "support/translator.h"
+#include "support/strfwd.h"
 
-namespace grfx {
+
+namespace lyx {
+namespace graphics {
 
 /// The status of the loading process
 enum ImageStatus {
@@ -47,26 +49,7 @@ enum ImageStatus {
        ErrorUnknown
 };
 
-/// How is the image to be displayed on the LyX screen?
-enum DisplayType {
-       ///
-       DefaultDisplay,
-       ///
-       MonochromeDisplay,
-       ///
-       GrayscaleDisplay,
-       ///
-       ColorDisplay,
-       ///
-       NoDisplay
-};
-
-/// The translator between the DisplayType and the corresponding lyx string.
-extern Translator<DisplayType, string> displayTranslator;
-
-///
-void setDisplayTranslator();
-
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
 
 #endif // GRAPHICSTYPES_H