X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.h;h=ee61d83bcbbedc97c496b442eae0764c21af0822;hb=2417d9d911dbca181c48f45d1aad26d31c9aa815;hp=8fd17c2897dacdda25679b6a518fcfba14e0d380;hpb=7f74d469a4ae7141afefeb1f49f817ad6a576a0a;p=lyx.git

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 8fd17c2897..ee61d83bcb 100644
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -17,10 +17,8 @@
 #define PARAGRAPH_H
 
 #include "Changes.h"
-#include "Dimension.h"
 #include "InsetList.h"
 #include "lyxlayout_ptr_fwd.h"
-#include "Row.h"
 
 #include "insets/Inset.h" // only for Inset::Code
 
@@ -93,7 +91,7 @@ public:
 	///
 	Language const * getParLanguage(BufferParams const &) const;
 	///
-	bool isRightToLeftPar(BufferParams const &) const;
+	bool isRTL(BufferParams const &) const;
 	///
 	void changeLanguage(BufferParams const & bparams,
 			    Language const * from, Language const * to);
@@ -172,9 +170,9 @@ public:
 	bool empty() const { return text_.empty(); }
 
 	///
-	Layout_ptr const & layout() const;
+	LayoutPtr const & layout() const;
 	///
-	void layout(Layout_ptr const & new_layout);
+	void layout(LayoutPtr const & new_layout);
 
 	/// This is the item depth, only used by enumerate and itemize
 	signed char itemdepth;
@@ -236,7 +234,7 @@ public:
 	docstring const translateIfPossible(docstring const & label,
 		BufferParams const & bparams) const;
 	/// Expand the counters for the labelstring of \c layout
-	docstring expandLabel(Layout_ptr const &, BufferParams const &,
+	docstring expandLabel(LayoutPtr const &, BufferParams const &,
 		bool process_appendix = true) const;
 	/// Actual paragraph alignment used
 	char getAlign() const;
@@ -245,7 +243,7 @@ public:
 	/// The maximal possible depth of a paragraph after this one
 	depth_type getMaxDepthAfter() const;
 	///
-	void applyLayout(Layout_ptr const & new_layout);
+	void applyLayout(LayoutPtr const & new_layout);
 
 	/// (logically) erase the char at pos; return true if it was actually erased
 	bool eraseChar(pos_type pos, bool trackChanges);
@@ -356,8 +354,6 @@ public:
 	ParagraphParameters & params();
 	///
 	ParagraphParameters const & params() const;
-	///
-	bool hfillExpansion(Row const & row, pos_type pos) const;
 
 	/// Check if we are in a Biblio environment and insert or
 	/// delete InsetBibitems as necessary.
@@ -379,7 +375,7 @@ public:
 private:
 
 	///
-	Layout_ptr layout_;
+	LayoutPtr layout_;
 	/**
 	 * Keeping this here instead of in the pimpl makes LyX >10% faster
 	 * for average tasks as buffer loading/switching etc.