Rename LatexRunParams::fragile as moving_arg.

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

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index ac13376ae9c0a39c7506a3932095bdf9d7d69b72..507dd08ccb373337d4fd198b039fe45e27a9e59c 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -13,8 +13,6 @@
 #ifndef INSET_GRAPHICS_H
 #define INSET_GRAPHICS_H
 
-
-
 #include "insets/inset.h"
 #include "insets/insetgraphicsParams.h"
 
@@ -35,19 +33,11 @@ public:
        ///
        ~InsetGraphics();
        ///
-       virtual dispatch_result localDispatch(FuncRequest const & cmd); 
-       ///
-       int ascent(BufferView *, LyXFont const &) const;
-       ///
-       int descent(BufferView *, LyXFont const &) const;
-       ///
-       int width(BufferView *, LyXFont const &) const;
-       ///
-       void draw(BufferView *, LyXFont const &, int, float &, bool) const;
+       virtual dispatch_result localDispatch(FuncRequest const & cmd);
        ///
-       void edit(BufferView *, int, int, mouse_button::state);
+       void dimension(BufferView *, LyXFont const &, Dimension &) const;
        ///
-       void edit(BufferView * bv, bool front = true);
+       void draw(BufferView *, LyXFont const &, int, float &) const;
        ///
        EDITABLE editable() const;
        ///
@@ -60,7 +50,7 @@ public:
         fragile commands by adding a #\protect# before.
         */
        int latex(Buffer const *, std::ostream &,
-                 bool fragile, bool free_spc) const;
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
@@ -111,7 +101,7 @@ private:
        /// Create the options for the latex command.
        string const createLatexOptions() const;
        /// Convert the file if needed, and return the location of the file.
-       string const prepareFile(Buffer const * buf) const;
+       string const prepareFile(Buffer const * buf, LatexRunParams const &) const;
 
        ///
        InsetGraphicsParams params_;
@@ -134,7 +124,7 @@ public:
        ///
        InsetGraphicsMailer(InsetGraphics & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
        virtual string const & name() const { return name_; }
        ///