John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 5f3e8d9d5b0f67881def40f7cb8cc4c128b6a2d3..cd8c55d7cf966d19e11e8ffe17d2e231613517de 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -123,7 +123,7 @@ public:
                                        Paragraph::depth_type & depth, 
                                        LyXFont &);
        ///
-       void insertStringAsLines(Paragraph *&, Paragraph::pos_type &,
+       void insertStringAsLines(Paragraph *&, lyx::pos_type &,
                                 LyXFont const &, string const &) const;
 #ifndef NO_COMPABILITY
        ///
@@ -151,8 +151,8 @@ public:
        ///
        void writeFileAscii(std::ostream &, int);
        ///
-       string const asciiParagraph(Paragraph const *,
-                                   unsigned int linelen) const;
+       string const asciiParagraph(Paragraph const *, unsigned int linelen,
+                                   bool noparbreak = false) const;
        ///
        void makeLaTeXFile(string const & filename,
                           string const & original_path,
@@ -371,8 +371,7 @@ public:
                        setParagraph();
                }
                ///
-               inset_iterator(Paragraph * paragraph,
-                              Paragraph::pos_type pos);
+               inset_iterator(Paragraph * paragraph, lyx::pos_type pos);
                ///
                inset_iterator & operator++() { // prefix ++
                        if (par) {
@@ -402,7 +401,7 @@ public:
                ///
                Paragraph * getPar() { return par; }
                ///
-               Paragraph::pos_type getPos() const { return it.getPos(); }
+               lyx::pos_type getPos() const { return it.getPos(); }
                ///
                friend
                bool operator==(inset_iterator const & iter1,