minimal effort implementation of:

[lyx.git] / src / paragraph_pimpl.h

diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h
index 488e7e4deddcc0ab7f0a50ccecf936f06d7628ca..f24c36dbf8ed1bcb2ed080baa9b0866422dc96a6 100644 (file)
--- a/src/paragraph_pimpl.h
+++ b/src/paragraph_pimpl.h
@@ -43,19 +43,17 @@ public:
        /// stop tracking
        void untrackChanges();
        /// set all text as new for change mode
-       void cleanChanges();
-       /// look up change type at given pos
-       Change::Type lookupChange(lyx::pos_type pos) const;
+       void cleanChanges(Paragraph::ChangeTracking ct = Paragraph::trackingUnknown);
        /// look up change at given pos
-       Change const lookupChangeFull(lyx::pos_type pos) const;
-       /// is there a change in the given range ?
+       Change const lookupChange(lyx::pos_type pos) const;
+       /// is there a change within the given range ?
        bool isChanged(lyx::pos_type start, lyx::pos_type end) const;
        /// is there a non-addition in this range ?
        bool isChangeEdited(lyx::pos_type start, lyx::pos_type end) const;
-       /// set change at pos
-       void setChange(lyx::pos_type pos, Change::Type type);
-       /// set full change at pos
-       void setChangeFull(lyx::pos_type pos, Change change);
+       /// set change type at given pos
+       void setChangeType(lyx::pos_type pos, Change::Type type);
+       /// set change at given pos
+       void setChange(lyx::pos_type pos, Change change);
        /// mark as erased
        void markErased(bool);
        /// accept change
@@ -98,24 +96,15 @@ public:
                ///
                FontTable(lyx::pos_type p, LyXFont const & f)
                        : pos_(p), font_(f)
-               {
-#if 0
-                       font_ = container.get(f);
-#endif
-               }
+               {}
                ///
                lyx::pos_type pos() const { return pos_; }
                ///
                void pos(lyx::pos_type p) { pos_ = p; }
                ///
                LyXFont const & font() const { return font_; }
-#if 0
-               ///
-               void font(LyXFont const & f) { font_ = container.get(f);}
-#else
                ///
                void font(LyXFont const & f) { font_ = f;}
-#endif
        private:
                /// End position of paragraph this font attribute covers
                lyx::pos_type pos_;
@@ -128,13 +117,7 @@ public:
                    The values LyXFont::IGNORE_* and LyXFont::TOGGLE are NOT
                    allowed in these font tables.
                */
-#if 0
-               boost::shared_ptr<LyXFont> font_;
-               ///
-               static ShareContainer<LyXFont> container;
-#else
                LyXFont font_;
-#endif
        };
        ///
        friend class matchFT;