Comment.

[lyx.git] / src / Paragraph.h

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 03e88d51d8d3dcd08463f08f5785e0a6d25e8cbf..7761c5ff683b54cc31510a52467b01464da2017f 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -17,7 +17,7 @@
 #define PARAGRAPH_H
 
 #include "FontEnums.h"
-#include "LayoutPtr.h"
+#include "Layout.h"
 
 #include "insets/InsetCode.h"
 
@@ -33,6 +33,7 @@ class Change;
 class Counters;
 class Cursor;
 class CursorSlice;
+class DocumentClass;
 class Inset;
 class InsetBibitem;
 class LaTeXFeatures;
@@ -45,7 +46,6 @@ class MetricsInfo;
 class OutputParams;
 class PainterInfo;
 class ParagraphParameters;
-class TextClass;
 class TexRow;
 
 
@@ -97,36 +97,30 @@ public:
        ///
        bool isMultiLingual(BufferParams const &) const;
 
+       /// Convert the paragraph to a string.
+       /// Used for building the table of contents
+       docstring asString(bool label) const;
        ///
-       docstring const asString(Buffer const &, bool label) const;
-       ///
-       docstring const asString(Buffer const & buffer,
-                                  pos_type beg,
-                                  pos_type end,
-                                  bool label) const;
+       docstring asString(pos_type beg, pos_type end, bool label) const;
 
        ///
-       void write(Buffer const &, std::ostream &, BufferParams const &,
+       void write(std::ostream &, BufferParams const &,
                   depth_type & depth) const;
        ///
        void validate(LaTeXFeatures &) const;
 
        ///
-       bool latex(Buffer const &, BufferParams const &,
-                            Font const & outerfont, odocstream &,
-                            TexRow & texrow, OutputParams const &) const;
+       bool latex(BufferParams const &, Font const & outerfont, odocstream &,
+               TexRow & texrow, OutputParams const &) const;
 
        /// Can we drop the standard paragraph wrapper?
        bool emptyTag() const;
 
        /// Get the id of the paragraph, usefull for docbook
-       std::string getID(Buffer const & buf,
-                         OutputParams const & runparams) const;
+       std::string getID(Buffer const & buf, OutputParams const & runparams) const;
 
        /// Get the first word of a paragraph, return the position where it left
-       pos_type getFirstWord(Buffer const & buf,
-                                  odocstream & os,
-                                  OutputParams const & runparams) const;
+       pos_type firstWord(odocstream & os, OutputParams const & runparams) const;
 
        /// Writes to stream the docbook representation
        void simpleDocBookOnePar(Buffer const & buf,
@@ -159,11 +153,11 @@ public:
        bool empty() const;
 
        ///
-       LayoutPtr const & layout() const;
-       ///
-       void setLayout(LayoutPtr const & layout);
+       Layout const & layout() const;
+       /// Do not pass a temporary to this!
+       void setLayout(Layout const & layout);
        ///
-       void setEmptyOrDefaultLayout(TextClass const & tc);
+       void setEmptyOrDefaultLayout(DocumentClass const & tc);
 
        /// This is the item depth, only used by enumerate and itemize
        signed char itemdepth;
@@ -216,7 +210,7 @@ public:
        docstring const translateIfPossible(docstring const & label,
                BufferParams const & bparams) const;
        /// Expand the counters for the labelstring of \c layout
-       docstring expandLabel(LayoutPtr const &, BufferParams const &,
+       docstring expandLabel(Layout const &, BufferParams const &,
                bool process_appendix = true) const;
        /// Actual paragraph alignment used
        char getAlign() const;
@@ -225,7 +219,7 @@ public:
        /// The maximal possible depth of a paragraph after this one
        depth_type getMaxDepthAfter() const;
        ///
-       void applyLayout(LayoutPtr const & new_layout);
+       void applyLayout(Layout const & new_layout);
 
        /// (logically) erase the char at pos; return true if it was actually erased
        bool eraseChar(pos_type pos, bool trackChanges);
@@ -350,7 +344,7 @@ public:
        /// an inset, in which case pos is the position from which the inset
        /// was deleted, and the cursor will need to be moved back one if it
        /// was previously past that position. Return 0 otherwise.
-       int checkBiblio(bool track_changes);
+       int checkBiblio(Buffer const & buffer);
 
        /// For each author, set 'used' to true if there is a change
        /// by this author in the paragraph.
@@ -371,13 +365,13 @@ public:
                bool del = true) const;
        
        ///
-       void updateWords(Buffer const & buf, CursorSlice const & sl);
+       void updateWords(CursorSlice const & sl);
 
 private:
        ///
        void deregisterWords();
        ///
-       void collectWords(Buffer const & buf, CursorSlice const & sl);
+       void collectWords(CursorSlice const & sl);
        ///
        void registerWords();