* do not ignore "requires" field in MathMacro

[lyx.git] / src / Paragraph.h

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 85d58939fee3f41039ebe68bb7591105ad75ef0b..3a39620c85adae7c39cdd73479413f67256002ad 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -20,7 +20,7 @@
 #include "Dimension.h"
 #include "InsetList.h"
 #include "lyxlayout_ptr_fwd.h"
-#include "RowList_fwd.h"
+#include "Row.h"
 
 #include "insets/Inset.h" // only for Inset::Code
 
@@ -172,9 +172,9 @@ public:
        bool empty() const { return text_.empty(); }
 
        ///
-       LyXLayout_ptr const & layout() const;
+       Layout_ptr const & layout() const;
        ///
-       void layout(LyXLayout_ptr const & new_layout);
+       void layout(Layout_ptr const & new_layout);
 
        /// This is the item depth, only used by enumerate and itemize
        signed char itemdepth;
@@ -236,7 +236,7 @@ public:
        docstring const translateIfPossible(docstring const & label,
                BufferParams const & bparams) const;
        /// Expand the counters for the labelstring of \c layout
-       docstring expandLabel(LyXLayout_ptr const &, BufferParams const &,
+       docstring expandLabel(Layout_ptr const &, BufferParams const &,
                bool process_appendix = true) const;
        /// Actual paragraph alignment used
        char getAlign() const;
@@ -245,7 +245,7 @@ public:
        /// The maximal possible depth of a paragraph after this one
        depth_type getMaxDepthAfter() const;
        ///
-       void applyLayout(LyXLayout_ptr const & new_layout);
+       void applyLayout(Layout_ptr const & new_layout);
 
        /// (logically) erase the char at pos; return true if it was actually erased
        bool eraseChar(pos_type pos, bool trackChanges);
@@ -370,7 +370,7 @@ public:
 private:
 
        ///
-       LyXLayout_ptr layout_;
+       Layout_ptr layout_;
        /**
         * Keeping this here instead of in the pimpl makes LyX >10% faster
         * for average tasks as buffer loading/switching etc.