Enable convertDefault.sh to run even if its executable bit is not set.

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

diff --git a/src/insets/insetgraphicsParams.h b/src/insets/insetgraphicsParams.h
index 24b2098da81ca46bc7f5912555dc6ef711d35352..c7dd3a74cacd09827e554143c4d3434503b7d112 100644 (file)
--- a/src/insets/insetgraphicsParams.h
+++ b/src/insets/insetgraphicsParams.h
@@ -7,35 +7,36 @@
  * \author Baruch Even
  * \author Herbert Voss
  *
- * 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"
 
 class LyXLex;
 
-namespace grfx {
+namespace lyx {
+namespace graphics {
        class Params;
 }
+}
+
 
 /// This struct holds all the parameters needed by insetGraphics.
 struct InsetGraphicsParams
 {
        /// Image filename.
-       string filename;
+       lyx::support::FileName filename;
        /// Scaling the Screen inside Lyx
        unsigned int lyxscale;
        /// How to display the image inside LyX
-       grfx::DisplayType display;
+       lyx::graphics::DisplayType display;
        /// Scaling for output (LaTeX)
        float scale;
        /// sizes for output (LaTeX)
@@ -72,14 +73,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, string const & bufpath) const;
        /// If the token belongs to our parameters, read it.
-       bool Read(LyXLex & lex, string const & token);
+       bool Read(LyXLex & lex, string const & token, 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;
+       lyx::graphics::Params as_grfxParams() const;
 
 private:
        /// Initialize the object to a default status.