Loop refactoring

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

diff --git a/src/insets/InsetGraphicsParams.h b/src/insets/InsetGraphicsParams.h
index 0f9600971c69dd60fd16263d68e51bb628f59ffa..315f4c70827bd34b0890d4473122aeaff84ecf1f 100644 (file)
--- a/src/insets/InsetGraphicsParams.h
+++ b/src/insets/InsetGraphicsParams.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Baruch Even
- * \author Herbert Voß
+ * \author Herbert Voß
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,8 +14,7 @@
 #define INSETGRAPHICSPARAMS_H
 
 
-#include "graphics/GraphicsTypes.h"
-#include "Length.h"
+#include "graphics/GraphicsParams.h"
 
 #include "support/FileName.h"
 
@@ -49,13 +48,11 @@ public:
        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;
+       /// The bounding box
+       graphics::BoundingBox bbox;
        /// clip image
        bool clip;
 
@@ -71,12 +68,13 @@ public:
        ///
        InsetGraphicsParams(InsetGraphicsParams const &);
        ///
-       void operator=(InsetGraphicsParams const &);
+       InsetGraphicsParams & operator=(InsetGraphicsParams const &);
        /// Save the parameters in the LyX format stream.
        /// 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(Lexer & lex, std::string const & token, std::string const & bufpath);
+       bool Read(Lexer & lex, std::string const & token, Buffer const & buf,
+                 bool allowOrigin);
        /// convert
        // Only a subset of InsetGraphicsParams is needed for display purposes.
        // This function also interrogates lyxrc to ascertain whether