This should be the last of the commits refactoring the InsetLayout code.

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

diff --git a/src/insets/InsetGraphicsParams.h b/src/insets/InsetGraphicsParams.h
index 2f4ca6e57eb3a287ebc13e2c572e985cd41f2d15..90274f7b9830c454576711392f337efd840d55d6 100644 (file)
--- a/src/insets/InsetGraphicsParams.h
+++ b/src/insets/InsetGraphicsParams.h
@@ -15,14 +15,15 @@
 
 
 #include "graphics/GraphicsTypes.h"
-#include "lyxlength.h"
-#include "support/filename.h"
+#include "Length.h"
+#include "EmbeddedFiles.h"
 
 namespace lyx {
 
 namespace graphics { class Params; }
 
-class LyXLex;
+class Lexer;
+class Buffer;
 
 
 /// This class holds all the parameters needed by insetGraphics.
@@ -30,7 +31,7 @@ class InsetGraphicsParams
 {
 public:
        /// Image filename.
-       support::DocFileName filename;
+       EmbeddedFile filename;
        /// Scaling the Screen inside Lyx
        unsigned int lyxscale;
        /// How to display the image inside LyX
@@ -38,15 +39,17 @@ 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
        bool draft;
        /// what to do with zipped files
        bool noUnzip;
+       /// scale image before rotating
+       bool scaleBeforeRotation;
 
        /// The bounding box with "xLB yLB yRT yRT ", divided by a space!
        std::string bb;
@@ -69,15 +72,16 @@ public:
        ///
        InsetGraphicsParams(InsetGraphicsParams const &);
        ///
-       InsetGraphicsParams & operator=(InsetGraphicsParams const &);
+       void operator=(InsetGraphicsParams const &);
        /// Save the parameters in the LyX format stream.
-       void Write(std::ostream & os, std::string const & bufpath) const;
+       /// Buffer is needed to figure out if a figure is embedded.
+       void Write(std::ostream & os, Buffer const & buf) 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
-  // to display or not.
+       // Only a subset of InsetGraphicsParams is needed for display purposes.
+       // This function also interrogates lyxrc to ascertain whether
+       // to display or not.
        graphics::Params as_grfxParams() const;
 
 private: