X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FinsetgraphicsParams.h;h=8b2a62842401af1d53257c5e14a5e0a67ad43282;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=c7dd3a74cacd09827e554143c4d3434503b7d112;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/insets/insetgraphicsParams.h b/src/insets/insetgraphicsParams.h
index c7dd3a74ca..8b2a628424 100644
--- 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 Voss
+ * \author Herbert Voß
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,30 +15,28 @@
 
 
 #include "graphics/GraphicsTypes.h"
-#include "LString.h"
 #include "lyxlength.h"
 #include "support/filename.h"
 
-class LyXLex;
-
 namespace lyx {
-namespace graphics {
-	class Params;
-}
-}
+
+namespace graphics { class Params; }
+
+class LyXLex;
 
 
-/// This struct holds all the parameters needed by insetGraphics.
-struct InsetGraphicsParams
+/// This class holds all the parameters needed by insetGraphics.
+class InsetGraphicsParams
 {
+public:
 	/// Image filename.
-	lyx::support::FileName filename;
+	support::DocFileName filename;
 	/// Scaling the Screen inside Lyx
 	unsigned int lyxscale;
 	/// How to display the image inside LyX
-	lyx::graphics::DisplayType display;
+	graphics::DisplayType display;
 	/// Scaling for output (LaTeX)
-	float scale;
+	std::string scale;
 	/// sizes for output (LaTeX)
 	LyXLength width;
 	///
@@ -51,20 +49,20 @@ struct InsetGraphicsParams
 	bool noUnzip;
 
 	/// The bounding box with "xLB yLB yRT yRT ", divided by a space!
-	string bb;
+	std::string bb;
 	/// clip image
 	bool clip;
 
 	/// Rotation angle.
-	float rotateAngle;
+	std::string rotateAngle;
 	/// Origin point of rotation
-	string rotateOrigin;
+	std::string rotateOrigin;
 	/// Do we have a subcaption?
 	bool subcaption;
 	/// The text of the subcaption.
-	string subcaptionText;
+	std::string subcaptionText;
 	/// any userdefined special command
-	string special;
+	std::string special;
 
 	///
 	InsetGraphicsParams();
@@ -73,14 +71,14 @@ struct InsetGraphicsParams
 	///
 	InsetGraphicsParams & operator=(InsetGraphicsParams const &);
 	/// Save the parameters in the LyX format stream.
-	void Write(std::ostream & os, string const & bufpath) const;
+	void Write(std::ostream & os, std::string const & bufpath) const;
 	/// If the token belongs to our parameters, read it.
-	bool Read(LyXLex & lex, string const & token, string const & bufpath);
+	bool Read(LyXLex & 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.
-	lyx::graphics::Params as_grfxParams() const;
+	graphics::Params as_grfxParams() const;
 
 private:
 	/// Initialize the object to a default status.
@@ -94,4 +92,6 @@ bool operator==(InsetGraphicsParams const &, InsetGraphicsParams const &);
 ///
 bool operator!=(InsetGraphicsParams const &, InsetGraphicsParams const &);
 
+} // namespace lyx
+
 #endif