fix #832

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

diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h
index bb12e01faf170cd714614110aa79283f88f5325e..568dfa12895c8a07fcbf457dd26e24ed934a994b 100644 (file)
--- a/src/insets/insetfloat.h
+++ b/src/insets/insetfloat.h
@@ -10,18 +10,16 @@
  * 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"
 
-class Painter;
 
 struct InsetFloatParams {
        ///
-       InsetFloatParams() : placement("htbp"), wide(false) {}
+       InsetFloatParams() : wide(false) {}
        ///
        void write(std::ostream & os) const;
        ///
@@ -46,10 +44,8 @@ public:
        InsetFloat(InsetFloat const &, bool same_id = false);
        ///
        ~InsetFloat();
-
        ///
        virtual dispatch_result localDispatch(FuncRequest const & cmd); 
-
        ///
        void write(Buffer const * buf, std::ostream & os) const;
        ///
@@ -73,16 +69,8 @@ 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;
@@ -103,7 +91,7 @@ public:
        ///
        InsetFloatMailer(InsetFloat & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
        virtual string const & name() const { return name_; }
        ///
@@ -111,11 +99,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_;
 };