adjust

[lyx.git] / src / Paragraph.h

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 8fd17c2897dacdda25679b6a518fcfba14e0d380..9059e2963afab2bddcc2f7721971a2d6bcbb2bc2 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -17,12 +17,10 @@
 #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
+#include "insets/InsetCode.h"
 
 
 namespace lyx {
@@ -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);
@@ -162,7 +160,7 @@ public:
        ///
        Inset * inInset() const;
        ///
-       Inset::Code ownerCode() const;
+       InsetCode ownerCode() const;
        ///
        bool forceDefaultParagraphs() const;
 
@@ -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);
@@ -309,7 +307,7 @@ public:
        void insertInset(pos_type pos, Inset * inset,
                         Font const &, Change const & change);
        ///
-       bool insetAllowed(Inset_code code);
+       bool insetAllowed(InsetCode code);
        ///
        Inset * getInset(pos_type pos) {
                return insetlist.get(pos);
@@ -320,10 +318,8 @@ public:
        }
 
        ///
-       bool isHfill(pos_type pos) const {
-               return isInset(pos)
-                      && getInset(pos)->lyxCode() == Inset::HFILL_CODE;
-       }
+       bool isHfill(pos_type pos) const;
+
        /// hinted by profiler
        bool isInset(pos_type pos) const {
                return getChar(pos) == static_cast<value_type>(META_INSET);
@@ -356,8 +352,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 +373,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.