ws changes only

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index f668965f1bd31cfa6af515cec0beb8ee0d6be54c..3c6fddddb4ba365ba4ebbb61216d463af4291df3 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -16,29 +16,28 @@
 #ifndef PARAGRAPH_H
 #define PARAGRAPH_H
 
-#include "lyxlayout_ptr_fwd.h"
-#include "lyxfont.h" // Just for LyXFont::FONT_SIZE
+#include "changes.h"
 #include "InsetList.h"
-
-#include "insets/inset.h" // Just for InsetOld::Code
+#include "lyxlayout_ptr_fwd.h"
+#include "RowList_fwd.h"
 
 #include "support/types.h"
-#include "changes.h"
-#include "RowList.h"
 
-#include "LString.h"
+#include <string>
 
 class Buffer;
 class BufferParams;
 class BufferView;
 class Counters;
 class InsetBibitem;
+class InsetOld_code;
 class Language;
 class LaTeXFeatures;
 class LatexRunParams;
+class LyXFont;
+class LyXFont_size;
 class ParagraphParameters;
 class TexRow;
-class ParagraphList;
 class UpdatableInset;
 
 /// A Paragraph holds all text, attributes and insets in a text paragraph
@@ -55,8 +54,10 @@ public:
        };
        ///
        typedef char value_type;
-       /// The same as ParameterStruct::depth_type
-       typedef unsigned int depth_type;
+       ///
+       typedef lyx::depth_type depth_type;
+       ///
+       typedef std::vector<value_type> TextContainer;
 
        ///
        Paragraph();
@@ -79,14 +80,14 @@ public:
        bool isMultiLingual(BufferParams const &);
 
        ///
-       string const asString(Buffer const *, bool label) const;
+       std::string const asString(Buffer const &, bool label) const;
        ///
-       string const asString(Buffer const *, lyx::pos_type beg, lyx::pos_type end,
+       std::string const asString(Buffer const &, lyx::pos_type beg, lyx::pos_type end,
                              bool label) const;
 
        ///
-       void write(Buffer const *, std::ostream &, BufferParams const &,
-                      depth_type & depth) const;
+       void write(Buffer const &, std::ostream &, BufferParams const &,
+                  depth_type & depth) const;
        ///
        void validate(LaTeXFeatures &) const;
 
@@ -103,7 +104,7 @@ public:
 
 
        ///
-       bool simpleTeXOnePar(Buffer const *, BufferParams const &,
+       bool simpleTeXOnePar(Buffer const &, BufferParams const &,
                             LyXFont const & outerfont, std::ostream &,
                             TexRow & texrow, LatexRunParams const &);
 
@@ -121,9 +122,9 @@ public:
        void deleteInsetsLyXText(BufferView *);
 
        ///
-       lyx::pos_type size() const;
+       lyx::pos_type size() const { return text_.size(); }
        ///
-       bool empty() const;
+       bool empty() const { return text_.empty(); }
        ///
        void setContentsFromPar(Paragraph const & par);
        ///
@@ -134,11 +135,8 @@ public:
        ///
        void layout(LyXLayout_ptr const & new_layout);
 
-       ///
-       char enumdepth;
-
-       ///
-       char itemdepth;
+       /// This is the item depth, only used by enumerate and itemize
+       signed char itemdepth;
 
        ///
        InsetBibitem * bibitem() const;  // ale970302
@@ -184,12 +182,12 @@ public:
        int beginningOfBody() const;
 
        ///
-       string const & getLabelstring() const;
+       std::string const & getLabelstring() const;
 
        /// the next two functions are for the manual labels
-       string const getLabelWidthString() const;
+       std::string const getLabelWidthString() const;
        ///
-       void setLabelWidthString(string const & s);
+       void setLabelWidthString(std::string const & s);
        ///
        char getAlign() const;
        /// The nesting depth of a paragraph
@@ -244,10 +242,9 @@ public:
        /// pos <= size() (there is a dummy font change at the end of each par)
        void setFont(lyx::pos_type pos, LyXFont const & font);
        /// Returns the height of the highest font in range
-       LyXFont::FONT_SIZE
-       highestFontInRange(lyx::pos_type startpos,
-                          lyx::pos_type endpos,
-                          LyXFont::FONT_SIZE const def_size) const;
+       LyXFont_size highestFontInRange(lyx::pos_type startpos,
+                                       lyx::pos_type endpos,
+                                       LyXFont_size def_size) const;
        ///
        void insertChar(lyx::pos_type pos, value_type c);
        ///
@@ -259,7 +256,7 @@ public:
        ///
        void insertInset(lyx::pos_type pos, InsetOld * inset, LyXFont const &, Change change = Change(Change::INSERTED));
        ///
-       bool insetAllowed(InsetOld::Code code);
+       bool insetAllowed(InsetOld_code code);
        ///
        InsetOld * getInset(lyx::pos_type pos);
        ///
@@ -309,6 +306,9 @@ public:
 private:
        ///
        LyXLayout_ptr layout_;
+       /// keeping this here instead of in the pimpl makes LyX >10% faster
+       // for average tasks as buffer loading/switching etc.
+       TextContainer text_;
 
        struct Pimpl;
        ///