Inset::addToToc(): change signature. Use DocIterator instead of ParConstIterator...

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

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 94b3baebc21730523bc0cd168d2ffab3cee5e25a..afb874a442cf3674ad1869b9b77a281cc6f2a781 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -17,19 +17,17 @@
 #include "ColorCode.h"
 #include "Text.h"
 
-#include "support/types.h"
-
 namespace lyx {
 
 class Buffer;
 class BufferParams;
 class BufferView;
+class CompletionList;
 class CursorSlice;
 class Dimension;
 class ParagraphList;
 class InsetTabular;
 
-
 /**
  A text inset is like a TeX box to write full text
  (including styles and other insets) in a given space.
@@ -37,11 +35,13 @@ class InsetTabular;
 class InsetText : public Inset {
 public:
        ///
-       explicit InsetText(BufferParams const &);
+       explicit InsetText(Buffer const & buffer);
        ///
        InsetText();
        ///
        InsetText(InsetText const &);
+       ///
+       void initParagraphs(Buffer const & buffer);
 
        ///
        Dimension const dimension(BufferView const &) const;
@@ -49,15 +49,15 @@ public:
        /// empty inset to empty par
        void clear();
        ///
-       void read(Buffer const & buf, Lexer & lex);
+       void read(Lexer & lex);
        ///
-       void write(Buffer const & buf, std::ostream & os) const;
+       void write(std::ostream & os) const;
        ///
        void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
-       virtual docstring const editMessage() const;
+       docstring editMessage() const;
        ///
        EDITABLE editable() const { return HIGHLY_EDITABLE; }
        ///
@@ -67,11 +67,11 @@ public:
        ///
        InsetText const * asInsetText() const { return this; }
        ///
-       int latex(Buffer const &, odocstream &, OutputParams const &) const;
+       int latex(odocstream &, OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
+       int plaintext(odocstream &, OutputParams const &) const;
        ///
-       int docbook(Buffer const &, odocstream &, OutputParams const &) const;
+       int docbook(odocstream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures & features) const;
 
@@ -109,7 +109,7 @@ public:
        void rejectChanges(BufferParams const & bparams);
 
        /// append text onto the existing text
-       void appendParagraphs(Buffer * bp, ParagraphList &);
+       void appendParagraphs(ParagraphList &);
 
        ///
        void addPreview(graphics::PreviewLoader &) const;
@@ -129,17 +129,17 @@ public:
        bool insetAllowed(InsetCode) const { return true; }
        ///
        bool allowSpellCheck() const { return true; }
-       /// should paragraph indendation be ommitted in any case?
-       bool neverIndent(Buffer const &) const;
        ///
-       virtual bool isMacroScope(Buffer const &) const { return true; }
+       virtual bool isMacroScope() const { return false; }
        ///
        virtual bool allowMultiPar() const { return true; }
 
        // Update the counters of this inset and of its contents
-       virtual void updateLabels(Buffer const &, ParIterator const &);
+       void updateLabels(ParIterator const &);
+       ///
+       Inset * clone() const { return new InsetText(*this); }
        ///
-       virtual Inset * clone() const;
+       bool notifyCursorLeaves(Cursor const & old, Cursor & cur);
 
        ///
        bool completionSupported(Cursor const &) const;
@@ -150,7 +150,9 @@ public:
        ///
        bool automaticPopupCompletion() const;
        ///
-       CompletionListPtr completionList(Cursor const & cur) const;
+       bool showCompletionCursor() const;
+       ///
+       CompletionList const * createCompletionList(Cursor const & cur) const;
        ///
        docstring completionPrefix(Cursor const & cur) const;
        ///
@@ -158,10 +160,10 @@ public:
        ///
        void completionPosAndDim(Cursor const &, int & x, int & y, Dimension & dim) const;
 
-protected:
        ///
-       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
-
+       virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+       ///
+       void doDispatch(Cursor & cur, FuncRequest & cmd);
 private:
        ///
        void setParagraphOwner();
@@ -171,8 +173,6 @@ private:
        ColorCode frame_color_;
        ///
        mutable pit_type old_pit;
-       ///
-       docstring previousWord(Buffer const & buffer, CursorSlice const & sl) const;
 
 public:
        ///