Make members of FuncRequest private, per the FIXME there. Again, this is

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

diff --git a/src/insets/InsetVSpace.h b/src/insets/InsetVSpace.h
index faf8095639bb3206b238b5162e0e03fceca1ea1e..2cac05ed718b49d5a9bb3cb536beeffef958a6cb 100644 (file)
--- a/src/insets/InsetVSpace.h
+++ b/src/insets/InsetVSpace.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,22 +12,32 @@
 #ifndef INSET_VSPACE_H
 #define INSET_VSPACE_H
 
-
 #include "Inset.h"
 #include "VSpace.h"
-#include "MailInset.h"
 
 
 namespace lyx {
 
-class InsetVSpace : public Inset {
+class InsetVSpace : public Inset
+{
 public:
        ///
-       InsetVSpace() {}
+       InsetVSpace() : Inset(0) {}
        ///
        InsetVSpace(VSpace const &);
+       /// How much?
+       VSpace const & space() const { return space_; }
+       ///
+       InsetCode lyxCode() const { return VSPACE_CODE; }
        ///
-       ~InsetVSpace();
+       bool hasSettings() const { return true; }
+       ///
+       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       ///
+       static void string2params(std::string const &, VSpace &);
+       ///
+       static std::string params2string(VSpace const &);
+private:
        ///
        void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
@@ -38,21 +48,24 @@ public:
        int plaintext(odocstream &, OutputParams const &) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
+       /// Note that this returns the inset rather than writing it,
+       /// so it will actually be written after the present paragraph.
+       /// The normal case is that this inset will be on a line by
+       /// itself, and in that case the present paragraph will not,
+       /// in fact, appear at all.
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
        void read(Lexer & lex);
        ///
        void write(std::ostream & os) const;
        ///
        DisplayType display() const { return AlignCenter; }
-       /// How much?
-       VSpace const & space() const { return space_; }
-
-protected:
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
-
-private:
-       virtual Inset * clone() const;
+       ///
+       bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
+       ///
+       Inset * clone() const { return new InsetVSpace(*this); }
        ///
        docstring const label() const;
 
@@ -61,28 +74,6 @@ private:
 };
 
 
-class InsetVSpaceMailer : public MailInset {
-public:
-       ///
-       InsetVSpaceMailer(InsetVSpace & inset);
-       ///
-       virtual Inset & inset() const { return inset_; }
-       ///
-       virtual std::string const & name() const { return name_; }
-       ///
-       virtual std::string const inset2string(Buffer const &) const;
-       ///
-       static void string2params(std::string const &, VSpace &);
-       ///
-       static std::string const params2string(VSpace const &);
-private:
-       ///
-       static std::string const name_;
-       ///
-       InsetVSpace & inset_;
-};
-
-
 } // namespace lyx
 
 #endif