Change string

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

diff --git a/src/insets/InsetVSpace.h b/src/insets/InsetVSpace.h
index 3614846779e65f244a1527387fdc44983acfdfa3..27ce8c14acde187bb091b6f4b7d2424d893b3278 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() {}
@@ -28,34 +28,29 @@ public:
        InsetVSpace(VSpace const &);
        ///
        ~InsetVSpace();
+       /// How much?
+       VSpace const & space() const { return space_; }
+private:
        ///
-       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;
+       int latex(odocstream &, OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const;
+       int plaintext(odocstream &, OutputParams const &) const;
        ///
-       int docbook(Buffer const &, odocstream &,
-                   OutputParams const &) const;
+       int docbook(odocstream &, OutputParams const &) const;
        ///
-       void read(Buffer const &, Lexer & lex);
+       void read(Lexer & lex);
        ///
-       void write(Buffer const & buf, std::ostream & os) const;
+       void write(std::ostream & os) const;
        ///
-       bool display() const { return true; }
-       /// How much?
-       VSpace const & space() const { return space_; }
-
-protected:
+       DisplayType display() const { return AlignCenter; }
        ///
-       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
-
-private:
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       void doDispatch(Cursor & cur, FuncRequest & cmd);
+       ///
+       Inset * clone() const { return new InsetVSpace(*this); }
        ///
        docstring const label() const;
 
@@ -69,7 +64,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_; }
        ///