Clean up InsetGraphics::Cache and rename as GraphicsInset.

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

diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h
index 944f59e2fabbb76b399545b6d109b9659bb820d4..2b83382bc3317e6f3136dbbc3c2ac9298c4ef361 100644 (file)
--- a/src/insets/insetfloat.h
+++ b/src/insets/insetfloat.h
@@ -10,9 +10,8 @@
  * Full author contact details are available in file CREDITS
  */
 
-#ifndef InsetFloat_H
-#define InsetFloat_H
-
+#ifndef INSETFLOAT_H
+#define INSETFLOAT_H
 
 #include "insetcollapsable.h"
 #include "toc.h"
@@ -20,7 +19,7 @@
 
 struct InsetFloatParams {
        ///
-       InsetFloatParams() : placement("htbp"), wide(false) {}
+       InsetFloatParams() : wide(false) {}
        ///
        void write(std::ostream & os) const;
        ///
@@ -42,11 +41,11 @@ public:
        ///
        InsetFloat(BufferParams const &, string const &);
        ///
-       InsetFloat(InsetFloat const &, bool same_id = false);
+       InsetFloat(InsetFloat const &);
        ///
        ~InsetFloat();
        ///
-       virtual dispatch_result localDispatch(FuncRequest const & cmd); 
+       virtual dispatch_result localDispatch(FuncRequest const & cmd);
        ///
        void write(Buffer const * buf, std::ostream & os) const;
        ///
@@ -54,11 +53,12 @@ public:
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       Inset * clone(Buffer const &, bool same_id = false) const;
+       Inset * clone() const;
        ///
        Inset::Code lyxCode() const { return Inset::FLOAT_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &, bool fragile, bool fp) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int docbook(Buffer const *, std::ostream &, bool mixcont) const;
        ///
@@ -70,22 +70,14 @@ public:
            insets that may contain several paragraphs */
        bool noFontChange() const { return true; }
        ///
-       string const & type() const;
-       ///
-       void placement(string const & p);
-       ///
-       string const & placement() const;
-       ///
        void wide(bool w, BufferParams const &);
        ///
-       bool wide() const;
-       ///
        void addToToc(toc::TocList &, Buffer const *) const;
        ///
        bool  showInsetDialog(BufferView *) const;
        ///
        InsetFloatParams const & params() const { return params_; }
-       
+
 private:
        ///
        InsetFloatParams params_;
@@ -100,7 +92,7 @@ public:
        ///
        InsetFloatMailer(InsetFloat & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
        virtual string const & name() const { return name_; }
        ///
@@ -108,11 +100,10 @@ public:
        ///
        static void string2params(string const &, InsetFloatParams &);
        ///
-       static string const params2string(string const & name,
-                                         InsetFloatParams const &);
+       static string const params2string(InsetFloatParams const &);
 private:
        ///
-       string const name_;
+       static string const name_;
        ///
        InsetFloat & inset_;
 };