Move <algorithm> from DocIterator.h

[lyx.git] / src / mathed / InsetMathSpace.h

diff --git a/src/mathed/InsetMathSpace.h b/src/mathed/InsetMathSpace.h
index 15b79d2b58d2086bb47d17937a5d02b14103f501..ff23305466f92f09d3954c120ac3cbb9b3338ef4 100644 (file)
--- a/src/mathed/InsetMathSpace.h
+++ b/src/mathed/InsetMathSpace.h
@@ -13,11 +13,13 @@
 #define MATH_SPACEINSET_H
 
 #include "InsetMath.h"
-#include "Length.h"
+
+#include "support/Length.h"
 
 
 namespace lyx {
 
+struct InsetSpaceParams;
 
 /// Smart spaces
 class InsetMathSpace : public InsetMath {
@@ -27,45 +29,50 @@ public:
        ///
        explicit InsetMathSpace(std::string const & name, std::string const & length);
        ///
-       explicit InsetMathSpace(Length const & length);
-       ///
-       ~InsetMathSpace();
+       explicit InsetMathSpace(Length const & length, bool const prot = false);
        ///
-       InsetMathSpace const * asSpaceInset() const { return this; }
+       InsetMathSpace const * asSpaceInset() const override { return this; }
        ///
-       InsetMathSpace * asSpaceInset() { return this; }
+       InsetMathSpace * asSpaceInset() override { return this; }
        ///
        void incSpace();
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
-       void draw(PainterInfo & pi, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const override;
 
        ///
-       void normalize(NormalStream &) const;
+       void normalize(NormalStream &) const override;
+       ///
+       void validate(LaTeXFeatures & features) const override;
        ///
-       void validate(LaTeXFeatures & features) const;
+       void maple(MapleStream &) const override;
        ///
-       void maple(MapleStream &) const;
+       void mathematica(MathematicaStream &) const override;
        ///
-       void mathematica(MathematicaStream &) const;
+       void octave(OctaveStream &) const override;
        ///
-       void octave(OctaveStream &) const;
+       void mathmlize(MathStream & ms) const override;
        ///
-       void write(WriteStream & os) const;
+       void htmlize(HtmlStream & ms) const override;
+       ///
+       void write(WriteStream & os) const override;
        /// generate something that will be understood by the Dialogs.
-       std::string const createDialogStr() const;
+       InsetSpaceParams params() const;
+       ///
+       bool hasSettings() const override { return true; }
        ///
-       EDITABLE editable() const { return IS_EDITABLE; }
+       std::string contextMenuName() const override;
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const override;
        ///
-       bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
+       InsetCode lyxCode() const override { return MATH_SPACE_CODE; }
+
 protected:
        ///
-       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
+       void doDispatch(Cursor & cur, FuncRequest & cmd) override;
 private:
-       virtual Inset * clone() const;
+       Inset * clone() const override;
        ///
        bool isNegative() const;
        ///