This should be the last of the commits refactoring the InsetLayout code.

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

diff --git a/src/insets/InsetVSpace.h b/src/insets/InsetVSpace.h
index 7f0a4d8c67119c74c5c3acea5003cc2a5a107866..7d511d9b223638c82201567548b4efd0c143c081 100644 (file)
--- a/src/insets/InsetVSpace.h
+++ b/src/insets/InsetVSpace.h
@@ -20,7 +20,7 @@
 
 namespace lyx {
 
-class InsetVSpace : public InsetOld {
+class InsetVSpace : public Inset {
 public:
        ///
        InsetVSpace() {}
@@ -29,24 +29,24 @@ public:
        ///
        ~InsetVSpace();
        ///
-       bool metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
        int latex(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+                 OutputParams const &) const;
        ///
        int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const;
+                     OutputParams const &) const;
        ///
        int docbook(Buffer const &, odocstream &,
-                   OutputParams const &) const;
+                   OutputParams const &) const;
        ///
        void read(Buffer const &, Lexer & lex);
        ///
        void write(Buffer const & buf, std::ostream & os) const;
        ///
-       bool display() const { return true; }
+       DisplayType display() const { return AlignCenter; }
        /// How much?
        VSpace const & space() const { return space_; }
 
@@ -55,7 +55,7 @@ protected:
        virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 
 private:
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual Inset * clone() const;
        ///
        docstring const label() const;
 
@@ -69,7 +69,7 @@ public:
        ///
        InsetVSpaceMailer(InsetVSpace & inset);
        ///
-       virtual InsetBase & inset() const { return inset_; }
+       virtual Inset & inset() const { return inset_; }
        ///
        virtual std::string const & name() const { return name_; }
        ///