rename/merge LyXLength related stuff

[lyx.git] / src / graphics / GraphicsParams.h

diff --git a/src/graphics/GraphicsParams.h b/src/graphics/GraphicsParams.h
index 678566e2bdc387bd679746df286ed992cf7c7bc3..a7b7c8ffa424cac72e383b2b8a2edc20f54f4786 100644 (file)
--- a/src/graphics/GraphicsParams.h
+++ b/src/graphics/GraphicsParams.h
@@ -16,6 +16,8 @@
 
 #include "GraphicsTypes.h"
 
+#include "support/FileName.h"
+
 #include <string>
 #include <iosfwd>
 
@@ -26,7 +28,8 @@ namespace graphics {
 /** Parse a string of the form "200pt 500pt 300mm 5in" into a
  *  usable bounding box.
  */
-struct BoundingBox {
+class BoundingBox {
+public:
        ///
        BoundingBox();
        ///
@@ -47,15 +50,16 @@ bool operator!=(BoundingBox const &, BoundingBox const &);
 std::ostream & operator<<(std::ostream &, BoundingBox const &);
 
 
-struct Params
+class Params
 {
+public:
        Params();
 
        DisplayType display;
        unsigned int scale;
 
        /// The image filename.
-       std::string filename;
+       support::FileName filename;
 
        /** Note that the BoundingBox is always relative to the BoundingBox
         *  as stored in the EPS file.
@@ -67,7 +71,7 @@ struct Params
         *  image.
         */
        /// Rotation angle.
-       float angle;
+       double angle;
 };
 
 bool operator==(Params const &, Params const &);