X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.h;h=7761c5ff683b54cc31510a52467b01464da2017f;hb=9337d73f1f9a6d4dae2e239e9f679a7452660c40;hp=d9d8be5873cc060c30f65441fc6001142d008c87;hpb=cd63c1380ba90bd0074a29cd342b2810498a0f53;p=lyx.git

diff --git a/src/Paragraph.h b/src/Paragraph.h
index d9d8be5873..7761c5ff68 100644
--- 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"
 
@@ -153,9 +153,9 @@ 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(DocumentClass const & tc);
 
@@ -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);