X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetSpace.h;h=0b1bd7bfe513c9364ce64d3c34ac2da1f6fc7011;hb=8124e6c02ea1fd6779bb6c47ffe2bca2c8bd2d97;hp=65b1dc6ac4ed0c9b473a69fdb130c3c8c3db8f24;hpb=3fea3b00968f9b02f487952c9a23614baed7d48c;p=lyx.git diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h index 65b1dc6ac4..0b1bd7bfe5 100644 --- a/src/insets/InsetSpace.h +++ b/src/insets/InsetSpace.h @@ -16,7 +16,8 @@ #define INSET_SPACE_H #include "Inset.h" -#include "Length.h" + +#include "support/Length.h" namespace lyx { @@ -98,7 +99,7 @@ public: /// InsetSpace() : Inset(0) {} /// - explicit InsetSpace(InsetSpaceParams const & par); + explicit InsetSpace(InsetSpaceParams const & params); /// InsetSpaceParams const & params() const { return params_; } /// @@ -112,57 +113,59 @@ public: GlueLength length() const; /// - docstring toolTip(BufferView const & bv, int x, int y) const; + docstring toolTip(BufferView const & bv, int x, int y) const override; /// unprotected spaces allow line breaking after them - RowFlags rowFlags() const; + int rowFlags() const override; /// - void metrics(MetricsInfo &, Dimension &) const; + void metrics(MetricsInfo &, Dimension &) const override; /// - void draw(PainterInfo & pi, int x, int y) const; + void draw(PainterInfo & pi, int x, int y) const override; /// - void write(std::ostream &) const; + void write(std::ostream &) const override; /// Will not be used when lyxf3 - void read(Lexer & lex); + void read(Lexer & lex) override; /// - void latex(otexstream &, OutputParams const &) const; + void latex(otexstream &, OutputParams const &) const override; /// int plaintext(odocstringstream & ods, OutputParams const & op, - size_t max_length = INT_MAX) const; + size_t max_length = INT_MAX) const override; + /// + void docbook(XMLStream &, OutputParams const &) const override; /// - int docbook(odocstream &, OutputParams const &) const; + docstring xhtml(XMLStream &, OutputParams const &) const override; /// - docstring xhtml(XMLStream &, OutputParams const &) const; + void validate(LaTeXFeatures & features) const override; /// - void validate(LaTeXFeatures & features) const; + bool hasToString() const override { return true; } /// - void toString(odocstream &) const; + void toString(odocstream &) const override; /// - void forOutliner(docstring &, size_t const, bool const) const; + void forOutliner(docstring &, size_t const, bool const) const override; /// - bool hasSettings() const { return true; } + bool hasSettings() const override { return true; } /// - bool clickable(BufferView const &, int, int) const { return true; } + bool clickable(BufferView const &, int, int) const override { return true; } /// - InsetCode lyxCode() const { return SPACE_CODE; } + InsetCode lyxCode() const override { return SPACE_CODE; } /// does this inset try to use all available space (like \\hfill does)? - bool isHfill() const; + bool isHfill() const override; /// should this inset be handled like a normal character? - bool isChar() const { return true; } + bool isChar() const override { return true; } /// is this equivalent to a letter? - bool isLetter() const { return false; } + bool isLetter() const override { return false; } /// is this equivalent to a space (which is BTW different from // a line separator)? - bool isSpace() const { return true; } + bool isSpace() const override { return true; } /// - std::string contextMenuName() const; + std::string contextMenuName() const override; protected: /// - Inset * clone() const { return new InsetSpace(*this); } + Inset * clone() const override { return new InsetSpace(*this); } /// - void doDispatch(Cursor & cur, FuncRequest & cmd); + void doDispatch(Cursor & cur, FuncRequest & cmd) override; public: /// - bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const; + bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const override; private: ///