Loop refactoring

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

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index 24f9a66542e94149778bbb1e06044c51274b432e..aeab8f038b282084ec43a7636b4ffacfd500efb0 100644 (file)
--- a/src/insets/InsetNote.h
+++ b/src/insets/InsetNote.h
@@ -12,7 +12,7 @@
 #ifndef INSET_NOTE_H
 #define INSET_NOTE_H
 
-#include "InsetCollapsable.h"
+#include "InsetCollapsible.h"
 
 
 namespace lyx {
@@ -43,7 +43,7 @@ public:
 /////////////////////////////////////////////////////////////////////////
 
 /// The PostIt note inset, and other annotations
-class InsetNote : public InsetCollapsable
+class InsetNote : public InsetCollapsible
 {
 public:
        ///
@@ -58,48 +58,49 @@ public:
        InsetNoteParams const & params() const { return params_; }
 private:
        ///
-       InsetCode lyxCode() const { return NOTE_CODE; }
+       InsetCode lyxCode() const override { return NOTE_CODE; }
        ///
-       docstring name() const;
-       ///
-       DisplayType display() const;
-       ///
-       bool noFontChange() const { return params_.type != InsetNoteParams::Note; }
+       docstring layoutName() const override;
+       /** returns false if, when outputting LaTeX, font changes should
+           be closed before generating this inset. This is needed for
+           insets that may contain several paragraphs */
+       bool inheritFont() const override { return params_.type == InsetNoteParams::Note; }
        /// Is the content of this inset part of the output document?
-       bool producesOutput() const
+       bool producesOutput() const override
                { return params_.type == InsetNoteParams::Greyedout; }
        ///
-       bool allowSpellCheck() const;
+       bool allowSpellCheck() const override;
        ///
-       void write(std::ostream &) const;
+       FontInfo getFont() const override;
        ///
-       void read(Lexer & lex);
-       /// show the note dialog
-       bool showInsetDialog(BufferView * bv) const;
+       void write(std::ostream &) const override;
        ///
-       bool isMacroScope() const;
+       void read(Lexer & lex) override;
+       /// show the note dialog
+       bool showInsetDialog(BufferView * bv) const override;
        ///
-       void latex(otexstream &, OutputParams const &) const;
+       bool isMacroScope() const override;
        ///
-       int plaintext(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const override;
        ///
-       int docbook(odocstream &, OutputParams const &) const;
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const override;
        ///
-       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       void docbook(XMLStream &, OutputParams const &) const override;
        ///
-       void validate(LaTeXFeatures &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const override;
        ///
-       bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
+       void validate(LaTeXFeatures &) const override;
        ///
-       void addToToc(DocIterator const &) const;
+       bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const override;
        ///
-       void doDispatch(Cursor & cur, FuncRequest & cmd);
+       void doDispatch(Cursor & cur, FuncRequest & cmd) override;
        ///
-       Inset * clone() const { return new InsetNote(*this); }
+       Inset * clone() const override { return new InsetNote(*this); }
        /// used by the constructors
        void init();
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const override;
        ///
        friend class InsetNoteParams;