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

diff --git a/src/insets/insetgraphicsParams.h b/src/insets/insetgraphicsParams.h
index 24b2098da8..8b2a628424 100644
--- a/src/insets/insetgraphicsParams.h
+++ b/src/insets/insetgraphicsParams.h
@@ -5,39 +5,38 @@
  * 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
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSETGRAPHICSPARAMS_H
 #define INSETGRAPHICSPARAMS_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 #include "graphics/GraphicsTypes.h"
-#include "LString.h"
 #include "lyxlength.h"
+#include "support/filename.h"
+
+namespace lyx {
+
+namespace graphics { class Params; }
 
 class LyXLex;
 
-namespace grfx {
-	class Params;
-}
 
-/// 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.
-	string filename;
+	support::DocFileName filename;
 	/// Scaling the Screen inside Lyx
 	unsigned int lyxscale;
 	/// How to display the image inside LyX
-	grfx::DisplayType display;
+	graphics::DisplayType display;
 	/// Scaling for output (LaTeX)
-	float scale;
+	std::string scale;
 	/// sizes for output (LaTeX)
 	LyXLength width;
 	///
@@ -50,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();
@@ -72,14 +71,14 @@ struct InsetGraphicsParams
 	///
 	InsetGraphicsParams & operator=(InsetGraphicsParams const &);
 	/// Save the parameters in the LyX format stream.
-	void Write(std::ostream & os) 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);
+	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.
-	grfx::Params as_grfxParams(string const & filepath) const;
+	graphics::Params as_grfxParams() const;
 
 private:
 	/// Initialize the object to a default status.
@@ -93,4 +92,6 @@ bool operator==(InsetGraphicsParams const &, InsetGraphicsParams const &);
 ///
 bool operator!=(InsetGraphicsParams const &, InsetGraphicsParams const &);
 
+} // namespace lyx
+
 #endif