X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsParams.h;h=b1eb1a05c53d7c9d63ffe57c44b4b944cbdb9a6b;hb=99c5a46c68bd605c03d4e3a86811831ed7dd3d37;hp=0517ee21cd1f2cb7e96f705a8ae861a4d5bc0bef;hpb=1bb197b5d4821404cfe11509c71d1f8de7cee711;p=lyx.git

diff --git a/src/graphics/GraphicsParams.h b/src/graphics/GraphicsParams.h
index 0517ee21cd..b1eb1a05c5 100644
--- a/src/graphics/GraphicsParams.h
+++ b/src/graphics/GraphicsParams.h
@@ -1,56 +1,63 @@
 // -*- C++ -*-
 /**
- *  \file GraphicsParams.h
- *  Copyright 2002 the LyX Team
- *  Read the file COPYING
+ * \file GraphicsParams.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *  \author Angus Leeming <a.leeming@ic.ac.uk>
+ * \author Angus Leeming
  *
- *  Used internally by the GraphicsCache.
+ * Full author contact details are available in file CREDITS.
+ *
+ * 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;
 
-	int xl;
-	int yb;
-	int xr;
-	int yt;
+	unsigned int xl;
+	unsigned int yb;
+	unsigned int xr;
+	unsigned int yt;
 };
 
 bool operator==(BoundingBox const &, BoundingBox const &);
 bool operator!=(BoundingBox const &, BoundingBox const &);
 
-struct GParams
+std::ostream & operator<<(std::ostream &, BoundingBox const &);
+
+
+class Params
 {
-	GParams();
+public:
+	Params();
 
-	DisplayType display;
+	bool display;
+	unsigned int scale;
 
 	/// The image filename.
-	string filename;
+	support::FileName filename;
 
 	/** Note that the BoundingBox is always relative to the BoundingBox
 	 *  as stored in the EPS file.
@@ -61,17 +68,14 @@ struct GParams
 	/** The size of the view inside lyx in pixels or the scaling of the
 	 *  image.
 	 */
-	unsigned int width;
-	unsigned int height;
-	unsigned int scale;
-
 	/// Rotation angle.
-	int angle;
+	double angle;
 };
 
-bool operator==(GParams const &, GParams const &);
-bool operator!=(GParams const &, GParams const &);
+bool operator==(Params const &, Params const &);
+bool operator!=(Params const &, Params const &);
 
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
 
 #endif // GRAPHICSPARAMS_H