Change to use preffered calling of Boost.Function

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index ec25e1522247d39b6abde23a6ec5d3c158397df1..ded4888a9558c8e8e032b5ed3ccf2a7a9b25f8d6 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -25,6 +25,8 @@
 
 #include "support/types.h"
 
+#include <boost/assert.hpp>
+
 #include <string>
 
 class Buffer;
@@ -118,7 +120,7 @@ public:
        ///
        bool simpleTeXOnePar(Buffer const &, BufferParams const &,
                             LyXFont const & outerfont, std::ostream &,
-                            TexRow & texrow, OutputParams const &);
+                            TexRow & texrow, OutputParams const &) const;
 
        ///
        void simpleLinuxDocOnePar(Buffer const & buf,
@@ -269,7 +271,13 @@ public:
         */
        lyx::pos_type getEndPosOfFontSpan(lyx::pos_type pos) const;
        ///
-       value_type getChar(lyx::pos_type pos) const;
+       /// this is a bottleneck.
+       value_type getChar(lyx::pos_type pos) const
+       {
+               BOOST_ASSERT(pos >= 0);
+               BOOST_ASSERT(pos < int(text_.size()));
+               return text_[pos];
+       }
        ///
        value_type getUChar(BufferParams const &, lyx::pos_type pos) const;
        /// The position must already exist.
@@ -284,14 +292,16 @@ public:
        void insert(lyx::pos_type pos, std::string const & str,
                    LyXFont const & font);
        ///
-       void insertChar(lyx::pos_type pos, value_type c);
+       void insertChar(lyx::pos_type pos, value_type c,
+                       Change change = Change(Change::INSERTED));
        ///
        void insertChar(lyx::pos_type pos, value_type c,
                LyXFont const &, Change change = Change(Change::INSERTED));
        ///
        bool checkInsertChar(LyXFont &);
        ///
-       void insertInset(lyx::pos_type pos, InsetBase * inset);
+       void insertInset(lyx::pos_type pos, InsetBase * inset,
+                        Change change = Change(Change::INSERTED));
        ///
        void insertInset(lyx::pos_type pos, InsetBase * inset,
                LyXFont const &, Change change = Change(Change::INSERTED));