Comment.

[lyx.git] / src / Paragraph.h

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 6597d0b0fb63baa36fa289242d17fa211d2bfb24..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;
 
 
@@ -153,11 +153,11 @@ public:
        bool empty() const;
 
        ///
-       LayoutPtr const & layout() const;
+       Layout const & layout() const;
+       /// Do not pass a temporary to this!
+       void setLayout(Layout const & layout);
        ///
-       void setLayout(LayoutPtr 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;
@@ -210,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;
@@ -219,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);
@@ -365,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();