BUG 3598: display framed and shaded notes in a separate paragraph, require package...

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

diff --git a/src/insets/InsetGraphicsParams.h b/src/insets/InsetGraphicsParams.h
index e73c452181f2a0e0cb42999c0cd3ae3f21e360bc..5294a42ba3f5576e31c67fbe9b8daa1600643a7c 100644 (file)
--- a/src/insets/InsetGraphicsParams.h
+++ b/src/insets/InsetGraphicsParams.h
@@ -15,14 +15,14 @@
 
 
 #include "graphics/GraphicsTypes.h"
-#include "LyXLength.h"
-#include "support/filename.h"
+#include "Length.h"
+#include "support/FileName.h"
 
 namespace lyx {
 
 namespace graphics { class Params; }
 
-class LyXLex;
+class Lexer;
 
 
 /// This class holds all the parameters needed by insetGraphics.
@@ -38,9 +38,9 @@ public:
        /// Scaling for output (LaTeX)
        std::string scale;
        /// sizes for output (LaTeX)
-       LyXLength width;
+       Length width;
        ///
-       LyXLength height;
+       Length height;
        /// Keep the ratio between height and width when resizing.
        bool keepAspectRatio;
        /// draft mode
@@ -73,7 +73,7 @@ public:
        /// Save the parameters in the LyX format stream.
        void Write(std::ostream & os, std::string const & bufpath) const;
        /// If the token belongs to our parameters, read it.
-       bool Read(LyXLex & lex, std::string const & token, std::string const & bufpath);
+       bool Read(Lexer & lex, std::string const & token, std::string const & bufpath);
        /// convert
   // Only a subset of InsetGraphicsParams is needed for display purposes.
   // This function also interrogates lyxrc to ascertain whether