X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_pimpl.h;h=5af4d69556b899ceaf8bd22e9075ef273ca515e8;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=0031c5663518f07c2ffe92b080e24a6bfa249022;hpb=1dd894724289c2387985e892e6a25a94f7e8d5ab;p=lyx.git diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h index 0031c56635..5af4d69556 100644 --- a/src/paragraph_pimpl.h +++ b/src/paragraph_pimpl.h @@ -1,7 +1,7 @@ // -*- C++ -*- /** * \file paragraph_pimpl.h - * Copyright 1995-2002 the LyX Team + * Copyright 1995-2003 the LyX Team * Read the file COPYING */ @@ -24,7 +24,7 @@ struct Paragraph::Pimpl { /// Pimpl(Paragraph * owner); /// Copy constructor - Pimpl(Pimpl const &, Paragraph * owner, bool same_ids = false); + Pimpl(Pimpl const &, Paragraph * owner); /// lyx::pos_type size() const { return text.size(); @@ -36,7 +36,7 @@ struct Paragraph::Pimpl { /// 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 +76,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. @@ -153,7 +153,7 @@ struct Paragraph::Pimpl { /// 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,9 +175,6 @@ struct Paragraph::Pimpl { ParagraphParameters params; private: - /// erase at the given position. Returns true if it was actually erased - bool erasePos(lyx::pos_type pos); - /// match a string against a particular point in the paragraph bool isTextAt(string const & str, lyx::pos_type pos) const;