* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

[lyx.git] / src / insets / insetgraphicsParams.h

diff --git a/src/insets/insetgraphicsParams.h b/src/insets/insetgraphicsParams.h
index c288c65bc23e47030b4cfde0b7c583ba1d559f02..8b2a62842401af1d53257c5e14a5e0a67ad43282 100644 (file)
--- a/src/insets/insetgraphicsParams.h
+++ b/src/insets/insetgraphicsParams.h
@@ -5,9 +5,9 @@
  * 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
@@ -15,29 +15,28 @@
 
 
 #include "graphics/GraphicsTypes.h"
-#include "LString.h"
 #include "lyxlength.h"
-
-class LyXLex;
+#include "support/filename.h"
 
 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.
-       string 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;
        ///
@@ -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, 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.
@@ -93,4 +92,6 @@ bool operator==(InsetGraphicsParams const &, InsetGraphicsParams const &);
 ///
 bool operator!=(InsetGraphicsParams const &, InsetGraphicsParams const &);
 
+} // namespace lyx
+
 #endif