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

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

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index 0fe0c6daff43712ada94c14974f578ae933ff2ed..51ffe31ca274fdd6106ab0c4ee14c00eb876c089 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -15,10 +15,14 @@
 
 #include "inset.h"
 #include "insetgraphicsParams.h"
+#include "mailinset.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
+
+namespace lyx {
+
 class Dialogs;
 class RenderGraphic;
 class LaTeXFeatures;
@@ -31,7 +35,7 @@ public:
        ///
        ~InsetGraphics();
        ///
-       void metrics(MetricsInfo &, Dimension &) const;
+       bool metrics(MetricsInfo &, Dimension &) const;
        ///
        EDITABLE editable() const;
        ///
@@ -43,16 +47,13 @@ public:
         #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 &, odocstream &,
                  OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, std::ostream &,
+       int plaintext(Buffer const &, odocstream &,
                  OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
-       int docbook(Buffer const &, std::ostream &,
+       int docbook(Buffer const &, odocstream &,
                    OutputParams const &) const;
 
        /** Tell LyX what the latex features you need i.e. what latex packages
@@ -61,7 +62,7 @@ public:
        void validate(LaTeXFeatures & features) const;
 
        /// returns LyX code associated with the inset. Used for TOC, ...)
-       InsetOld::Code lyxCode() const { return InsetOld::GRAPHICS_CODE; }
+       InsetBase::Code lyxCode() const { return InsetBase::GRAPHICS_CODE; }
 
        /** Set the inset parameters, used by the GUIndependent dialog.
            Return true of new params are different from what was so far.
@@ -76,6 +77,8 @@ public:
        void edit(LCursor & cur, bool left);
        ///
        void editGraphics(InsetGraphicsParams const &, Buffer const &) const;
+       ///
+       bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
 protected:
        InsetGraphics(InsetGraphics const &);
        ///
@@ -93,9 +96,9 @@ private:
        /// Create the options for the latex command.
        std::string const createLatexOptions() const;
        /// Create length values for docbook export.
-       std::string const toDocbookLength(LyXLength const & len) const;
+       docstring const toDocbookLength(LyXLength const & len) const;
        /// Create the atributes for docbook export.
-       std::string const createDocBookAttributes() const;
+       docstring const createDocBookAttributes() const;
        /// Convert the file if needed, and return the location of the file.
        std::string const prepareFile(Buffer const & buf, OutputParams const &) const;
 
@@ -103,15 +106,13 @@ private:
        InsetGraphicsParams params_;
 
        /// holds the entity name that defines the graphics location (SGML).
-       std::string const graphic_label;
+       docstring const graphic_label;
 
        /// The thing that actually draws the image on LyX's screen.
        boost::scoped_ptr<RenderGraphic> const graphic_;
 };
 
 
-#include "mailinset.h"
-
 class InsetGraphicsMailer : public MailInset {
 public:
        ///
@@ -136,4 +137,7 @@ private:
        InsetGraphics & inset_;
 };
 
+
+} // namespace lyx
+
 #endif