Final touch 'inset display()'; fix 'is a bit silly' bug

[lyx.git] / src / insets / insetgraphicsParams.C

diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C
index 0a236448944054c92eaddbe93529afc2c3a1ba64..a38cca4177e3a2c86812b4f27612c1e4aea4b0dc 100644 (file)
--- a/src/insets/insetgraphicsParams.C
+++ b/src/insets/insetgraphicsParams.C
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Baruch Even
- * \author Herbert Voss
+ * \author Herbert Voß
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -26,19 +26,15 @@
 #include "support/lstrings.h"
 #include "support/translator.h"
 
-using namespace lyx::support;
+using lyx::support::float_equal;
+using lyx::support::readBB_from_PSFile;
+using lyx::support::strToInt;
+using lyx::support::token;
 
+using std::string;
 using std::ostream;
 
 
-namespace lyx {
-namespace graphics {
-/// The translator between the DisplayType and the corresponding lyx string.
-extern Translator<DisplayType, string> displayTranslator;
-}
-}
-
-
 InsetGraphicsParams::InsetGraphicsParams()
 {
        init();
@@ -157,7 +153,7 @@ void InsetGraphicsParams::Write(ostream & os, string const & bufpath) const
        if (lyxscale != 100)
                os << "\tlyxscale " << lyxscale << '\n';
        if (display != lyx::graphics::DefaultDisplay)
-               os << "\tdisplay " << lyx::graphics::displayTranslator.find(display) << '\n';
+               os << "\tdisplay " << lyx::graphics::displayTranslator().find(display) << '\n';
        if (!float_equal(scale, 0.0, 0.05)) {
                if (!float_equal(scale, 100.0, 0.05))
                        os << "\tscale " << scale << '\n';
@@ -204,7 +200,7 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const
        } else if (token == "display") {
                lex.next();
                string const type = lex.getString();
-               display = lyx::graphics::displayTranslator.find(type);
+               display = lyx::graphics::displayTranslator().find(type);
        } else if (token == "scale") {
                lex.next();
                scale = lex.getFloat();