ws changes only

[lyx.git] / src / paragraph_pimpl.h

diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h
index 0031c5663518f07c2ffe92b080e24a6bfa249022..1ed47c4f7b9884b74e5063dc2d1c43726b0633b1 100644 (file)
--- a/src/paragraph_pimpl.h
+++ b/src/paragraph_pimpl.h
@@ -1,42 +1,37 @@
 // -*- C++ -*-
 /**
  * \file paragraph_pimpl.h
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef PARAGRAPH_PIMPL_H
 #define PARAGRAPH_PIMPL_H
 
 #include "paragraph.h"
-#include "ParagraphParameters.h"
+
 #include "changes.h"
-#include "counters.h"
+#include "lyxfont.h"
+#include "ParagraphParameters.h"
 
 #include <boost/scoped_ptr.hpp>
 
 class LyXLayout;
 
 struct Paragraph::Pimpl {
-       ///
-       typedef std::vector<value_type> TextContainer;
-
        ///
        Pimpl(Paragraph * owner);
        /// Copy constructor
-       Pimpl(Pimpl const &, Paragraph * owner, bool same_ids = false);
-       ///
-       lyx::pos_type size() const {
-               return text.size();
-       }
+       Pimpl(Pimpl const &, Paragraph * owner);
        ///
-       bool empty() const {
-               return text.empty();
-       }
-       ///
-       void clear();
-       ///
-       void setContentsFromPar(Paragraph const * par);
+       void setContentsFromPar(Paragraph const & par);
        /// set tracking mode
        void trackChanges(Change::Type type = Change::UNCHANGED);
        /// stop tracking
@@ -76,15 +71,15 @@ struct Paragraph::Pimpl {
        ///
        void insertChar(lyx::pos_type pos, value_type c, LyXFont const & font, Change change = Change(Change::INSERTED));
        ///
-       void insertInset(lyx::pos_type pos, Inset * inset, LyXFont const & font, Change change = Change(Change::INSERTED));
+       void insertInset(lyx::pos_type pos, InsetOld * inset, LyXFont const & font, Change change = Change(Change::INSERTED));
        /// definite erase
        void eraseIntern(lyx::pos_type pos);
-       /// erase the given position
-       void erase(lyx::pos_type pos);
+       /// erase the given position. Returns true if it was actually erased
+       bool erase(lyx::pos_type pos);
        /// erase the given range
-       bool erase(lyx::pos_type start, lyx::pos_type end);
+       int erase(lyx::pos_type start, lyx::pos_type end);
        ///
-       Inset * inset_owner;
+       UpdatableInset * inset_owner;
 
        /** A font entry covers a range of positions. Notice that the
            entries in the list are inserted in random order.
@@ -151,9 +146,9 @@ struct Paragraph::Pimpl {
                             LyXFont const & font,
                             LyXLayout const & style);
        ///
-       void simpleTeXSpecialChars(Buffer const *, BufferParams const &,
+       void simpleTeXSpecialChars(Buffer const &, BufferParams const &,
                                   std::ostream &, TexRow & texrow,
-                                  bool moving_arg,
+                                  LatexRunParams const &,
                                   LyXFont & font, LyXFont & running_font,
                                   LyXFont & basefont,
                                   LyXFont const & outerfont,
@@ -175,19 +170,16 @@ struct Paragraph::Pimpl {
        ParagraphParameters params;
 
 private:
-       /// erase at the given position. Returns true if it was actually erased
-       bool erasePos(lyx::pos_type pos);
-
+       ///
+       lyx::pos_type size() const { return owner_->size(); }
        /// match a string against a particular point in the paragraph
-       bool isTextAt(string const & str, lyx::pos_type pos) const;
+       bool isTextAt(std::string const & str, lyx::pos_type pos) const;
 
        /// for recording and looking up changes in revision tracking mode
        boost::scoped_ptr<Changes> changes_;
 
        /// Who owns us?
        Paragraph * owner_;
-       ///
-       TextContainer text;
 };
 
 #endif