more 'informational' messages removed?

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 627bf362e8d7a5cca76fb9803e3ba04caa120d44..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::size_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,
@@ -162,15 +162,13 @@ public:
        */
        void latexParagraphs(std::ostream & os, Paragraph * par,
                             Paragraph * endpar, TexRow & texrow) const;
-
-        ///
+       ///
        void simpleDocBookOnePar(std::ostream &,
                                 Paragraph * par, int & desc_on,
                                 Paragraph::depth_type depth) const ;
-        ///
+       ///
        void simpleLinuxDocOnePar(std::ostream & os, Paragraph * par, 
                                  Paragraph::depth_type depth);
-
        ///
        void makeLinuxDocFile(string const & filename,
                              bool nice, bool only_body = false);
@@ -178,14 +176,13 @@ public:
        void makeDocBookFile(string const & filename,
                             bool nice, bool only_body = false);
        /// Open SGML/XML tag.
-        void sgmlOpenTag(std::ostream & os, Paragraph::depth_type depth,
-                        string const & latexname) const;
-        /// Closes SGML/XML tag.
-        void sgmlCloseTag(std::ostream & os, Paragraph::depth_type depth,
-                         string const & latexname) const;
+       void sgmlOpenTag(std::ostream & os, Paragraph::depth_type depth,
+               string const & latexname) const;
+       /// Closes SGML/XML tag.
+       void sgmlCloseTag(std::ostream & os, Paragraph::depth_type depth,
+               string const & latexname) const;
        ///
-       void sgmlError(Paragraph * par, int pos,
-                      string const & message) const;
+       void sgmlError(Paragraph * par, int pos, string const & message) const;
 
        /// returns the main language for the buffer (document)
        Language const * getLanguage() const;
@@ -296,10 +293,10 @@ public:
        bool isMultiLingual();
 
        /// Does this mean that this is buffer local?
-        UndoStack undostack;
+       UndoStack undostack;
        
        /// Does this mean that this is buffer local? 
-        UndoStack redostack;
+       UndoStack redostack;
        
        ///
        BufferParams params;
@@ -374,8 +371,7 @@ public:
                        setParagraph();
                }
                ///
-               inset_iterator(Paragraph * paragraph,
-                              Paragraph::size_type pos);
+               inset_iterator(Paragraph * paragraph, lyx::pos_type pos);
                ///
                inset_iterator & operator++() { // prefix ++
                        if (par) {
@@ -405,7 +401,7 @@ public:
                ///
                Paragraph * getPar() { return par; }
                ///
-               Paragraph::size_type getPos() const { return it.getPos(); }
+               lyx::pos_type getPos() const { return it.getPos(); }
                ///
                friend
                bool operator==(inset_iterator const & iter1,
@@ -561,7 +557,8 @@ void Buffer::setParentName(string const & name)
 
 ///
 inline
-bool operator==(Buffer::TocItem const & a, Buffer::TocItem const & b) {
+bool operator==(Buffer::TocItem const & a, Buffer::TocItem const & b)
+{
        return a.par == b.par && a.str == b.str;
        // No need to compare depth.
 }
@@ -569,7 +566,8 @@ bool operator==(Buffer::TocItem const & a, Buffer::TocItem const & b) {
 
 ///
 inline
-bool operator!=(Buffer::TocItem const & a, Buffer::TocItem const & b) {
+bool operator!=(Buffer::TocItem const & a, Buffer::TocItem const & b)
+{
        return !(a == b);
        // No need to compare depth.
 }
@@ -578,7 +576,8 @@ bool operator!=(Buffer::TocItem const & a, Buffer::TocItem const & b) {
 ///
 inline
 bool operator==(Buffer::inset_iterator const & iter1,
-               Buffer::inset_iterator const & iter2) {
+               Buffer::inset_iterator const & iter2)
+{
        return iter1.par == iter2.par
                && (iter1.par == 0 || iter1.it == iter2.it);
 }
@@ -587,7 +586,8 @@ bool operator==(Buffer::inset_iterator const & iter1,
 ///
 inline
 bool operator!=(Buffer::inset_iterator const & iter1,
-               Buffer::inset_iterator const & iter2) {
+               Buffer::inset_iterator const & iter2)
+{
        return !(iter1 == iter2);
 }