Added various inset functions for Jean-Marc (see Changelog). Small fix in

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

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index dc5ba73adb28d5610f8d0286f6201669cf1828b4..aa9dc9d6cf19fd46101fbe3ea3a0f11e6e8b765a 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -17,7 +17,7 @@
 #pragma interface
 #endif 
 
-#include "insets/lyxinset.h"
+#include "insets/inset.h"
 #include "insets/insetgraphicsParams.h"
 #include "graphics/GraphicsCacheItem.h"
 #include <boost/smart_ptr.hpp>
@@ -48,37 +48,37 @@ public:
        ///
        void draw(BufferView *, LyXFont const &, int, float &, bool) const;
        ///
-       void Edit(BufferView *, int, int, unsigned int);
+       void edit(BufferView *, int, int, unsigned int);
        ///
-       EDITABLE Editable() const;
+       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 &,
                  bool fragile, bool free_spc) 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 &) const;
+       int docBook(Buffer const *, std::ostream &) const;
 
        /** Tell LyX what the latex features you need i.e. what latex packages
            you need to be included.
         */
-       void Validate(LaTeXFeatures & features) const;
+       void validate(LaTeXFeatures & features) const;
 
        /// returns LyX code associated with the inset. Used for TOC, ...)
-       Inset::Code LyxCode() const { return Inset::GRAPHICS_CODE; }
+       Inset::Code lyxCode() const { return Inset::GRAPHICS_CODE; }
 
        ///
-       Inset * Clone(Buffer const &) const;
+       virtual Inset * clone(Buffer const &, bool same_id = false) const;
 
        /** Set the inset parameters, used by the GUIndependent dialog.
            Return true of new params are different from what was so far.
@@ -97,18 +97,16 @@ private:
        /// Update the inset after parameter change.
        void updateInset() const;
        /// Get the status message, depends on the image loading status.
-       char const * statusMessage() const;
+       string const statusMessage() const;
        /// 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;
-
        /// The graphics cache handle.
        mutable boost::shared_ptr<GraphicsCacheItem> cacheHandle;
-
        /// is the pixmap initialized?
        mutable bool imageLoaded;
-
+       ///
        InsetGraphicsParams params;
 };