Fix bug 3363: mark buffer dirty after middle button paste in plain text and table...

[lyx.git] / src / insets / InsetGraphicsParams.cpp

diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp
index c75872522f8e6dd1bd531268979aa4974b6dbd46..858ce5e8f0bfce0c2bb8770e258fb57c90c54066 100644 (file)
--- a/src/insets/InsetGraphicsParams.cpp
+++ b/src/insets/InsetGraphicsParams.cpp
@@ -14,9 +14,9 @@
 #include "InsetGraphicsParams.h"
 
 #include "debug.h"
-#include "lyx_main.h" // for use_gui
-#include "lyxlex.h"
-#include "lyxrc.h"
+#include "LyX.h" // for use_gui
+#include "Lexer.h"
+#include "LyXRC.h"
 
 #include "graphics/GraphicsParams.h"
 
@@ -24,7 +24,7 @@
 #include "support/filetools.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
-#include "support/translator.h"
+#include "support/Translator.h"
 
 
 namespace lyx {
@@ -69,8 +69,8 @@ void InsetGraphicsParams::init()
        lyxscale = 100;                 // lyx scaling in percentage
        display = graphics::DefaultDisplay; // display mode; see preferences
        scale = string("100");                  // output scaling in percentage
-       width = LyXLength();
-       height = LyXLength();
+       width = Length();
+       height = Length();
        keepAspectRatio = false;        // for LaTeX output
        draft = false;                  // draft mode
        noUnzip = false;                // unzip files
@@ -192,7 +192,7 @@ void InsetGraphicsParams::Write(ostream & os, string const & bufpath) const
 }
 
 
-bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const & bufpath)
+bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const & bufpath)
 {
        if (token == "filename") {
                lex.eatLine();
@@ -209,11 +209,11 @@ bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const
                scale = lex.getString();
        } else if (token == "width") {
                lex.next();
-               width = LyXLength(lex.getString());
+               width = Length(lex.getString());
                scale = string();
        } else if (token == "height") {
                lex.next();
-               height = LyXLength(lex.getString());
+               height = Length(lex.getString());
                scale = string();
        } else if (token == "keepAspectRatio") {
                keepAspectRatio = true;