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

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

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index 0ea045452f3cfcdac71dea21a9229ae9b096af17..e35ecaec8bbb6d4ac9bc8534fc69a0f7315653c3 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -7,7 +7,7 @@
  * \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 INSET_GRAPHICS_H
@@ -21,11 +21,11 @@
 
 
 class Dialogs;
-class GraphicInset;
+class GraphicRenderer;
 class LaTeXFeatures;
 
 ///
-class InsetGraphics : public Inset, public boost::signals::trackable {
+class InsetGraphics : public InsetOld, public boost::signals::trackable {
 public:
        ///
        InsetGraphics();
@@ -42,22 +42,22 @@ public:
        ///
        EDITABLE editable() const;
        ///
-       void write(Buffer const *, std::ostream &) const;
+       void write(Buffer const &, std::ostream &) const;
        ///
-       void read(Buffer const *, LyXLex & lex);
+       void read(Buffer const &, LyXLex & lex);
 
        /** returns the number of rows (\n's) of generated tex code.
         #fragile == true# means, that the inset should take care about
         fragile commands by adding a #\protect# before.
         */
-       int latex(Buffer const *, std::ostream &,
+       int latex(Buffer const &, std::ostream &,
                  LatexRunParams const &) const;
        ///
-       int ascii(Buffer const *, std::ostream &, int linelen) const;
+       int ascii(Buffer const &, std::ostream &, int linelen) const;
        ///
-       int linuxdoc(Buffer const *, std::ostream &) const;
+       int linuxdoc(Buffer const &, std::ostream &) const;
        ///
-       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
+       int docbook(Buffer const &, std::ostream &, bool mixcont) const;
 
        /** Tell LyX what the latex features you need i.e. what latex packages
            you need to be included.
@@ -65,10 +65,10 @@ public:
        void validate(LaTeXFeatures & features) const;
 
        /// returns LyX code associated with the inset. Used for TOC, ...)
-       Inset::Code lyxCode() const { return Inset::GRAPHICS_CODE; }
+       InsetOld::Code lyxCode() const { return InsetOld::GRAPHICS_CODE; }
 
        ///
-       virtual Inset * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
 
        /** Set the inset parameters, used by the GUIndependent dialog.
            Return true of new params are different from what was so far.
@@ -95,7 +95,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, LatexRunParams const &) const;
+       string const prepareFile(Buffer const & buf, LatexRunParams const &) const;
 
        ///
        InsetGraphicsParams params_;
@@ -104,7 +104,7 @@ private:
        string const graphic_label;
 
        /// The thing that actually draws the image on LyX's screen.
-       boost::scoped_ptr<GraphicInset> const graphic_;
+       boost::scoped_ptr<GraphicRenderer> const graphic_;
 };
 
 
@@ -119,11 +119,14 @@ public:
        ///
        virtual string const & name() const { return name_; }
        ///
-       virtual string const inset2string() const;
+       virtual string const inset2string(Buffer const &) const;
        ///
-       static void string2params(string const &, InsetGraphicsParams &);
+       static void string2params(string const & data,
+                                 Buffer const & buffer,
+                                 InsetGraphicsParams &);
        ///
-       static string const params2string(InsetGraphicsParams const &);
+       static string const params2string(InsetGraphicsParams const &,
+                                         Buffer const &);
 private:
        ///
        static string const name_;