commit 366685602e953354c3818cff185fa7e00f1afb64
author Albert Astals Cid <aacid@kde.org> Wed Jun 05 21:19:58 2019 +0200
committer Albert Astals Cid <aacid@kde.org> Fri Jun 07 17:09:04 2019 +0200
tree 73e88ce2a8abf711ebcfe293bc6570c1c61888af
parent c7981a19fab9abf8df31e67c87aa7710fdf60bc7

page -> p

fixes shadow warnings, doesn't make code harder to read, it's in trivial
functions

poppler/TextOutputDev.cc

diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
index 7762401..7923f46 100644
--- a/poppler/TextOutputDev.cc
+++ b/poppler/TextOutputDev.cc
@@ -4401,8 +4401,8 @@
   TextPage *page;
 };
 
-TextSelectionVisitor::TextSelectionVisitor (TextPage *page)
-  : page(page)
+TextSelectionVisitor::TextSelectionVisitor (TextPage *p)
+  : page(p)
 {
 }
 
@@ -4441,8 +4441,8 @@
   TextBlock *currentBlock;
 };
 
-TextSelectionDumper::TextSelectionDumper(TextPage *page)
-    : TextSelectionVisitor(page)
+TextSelectionDumper::TextSelectionDumper(TextPage *p)
+    : TextSelectionVisitor(p)
 {
   linesSize = 256;
   lines = (std::vector<TextWordSelection*> **)gmallocn(linesSize, sizeof(std::vector<TextWordSelection*> *));
@@ -4605,8 +4605,8 @@
   double scale;
 };
 
-TextSelectionSizer::TextSelectionSizer(TextPage *page, double scale)
-  : TextSelectionVisitor(page),
+TextSelectionSizer::TextSelectionSizer(TextPage *p, double scale)
+  : TextSelectionVisitor(p),
     scale(scale)
 {
   list = new std::vector<PDFRectangle*>();
@@ -4668,17 +4668,17 @@
   Matrix ctm, ictm;
 };
 
-TextSelectionPainter::TextSelectionPainter(TextPage *page,
+TextSelectionPainter::TextSelectionPainter(TextPage *p,
 					   double scale,
 					   int rotation,
 					   OutputDev *out,
 					   GfxColor *box_color,
 					   GfxColor *glyph_color)
-  : TextSelectionVisitor(page),
+  : TextSelectionVisitor(p),
     out(out),
     glyph_color(glyph_color)
 {
-  PDFRectangle box(0, 0, page->pageWidth, page->pageHeight);
+  PDFRectangle box(0, 0, p->pageWidth, p->pageHeight);
 
   selectionList = new std::vector<TextWordSelection*>();
   state = new GfxState(72 * scale, 72 * scale, &box, rotation, false);