Move isMultiCell() to Cursor, and use it.

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

diff --git a/src/insets/InsetNewline.h b/src/insets/InsetNewline.h
index 50a08face72a839fb31cf4bd139afe6ae4ebc538..fc7684ab73a4afcd0b80b0a8e134f1cc3f6f2e4c 100644 (file)
--- a/src/insets/InsetNewline.h
+++ b/src/insets/InsetNewline.h
@@ -13,15 +13,12 @@
 #define INSET_NEWLINE_H
 
 #include "Inset.h"
-#include "MailInset.h"
-
-#include "support/docstring.h"
-#include "support/gettext.h"
 
 
 namespace lyx {
 
-class InsetNewlineParams {
+class InsetNewlineParams
+{
 public:
        /// The different kinds of spaces we support
        enum Kind {
@@ -48,6 +45,11 @@ public:
        InsetNewline();
        ///
        InsetNewline(InsetNewlineParams par) { params_.kind = par.kind; }
+       ///
+       static void string2params(std::string const &, InsetNewlineParams &);
+       ///
+       static std::string params2string(InsetNewlineParams const &);
+private:
        ///
        InsetNewlineParams params() const { return params_; }
        ///
@@ -72,39 +74,16 @@ public:
        ///
        ColorCode ColorName() const;
        ///
-       virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
-
-private:
+       docstring contextMenu(BufferView const & bv, int x, int y) const;
        ///
        Inset * clone() const { return new InsetNewline(*this); }
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
        bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
-       ///
-       InsetNewlineParams params_;
-};
-
 
-class InsetNewlineMailer : public MailInset {
-public:
-       ///
-       InsetNewlineMailer(InsetNewline & 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 &, InsetNewlineParams &);
-       ///
-       static std::string const params2string(InsetNewlineParams const &);
-private:
-       ///
-       static std::string const name_;
-       ///
-       InsetNewline & inset_;
+       InsetNewlineParams params_;
 };