X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsParams.h;h=86cc9dc9b16daeb648fde7454c1bfc3c4fb6d5f2;hb=689e54f34a4d735e6081b1b1ac8487bf028f3982;hp=51f40d86edc141e96a637496bc15462aae15eb92;hpb=1eb8155fa0d2253d9504a8d660cb3d666c1224f6;p=lyx.git

diff --git a/src/graphics/GraphicsParams.h b/src/graphics/GraphicsParams.h
index 51f40d86ed..86cc9dc9b1 100644
--- a/src/graphics/GraphicsParams.h
+++ b/src/graphics/GraphicsParams.h
@@ -1,37 +1,37 @@
 // -*- C++ -*-
 /**
- *  \file GraphicsParams.h
+ * \file GraphicsParams.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- *  \author Angus Leeming 
+ * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
- *  Used internally by the grfx::Image.
+ * Used internally by the lyx::graphics::Image.
  */
 
 #ifndef GRAPHICSPARAMS_H
 #define GRAPHICSPARAMS_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include "support/FileName.h"
 
-#include "GraphicsTypes.h"
-#include "LString.h"
+#include <string>
+#include <iosfwd>
 
 
-namespace grfx {
+namespace lyx {
+namespace graphics {
 
 /** Parse a string of the form "200pt 500pt 300mm 5in" into a
  *  usable bounding box.
  */
-struct BoundingBox {
+class BoundingBox {
+public:
 	///
 	BoundingBox();
 	///
-	BoundingBox(string const &);
+	BoundingBox(std::string const &);
 
 	/// 0 0 0 0 is empty!
 	bool empty() const;
@@ -45,15 +45,20 @@ struct BoundingBox {
 bool operator==(BoundingBox const &, BoundingBox const &);
 bool operator!=(BoundingBox const &, BoundingBox const &);
 
-struct Params
+std::ostream & operator<<(std::ostream &, BoundingBox const &);
+
+
+class Params
 {
+public:
 	Params();
 
-	DisplayType display;
+	bool display;
 	unsigned int scale;
+	double pixel_ratio;
 
 	/// The image filename.
-	string filename;
+	support::FileName filename;
 
 	/** Note that the BoundingBox is always relative to the BoundingBox
 	 *  as stored in the EPS file.
@@ -65,12 +70,13 @@ struct Params
 	 *  image.
 	 */
 	/// Rotation angle.
-	float angle;
+	double angle;
 };
 
 bool operator==(Params const &, Params const &);
 bool operator!=(Params const &, Params const &);
 
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
 
 #endif // GRAPHICSPARAMS_H