From 0437d8dc1a75f60406a818e49efd3c8c9b489294 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 29 Feb 2016 13:29:06 +0100 Subject: [PATCH] Variables of type pit_type should be named pit, not par It is easier to use always the same conventions for naming. --- src/CutAndPaste.cpp | 8 ++++---- src/Text.cpp | 6 +++--- src/Text.h | 20 ++++++++++---------- src/Text2.cpp | 26 +++++++++++++------------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 86f66907b6..44bcb5e962 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -100,11 +100,11 @@ bool checkPastePossible(int index) struct PasteReturnValue { - PasteReturnValue(pit_type r_par, pos_type r_pos, bool r_nu) : - par(r_par), pos(r_pos), needupdate(r_nu) + PasteReturnValue(pit_type r_pit, pos_type r_pos, bool r_nu) : + pit(r_pit), pos(r_pos), needupdate(r_nu) {} - pit_type par; + pit_type pit; pos_type pos; bool needupdate; }; @@ -1074,7 +1074,7 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist, pasteSelectionHelper(cur, parlist, docclass, 0, errorList); cur.forceBufferUpdate(); cur.clearSelection(); - text->setCursor(cur, prv.par, prv.pos); + text->setCursor(cur, prv.pit, prv.pos); } // mathed is handled in InsetMathNest/InsetMathGrid diff --git a/src/Text.cpp b/src/Text.cpp index 89028c8db6..e6905ad026 100644 --- a/src/Text.cpp +++ b/src/Text.cpp @@ -109,12 +109,12 @@ static bool moveItem(Paragraph & fromPar, pos_type fromPos, void breakParagraphConservative(BufferParams const & bparams, - ParagraphList & pars, pit_type par_offset, pos_type pos) + ParagraphList & pars, pit_type pit, pos_type pos) { // create a new paragraph - Paragraph & tmp = *pars.insert(lyx::next(pars.begin(), par_offset + 1), + Paragraph & tmp = *pars.insert(lyx::next(pars.begin(), pit + 1), Paragraph()); - Paragraph & par = pars[par_offset]; + Paragraph & par = pars[pit]; tmp.setInsetOwner(&par.inInset()); tmp.makeSameLayout(par); diff --git a/src/Text.h b/src/Text.h index 2d855ecc8f..fa42290258 100644 --- a/src/Text.h +++ b/src/Text.h @@ -182,12 +182,12 @@ public: void rejectChanges(); /// returns true if par was empty and was removed - bool setCursor(Cursor & cur, pit_type par, pos_type pos, + bool setCursor(Cursor & cur, pit_type pit, pos_type pos, bool setfont = true, bool boundary = false); /// - void setCursor(CursorSlice &, pit_type par, pos_type pos); + void setCursor(CursorSlice &, pit_type pit, pos_type pos); /// - void setCursorIntern(Cursor & cur, pit_type par, + void setCursorIntern(Cursor & cur, pit_type pit, pos_type pos, bool setfont = true, bool boundary = false); /// Move cursor one position backwards @@ -322,20 +322,20 @@ public: docstring completionPrefix(Cursor const & cur) const; /// find a paragraph before \p par with the given \p depth, if such /// a paragraph cannot be found, \p par is returned - pit_type depthHook(pit_type par, depth_type depth) const; + pit_type depthHook(pit_type pit, depth_type depth) const; /// find a paragraph before \p par with depth less than the /// depth of \p par. If such paragraph cannot be found because /// \p par already has depth 0, lastpar + 1 is returned. If /// such paragraph cannot be found because there isn't a par /// with less depth before this one, \p par is returned. - pit_type outerHook(pit_type par) const; + pit_type outerHook(pit_type pit) const; /// Is it the first par with same depth and layout? - bool isFirstInSequence(pit_type par) const; + bool isFirstInSequence(pit_type pit) const; /// Is this paragraph in the table of contents? - int getTocLevel(pit_type par) const; + int getTocLevel(pit_type pit) const; /// Get the font of the "environment" of paragraph \p par_offset in \p pars. /// All font changes of the paragraph are relative to this font. - Font const outerFont(pit_type par_offset) const; + Font const outerFont(pit_type pit_offset) const; private: /// The InsetText owner shall have access to everything. @@ -383,7 +383,7 @@ private: /// void breakParagraphConservative(BufferParams const & bparams, ParagraphList & paragraphs, - pit_type par, + pit_type pit, pos_type pos); /** @@ -391,7 +391,7 @@ void breakParagraphConservative(BufferParams const & bparams, * Be careful, this doesent make any check at all. */ void mergeParagraph(BufferParams const & bparams, - ParagraphList & paragraphs, pit_type par); + ParagraphList & paragraphs, pit_type pit); /// accept the changes within the complete ParagraphList void acceptChanges(ParagraphList & pars, BufferParams const & bparams); diff --git a/src/Text2.cpp b/src/Text2.cpp index c3d696e7e2..ffde834272 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -547,25 +547,25 @@ void Text::insertInset(Cursor & cur, Inset * inset) } -bool Text::setCursor(Cursor & cur, pit_type par, pos_type pos, +bool Text::setCursor(Cursor & cur, pit_type pit, pos_type pos, bool setfont, bool boundary) { TextMetrics const & tm = cur.bv().textMetrics(this); - bool const update_needed = !tm.contains(par); + bool const update_needed = !tm.contains(pit); Cursor old = cur; - setCursorIntern(cur, par, pos, setfont, boundary); + setCursorIntern(cur, pit, pos, setfont, boundary); return cur.bv().checkDepm(cur, old) || update_needed; } -void Text::setCursor(CursorSlice & cur, pit_type par, pos_type pos) +void Text::setCursor(CursorSlice & cur, pit_type pit, pos_type pos) { - LASSERT(par != int(paragraphs().size()), return); - cur.pit() = par; + LASSERT(pit != int(paragraphs().size()), return); + cur.pit() = pit; cur.pos() = pos; // now some strict checking - Paragraph & para = getPar(par); + Paragraph const & par = getPar(pit); // None of these should happen, but we're scaredy-cats if (pos < 0) { @@ -573,21 +573,21 @@ void Text::setCursor(CursorSlice & cur, pit_type par, pos_type pos) LATTEST(false); } - if (pos > para.size()) { + if (pos > par.size()) { LYXERR0("Don't like 1, pos: " << pos - << " size: " << para.size() - << " par: " << par); + << " size: " << par.size() + << " par: " << pit); LATTEST(false); } } -void Text::setCursorIntern(Cursor & cur, - pit_type par, pos_type pos, bool setfont, bool boundary) +void Text::setCursorIntern(Cursor & cur, pit_type pit, pos_type pos, + bool setfont, bool boundary) { LBUFERR(this == cur.text()); cur.boundary(boundary); - setCursor(cur.top(), par, pos); + setCursor(cur.top(), pit, pos); if (setfont) cur.setCurrentFont(); }