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

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

diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h
index 3daa605b8d1846d31fb2bb5bbd20a2f373d3d6f4..e1000de62908164ab14c17f6437f77bfb84e73de 100644 (file)
--- a/src/insets/insetfloat.h
+++ b/src/insets/insetfloat.h
@@ -7,7 +7,7 @@
  * \author Jürgen Vigna
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSETFLOAT_H
@@ -47,24 +47,26 @@ public:
        ///
        virtual dispatch_result localDispatch(FuncRequest const & cmd);
        ///
-       void write(Buffer const * buf, std::ostream & os) const;
+       void write(Buffer const & buf, std::ostream & os) const;
        ///
-       void read(Buffer const * buf, LyXLex & lex);
+       void read(Buffer const & buf, LyXLex & lex);
        ///
        void validate(LaTeXFeatures & features) const;
        ///
        virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       Inset::Code lyxCode() const { return Inset::FLOAT_CODE; }
+       InsetOld::Code lyxCode() const { return InsetOld::FLOAT_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &,
+       int latex(Buffer const &, std::ostream &,
                  LatexRunParams const &) const;
        ///
-       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
+       int linuxdoc(Buffer const &, std::ostream &) const;
+       ///
+       int docbook(Buffer const &, std::ostream &, bool mixcont) const;
        ///
        string const editMessage() const;
        ///
-       bool insetAllowed(Inset::Code) const;
+       bool insetAllowed(InsetOld::Code) const;
        /** returns true if, when outputing LaTeX, font changes should
            be closed before generating this inset. This is needed for
            insets that may contain several paragraphs */
@@ -72,7 +74,7 @@ public:
        ///
        void wide(bool w, BufferParams const &);
        ///
-       void addToToc(toc::TocList &, Buffer const *) const;
+       void addToToc(lyx::toc::TocList &, Buffer const &) const;
        ///
        bool  showInsetDialog(BufferView *) const;
        ///